Add item requests

src/main/java/ru/practicum/shareit/Create.java

@@ -0,0 +1,4 @@
+package ru.practicum.shareit;
+
+public interface Create {
+}

src/main/java/ru/practicum/shareit/ShareItApp.java

@@ -7,6 +7,7 @@
 public class ShareItApp {
 
 	public static void main(String[] args) {
+
 		SpringApplication.run(ShareItApp.class, args);
 	}
 

src/main/java/ru/practicum/shareit/Update.java

@@ -0,0 +1,4 @@
+package ru.practicum.shareit;
+
+public interface Update {
+}

src/main/java/ru/practicum/shareit/booking/BookingController.java

@@ -1,12 +1,68 @@
 package ru.practicum.shareit.booking;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.shareit.booking.dto.BookingDTO;
+import ru.practicum.shareit.booking.dto.BookingDTOToReturn;
+import ru.practicum.shareit.booking.service.BookingService;
+
+import javax.validation.Valid;
+import javax.validation.constraints.PositiveOrZero;
+import java.util.List;
 
-/**
- * TODO Sprint add-bookings.
- */
 @RestController
 @RequestMapping(path = "/bookings")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@Slf4j
+@Validated
 public class BookingController {
+    private final BookingService bookingService;
+
+    @PostMapping
+    public BookingDTOToReturn add(@RequestHeader("X-Sharer-User-Id") Long userId,
+                                  @Valid @RequestBody BookingDTO bookingDto) {
+        log.info("Добавление запроса на аренду пользователем с id {}", userId);
+        return bookingService.add(userId, bookingDto);
+    }
+
+    @PatchMapping("/{bookingId}")
+    public BookingDTOToReturn update(@RequestHeader("X-Sharer-User-Id") Long userId,
+                                     @PathVariable Long bookingId,
+                                     @RequestParam Boolean approved) {
+        log.info("Обновление статуса запроса на аренду с id {}", bookingId);
+        return bookingService.update(userId, bookingId, approved);
+
+    }
+
+    @GetMapping("/{bookingId}")
+    public BookingDTOToReturn get(@RequestHeader("X-Sharer-User-Id") Long userId, @PathVariable Long bookingId) {
+        log.info("Просмотр запроса на пренду с id {}", bookingId);
+        return bookingService.get(userId, bookingId);
+    }
+
+    @GetMapping
+    public List<BookingDTOToReturn> findByBooker(@RequestHeader("X-Sharer-User-Id") Long userId,
+                                                 @RequestParam(required = false, defaultValue = "ALL") String state,
+                                                 @PositiveOrZero @RequestParam(name = "from", defaultValue = "0")
+                                                 Integer from,
+                                                 @PositiveOrZero @RequestParam(name = "size", defaultValue = "10")
+                                                 Integer size) {
+        log.info("Получение списка бронирований пользовалеля с id {}", userId);
+        return bookingService.getByBooker(userId, state, from, size);
+    }
+
+    @GetMapping("/owner")
+    public List<BookingDTOToReturn> findByOwner(@RequestHeader("X-Sharer-User-Id") Long userId,
+                                                @RequestParam(defaultValue = "ALL") String state,
+                                                @PositiveOrZero @RequestParam(name = "from", defaultValue = "0")
+                                                Integer from,
+                                                @PositiveOrZero @RequestParam(name = "size", defaultValue = "10")
+                                                Integer size) {
+        log.info("Получение списка бронирований для всех вещей пользователя с id {}", userId);
+        return bookingService.getByOwner(userId, state, from, size);
+    }
+
 }

src/main/java/ru/practicum/shareit/booking/BookingMapper.java

@@ -0,0 +1,69 @@
+package ru.practicum.shareit.booking;
+
+import lombok.experimental.UtilityClass;
+import ru.practicum.shareit.booking.dto.BookingDTO;
+import ru.practicum.shareit.booking.dto.BookingDTOForItem;
+import ru.practicum.shareit.booking.dto.BookingDTOToReturn;
+import ru.practicum.shareit.booking.model.Booking;
+import ru.practicum.shareit.booking.model.Status;
+import ru.practicum.shareit.item.mapper.ItemMapper;
+import ru.practicum.shareit.item.model.Item;
+import ru.practicum.shareit.user.UserMapper;
+import ru.practicum.shareit.user.model.User;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@UtilityClass
+public class BookingMapper {
+
+    public static BookingDTOToReturn toBookingDtoFrom(Booking booking) {
+        BookingDTOToReturn bookingDto = new BookingDTOToReturn();
+        bookingDto.setId(booking.getId());
+        bookingDto.setStart(booking.getStart());
+        bookingDto.setEnd(booking.getEnd());
+        bookingDto.setStatus(booking.getStatus());
+        bookingDto.setItem(ItemMapper.toItemToBookingDTO(booking.getItem()));
+        bookingDto.setBooker(UserMapper.toUserToBookingDTO(booking.getBooker()));
+        return bookingDto;
+    }
+
+    public static Booking toBooking(BookingDTO bookingDto, Item item, User user) {
+        Booking booking = new Booking();
+        booking.setStart(bookingDto.getStart());
+        booking.setEnd(bookingDto.getEnd());
+        booking.setId(bookingDto.getId());
+        booking.setStatus(Status.WAITING);
+        booking.setItem(item);
+        booking.setBooker(user);
+        return booking;
+    }
+
+    public static BookingDTOForItem toBookingDtoForItem(long id, long bookerId) {
+        BookingDTOForItem bookingDtoForItem = new BookingDTOForItem();
+        bookingDtoForItem.setId(id);
+        bookingDtoForItem.setBookerId(bookerId);
+        return bookingDtoForItem;
+    }
+
+
+    public static List<BookingDTOToReturn> mapToBookingDtoFrom(Iterable<Booking> bookings) {
+        List<BookingDTOToReturn> dtos = new ArrayList<>();
+        for (Booking booking : bookings) {
+            dtos.add(toBookingDtoFrom(booking));
+        }
+        return dtos;
+    }
+
+    public static BookingDTO toBookingDto(Booking booking) {
+        BookingDTO bookingDto = new BookingDTO();
+        bookingDto.setId(booking.getId());
+        bookingDto.setStart(booking.getStart());
+        bookingDto.setEnd(booking.getEnd());
+        bookingDto.setStatus(booking.getStatus());
+        bookingDto.setItemId(booking.getItem() != null ? booking.getItem().getId() : null);
+        bookingDto.setItemName(booking.getItem() != null ? booking.getItem().getName() : null);
+        bookingDto.setBookerId(booking.getBooker() != null ? booking.getBooker().getId() : null);
+        return bookingDto;
+    }
+}

src/main/java/ru/practicum/shareit/booking/BookingRepository.java

@@ -0,0 +1,107 @@
+package ru.practicum.shareit.booking;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import ru.practicum.shareit.booking.model.Booking;
+import ru.practicum.shareit.booking.model.Status;
+import ru.practicum.shareit.item.model.Item;
+import ru.practicum.shareit.user.model.User;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+public interface BookingRepository extends JpaRepository<Booking, Long> {
+
+    List<Booking> findByBookerAndStatusOrderByStartDesc(User booker, Status status);
+
+    List<Booking> findByBookerOrderByStartDesc(User booker);
+
+    Page<Booking> findByBookerAndStatusOrderByStartDesc(User booker, Status status, Pageable pageable);
+
+    Page<Booking> findByBookerOrderByStartDesc(User booker, Pageable pageable);
+
+    List<Booking> findByBookerAndStartAfterOrderByStartDesc(User booker, LocalDateTime now);
+
+    Page<Booking> findByBookerAndStartAfterOrderByStartDesc(User booker, LocalDateTime now, Pageable pageable);
+
+    List<Booking> findByBookerAndStartBeforeAndEndAfterOrderByStartDesc(User booker, LocalDateTime s, LocalDateTime e);
+
+    Page<Booking> findByBookerAndStartBeforeAndEndAfterOrderByStartDesc(User booker, LocalDateTime s, LocalDateTime e,
+                                                                        Pageable pageable);
+
+    List<Booking> findByBookerAndStartBeforeAndEndBeforeOrderByStartDesc(User booker, LocalDateTime s, LocalDateTime e);
+
+    Page<Booking> findByBookerAndStartBeforeAndEndBeforeOrderByStartDesc(User booker, LocalDateTime s,
+                                                                         LocalDateTime e, Pageable pageable);
+
+    List<Booking> findByItemAndBookerAndStartBeforeAndEndBefore(Item item, User booker, LocalDateTime s,
+                                                                LocalDateTime e);
+
+    @Query("SELECT b FROM Booking b WHERE b.item.id IN" + " (SELECT i.id FROM Item i WHERE i.owner.id = ?1)"
+            + " ORDER BY b.id DESC")
+    List<Booking> findByOwnerAll(long userId);
+
+    @Query(nativeQuery = true, value = "SELECT * FROM BOOKINGS as b " +
+            "LEFT JOIN ITEMS as i ON b.ITEM_ID = i.ID " +
+            "WHERE i.OWNER_ID = ?1 " +
+            "ORDER BY b.START_DATE DESC")
+    List<Booking> findByOwnerAll(Long i, Pageable pageable);
+
+    @Query("SELECT b FROM Booking b WHERE b.item.id IN "
+            + "(SELECT i.id FROM Item i WHERE i.owner.id = ?1) AND b.start < ?2 AND b.end > ?2"
+            + " ORDER BY b.id DESC")
+    List<Booking> findByOwnerAndCurrent(long userId, LocalDateTime currentDate);
+
+    @Query(nativeQuery = true, value = "SELECT * FROM BOOKINGS as b " +
+            "LEFT JOIN ITEMS as i ON b.ITEM_ID = i.ID " +
+            "WHERE i.OWNER_ID = ?1 AND b.START_DATE < ?2 AND b.END_DATE > ?2 " +
+            "ORDER BY b.START_DATE DESC")
+    List<Booking> findByOwnerAndCurrent(Long i, LocalDateTime now, Pageable pageable);
+
+    @Query("SELECT b FROM Booking b WHERE b.item.id IN "
+            + "(SELECT i.id FROM Item i WHERE i.owner.id = ?1) AND b.end < ?2"
+            + " ORDER BY b.id DESC")
+    List<Booking> findByOwnerAndPast(long userId, LocalDateTime currentDate);
+
+    @Query(nativeQuery = true, value = "SELECT * FROM BOOKINGS as b " +
+            "LEFT JOIN ITEMS as i ON b.ITEM_ID = i.ID " +
+            "WHERE i.OWNER_ID = ?1 AND b.END_DATE < ?2 AND b.START_DATE < ?2 " +
+            "ORDER BY b.START_DATE DESC")
+    List<Booking> findByOwnerAndPast(Long i, LocalDateTime now, Pageable pageable);
+
+    @Query("SELECT b FROM Booking b WHERE b.item.id IN "
+            + "(SELECT i.id FROM Item i WHERE i.owner.id = ?1) AND b.start > ?2" + " ORDER BY b.id DESC")
+    List<Booking> findByUserAndFuture(long userId, LocalDateTime currentDate);
+
+    @Query(nativeQuery = true, value = "SELECT * FROM BOOKINGS as b " +
+            "LEFT JOIN ITEMS as i ON b.ITEM_ID = i.ID " +
+            "WHERE i.OWNER_ID = ?1 AND b.START_DATE > ?2 " +
+            "ORDER BY b.START_DATE DESC")
+    List<Booking> findByUserAndFuture(Long i, LocalDateTime s, Pageable pageable);
+
+    @Query("SELECT b FROM Booking b WHERE b.item.id IN "
+            + "(SELECT i.id FROM Item i WHERE i.owner.id = ?1) AND b.status = ?2" + " ORDER BY b.id DESC")
+    List<Booking> findByOwnerAndByStatus(long userId, Status status);
+
+    @Query(nativeQuery = true, value = "SELECT * FROM BOOKINGS as b " +
+            "LEFT JOIN ITEMS as i ON b.ITEM_ID = i.ID " +
+            "WHERE i.OWNER_ID = ?1 AND b.STATUS LIKE ?2 " +
+            "ORDER BY b.START_DATE DESC")
+    List<Booking> findByOwnerAndByStatus(Long i, String status, Pageable pageable);
+
+    Booking findFirstByStatusAndItemAndStartIsAfter(Status state, Item item, LocalDateTime time, Sort sort);
+
+    Booking findFirstByStatusAndItemAndStartLessThanEqual(Status state, Item item, LocalDateTime time, Sort sort);
+
+    @Query("select b " +
+            "from Booking b " +
+            "where b.item in ?1 " +
+            " and b.status = 'APPROVED'")
+    List<Booking> findApprovedForItems(Collection<Item> items, Sort sort);
+
+    List<Booking> findByItemOrderByStartDesc(Item item);
+}

src/main/java/ru/practicum/shareit/booking/dto/BookingDTO.java

@@ -0,0 +1,29 @@
+package ru.practicum.shareit.booking.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import ru.practicum.shareit.booking.model.Status;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+public class BookingDTO {
+
+    private long id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime start;
+
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime end;
+
+    private Long itemId;
+
+    private String itemName;
+
+    private Long bookerId;
+
+    private Status status;
+}

src/main/java/ru/practicum/shareit/booking/dto/BookingDTOForItem.java

@@ -0,0 +1,20 @@
+package ru.practicum.shareit.booking.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@NoArgsConstructor
+public class BookingDTOForItem {
+    private long id;
+    private Long bookerId;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime dateTime;
+}

src/main/java/ru/practicum/shareit/booking/dto/BookingDTOToReturn.java

@@ -0,0 +1,36 @@
+package ru.practicum.shareit.booking.dto;
+
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+import ru.practicum.shareit.booking.model.Status;
+
+import java.time.LocalDateTime;
+
+@Data
+@Validated
+public class BookingDTOToReturn {
+
+    private long id;
+
+    private LocalDateTime start;
+
+    private LocalDateTime end;
+
+    private Item item;
+
+    private User booker;
+
+    private Status status;
+
+    @Data
+    public static class User {
+        private final long id;
+        private final String name;
+    }
+
+    @Data
+    public static class Item {
+        private final long id;
+        private final String name;
+    }
+}