fix2

ivanvznkv · ivanvznkv · commit 782ea678cc9b · 2026-02-28T16:59:10.000+03:00
diff --git a/src/main/java/ru/practicum/shareit/booking/dto/BookingMapper.java b/src/main/java/ru/practicum/shareit/booking/dto/BookingMapper.java
@@ -27,4 +27,13 @@ public static Booking fromCreateRequest(BookingCreateRequest bookingCreateReques
         booking.setBooker(booker);
         return booking;
     }
+
+    public static BookingShortDto toShortDto(Booking booking) {
+        BookingShortDto dto = new BookingShortDto();
+        dto.setId(booking.getId());
+        dto.setStart(booking.getStart());
+        dto.setEnd(booking.getEnd());
+        dto.setBookerId(booking.getBooker().getId());
+        return dto;
+    }
 }
diff --git a/src/main/java/ru/practicum/shareit/booking/service/BookingServiceImpl.java b/src/main/java/ru/practicum/shareit/booking/service/BookingServiceImpl.java
@@ -46,6 +46,13 @@ public BookingResponseDto createBooking(BookingCreateRequest createRequest, Long
             throw new AccessDeniedException("Пользователь не может бронировать свою собственную вещь");
         }
 
+        if (bookingRepository.existsOverlappingBookings(item.getId(),
+                createRequest.getStart(),
+                createRequest.getEnd(),
+                List.of(BookingStatus.APPROVED, BookingStatus.WAITING))) {
+            throw new ValidationException("Вещь уже забронирована на указанные даты");
+        }
+
         Booking booking = BookingMapper.fromCreateRequest(createRequest, item, booker);
         booking.setStatus(BookingStatus.WAITING);
         Booking saved = bookingRepository.save(booking);
@@ -54,6 +61,9 @@ public BookingResponseDto createBooking(BookingCreateRequest createRequest, Long
 
     @Override
     public BookingResponseDto getBookingById(Long bookingId, Long userId) {
+        userRepository.findById(userId)
+                .orElseThrow(() -> new NotFoundException("Пользователь с id " + userId + " не найден"));
+
         Booking booking = bookingRepository.findById(bookingId)
                 .orElseThrow(() -> new NotFoundException("Бронирование с id " + bookingId + " не найдено"));
 
diff --git a/src/main/java/ru/practicum/shareit/booking/storage/BookingRepository.java b/src/main/java/ru/practicum/shareit/booking/storage/BookingRepository.java
@@ -8,6 +8,7 @@
 import ru.practicum.shareit.booking.model.BookingStatus;
 
 import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
 
 public interface BookingRepository extends JpaRepository<Booking, Long> {
@@ -41,4 +42,20 @@ public interface BookingRepository extends JpaRepository<Booking, Long> {
     List<Booking> findNextBooking(@Param("itemId") Long itemId, @Param("now") LocalDateTime now);
 
     List<Booking> findByBookerIdAndItemIdAndStatus(Long bookerId, Long itemId, BookingStatus status);
+
+    @Query("SELECT CASE WHEN COUNT(b) > 0 THEN true ELSE false END FROM Booking b " +
+            "WHERE b.item.id = :itemId AND b.status IN :statuses " +
+            "AND b.start < :end AND b.end > :start")
+    boolean existsOverlappingBookings(@Param("itemId") Long itemId,
+                                      @Param("start") LocalDateTime start,
+                                      @Param("end") LocalDateTime end,
+                                      @Param("statuses") Collection<BookingStatus> statuses);
+
+    @Query("SELECT b FROM Booking b WHERE b.item.id IN :itemIds AND b.status = 'APPROVED' AND b.end < :now ORDER BY b.end DESC")
+    List<Booking> findAllLastBookings(@Param("itemIds") List<Long> itemIds, @Param("now") LocalDateTime now);
+
+    @Query("SELECT b FROM Booking b WHERE b.item.id IN :itemIds AND b.status = 'APPROVED' AND b.start > :now ORDER BY b.start ASC")
+    List<Booking> findAllNextBookings(@Param("itemIds") List<Long> itemIds, @Param("now") LocalDateTime now);
+
+    List<Booking> findByBookerIdAndItemIdAndStatusIn(Long bookerId, Long itemId, Collection<BookingStatus> statuses);
 }
diff --git a/src/main/java/ru/practicum/shareit/booking/storage/BookingStorage.java b/src/main/java/ru/practicum/shareit/booking/storage/BookingStorage.java
diff --git a/src/main/java/ru/practicum/shareit/item/dto/CommentMapper.java b/src/main/java/ru/practicum/shareit/item/dto/CommentMapper.java
@@ -1,6 +1,10 @@
 package ru.practicum.shareit.item.dto;
 
 import ru.practicum.shareit.item.model.Comment;
+import ru.practicum.shareit.item.model.Item;
+import ru.practicum.shareit.user.model.User;
+
+import java.time.LocalDateTime;
 
 public class CommentMapper {
     public static CommentResponseDto toResponseDto(Comment comment) {
@@ -11,4 +15,13 @@ public static CommentResponseDto toResponseDto(Comment comment) {
         dto.setCreated(comment.getCreated());
         return dto;
     }
+
+    public static Comment fromCreateRequest(CommentCreateRequest request, Item item, User author, LocalDateTime created) {
+        Comment comment = new Comment();
+        comment.setText(request.getText());
+        comment.setItem(item);
+        comment.setAuthor(author);
+        comment.setCreated(created);
+        return comment;
+    }
 }
diff --git a/src/main/java/ru/practicum/shareit/item/dto/ItemMapper.java b/src/main/java/ru/practicum/shareit/item/dto/ItemMapper.java
@@ -1,9 +1,12 @@
 package ru.practicum.shareit.item.dto;
 
+import ru.practicum.shareit.booking.dto.BookingShortDto;
 import ru.practicum.shareit.item.model.Item;
 import ru.practicum.shareit.request.model.ItemRequest;
 import ru.practicum.shareit.user.model.User;
 
+import java.util.List;
+
 public class ItemMapper {
 
     public static ItemResponseDto toResponseDto(Item item) {
@@ -37,4 +40,33 @@ public static void updateItemFromRequest(ItemUpdateRequest request, Item item) {
             item.setAvailable(request.getAvailable());
         }
     }
+
+    public static ItemDetailedDto toDetailedDto(Item item, BookingShortDto lastBooking, BookingShortDto nextBooking, List<CommentResponseDto> comments) {
+        ItemDetailedDto dto = new ItemDetailedDto();
+        dto.setId(item.getId());
+        dto.setName(item.getName());
+        dto.setDescription(item.getDescription());
+        dto.setAvailable(item.getAvailable());
+        dto.setRequestId(item.getRequest() != null ? item.getRequest().getId() : null);
+        dto.setLastBooking(lastBooking);
+        dto.setNextBooking(nextBooking);
+        dto.setComments(comments);
+        return dto;
+    }
+
+    public static ItemWithBookingsDto toWithBookingsDto(Item item,
+                                                        BookingShortDto lastBooking,
+                                                        BookingShortDto nextBooking,
+                                                        List<CommentResponseDto> comments) {
+        ItemWithBookingsDto dto = new ItemWithBookingsDto();
+        dto.setId(item.getId());
+        dto.setName(item.getName());
+        dto.setDescription(item.getDescription());
+        dto.setAvailable(item.getAvailable());
+        dto.setRequestId(item.getRequest() != null ? item.getRequest().getId() : null);
+        dto.setLastBooking(lastBooking);
+        dto.setNextBooking(nextBooking);
+        dto.setComments(comments);
+        return dto;
+    }
 }
diff --git a/src/main/java/ru/practicum/shareit/item/service/ItemServiceImpl.java b/src/main/java/ru/practicum/shareit/item/service/ItemServiceImpl.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import ru.practicum.shareit.booking.dto.BookingMapper;
 import ru.practicum.shareit.booking.dto.BookingShortDto;
 import ru.practicum.shareit.booking.model.Booking;
 import ru.practicum.shareit.booking.model.BookingStatus;
@@ -64,49 +65,29 @@ public ItemResponseDto updateItem(Long itemId, Long ownerId, ItemUpdateRequest u
     public ItemDetailedDto getItemById(Long itemId, Long userId) {
         Item item = itemRepository.findById(itemId)
                 .orElseThrow(() -> new NotFoundException("Вещь не найдена"));
-        ItemDetailedDto dto = new ItemDetailedDto();
-        dto.setId(item.getId());
-        dto.setName(item.getName());
-        dto.setDescription(item.getDescription());
-        dto.setAvailable(item.getAvailable());
-        dto.setRequestId(item.getRequest() != null ? item.getRequest().getId() : null);
 
         LocalDateTime now = LocalDateTime.now();
         boolean isOwner = item.getOwner().getId().equals(userId);
 
+        BookingShortDto lastBooking = null;
+        BookingShortDto nextBooking = null;
+
         if (isOwner) {
             List<Booking> lastBookings = bookingRepository.findLastBooking(itemId, now);
             if (!lastBookings.isEmpty()) {
-                Booking last = lastBookings.get(0);
-                BookingShortDto lastDto = new BookingShortDto();
-                lastDto.setId(last.getId());
-                lastDto.setStart(last.getStart());
-                lastDto.setEnd(last.getEnd());
-                lastDto.setBookerId(last.getBooker().getId());
-                dto.setLastBooking(lastDto);
+                lastBooking = BookingMapper.toShortDto(lastBookings.get(0));
             }
-
             List<Booking> nextBookings = bookingRepository.findNextBooking(itemId, now);
             if (!nextBookings.isEmpty()) {
-                Booking next = nextBookings.get(0);
-                BookingShortDto nextDto = new BookingShortDto();
-                nextDto.setId(next.getId());
-                nextDto.setStart(next.getStart());
-                nextDto.setEnd(next.getEnd());
-                nextDto.setBookerId(next.getBooker().getId());
-                dto.setNextBooking(nextDto);
+                nextBooking = BookingMapper.toShortDto(nextBookings.get(0));
             }
-        } else {
-            dto.setLastBooking(null);
-            dto.setNextBooking(null);
         }
 
         List<CommentResponseDto> comments = commentRepository.findByItemIdOrderByCreatedDesc(itemId).stream()
                 .map(CommentMapper::toResponseDto)
                 .collect(Collectors.toList());
-        dto.setComments(comments);
 
-        return dto;
+        return ItemMapper.toDetailedDto(item, lastBooking, nextBooking, comments);
     }
 
     @Override
@@ -116,9 +97,33 @@ public List<ItemWithBookingsDto> getItemsByOwner(Long ownerId) {
         }
 
         List<Item> items = itemRepository.findByOwnerId(ownerId);
-        LocalDateTime now = LocalDateTime.now();
+        if (items.isEmpty()) {
+            return Collections.emptyList();
+        }
 
+        LocalDateTime now = LocalDateTime.now();
         List<Long> itemIds = items.stream().map(Item::getId).collect(Collectors.toList());
+
+        List<Booking> lastBookings = bookingRepository.findAllLastBookings(itemIds, now);
+        Map<Long, BookingShortDto> lastBookingMap = lastBookings.stream()
+                .collect(Collectors.groupingBy(
+                        b -> b.getItem().getId(),
+                        Collectors.collectingAndThen(
+                                Collectors.toList(),
+                                list -> BookingMapper.toShortDto(list.get(0))
+                        )
+                ));
+
+        List<Booking> nextBookings = bookingRepository.findAllNextBookings(itemIds, now);
+        Map<Long, BookingShortDto> nextBookingMap = nextBookings.stream()
+                .collect(Collectors.groupingBy(
+                        b -> b.getItem().getId(),
+                        Collectors.collectingAndThen(
+                                Collectors.toList(),
+                                list -> BookingMapper.toShortDto(list.get(0))
+                        )
+                ));
+
         List<Comment> comments = commentRepository.findByItemIdIn(itemIds);
         Map<Long, List<CommentResponseDto>> commentsByItemId = comments.stream()
                 .collect(Collectors.groupingBy(
@@ -127,40 +132,12 @@ public List<ItemWithBookingsDto> getItemsByOwner(Long ownerId) {
                 ));
 
         return items.stream()
-                .map(item -> {
-                    ItemWithBookingsDto dto = new ItemWithBookingsDto();
-                    dto.setId(item.getId());
-                    dto.setName(item.getName());
-                    dto.setDescription(item.getDescription());
-                    dto.setAvailable(item.getAvailable());
-                    dto.setRequestId(item.getRequest() != null ? item.getRequest().getId() : null);
-
-                    List<Booking> lastBookings = bookingRepository.findLastBooking(item.getId(), now);
-                    if (!lastBookings.isEmpty()) {
-                        Booking last = lastBookings.get(0);
-                        BookingShortDto lastDto = new BookingShortDto();
-                        lastDto.setId(last.getId());
-                        lastDto.setStart(last.getStart());
-                        lastDto.setEnd(last.getEnd());
-                        lastDto.setBookerId(last.getBooker().getId());
-                        dto.setLastBooking(lastDto);
-                    }
-
-                    List<Booking> nextBookings = bookingRepository.findNextBooking(item.getId(), now);
-                    if (!nextBookings.isEmpty()) {
-                        Booking next = nextBookings.get(0);
-                        BookingShortDto nextDto = new BookingShortDto();
-                        nextDto.setId(next.getId());
-                        nextDto.setStart(next.getStart());
-                        nextDto.setEnd(next.getEnd());
-                        nextDto.setBookerId(next.getBooker().getId());
-                        dto.setNextBooking(nextDto);
-                    }
-
-                    dto.setComments(commentsByItemId.getOrDefault(item.getId(), Collections.emptyList()));
-
-                    return dto;
-                })
+                .map(item -> ItemMapper.toWithBookingsDto(
+                        item,
+                        lastBookingMap.get(item.getId()),
+                        nextBookingMap.get(item.getId()),
+                        commentsByItemId.getOrDefault(item.getId(), Collections.emptyList())
+                ))
                 .collect(Collectors.toList());
     }
 
@@ -182,20 +159,16 @@ public CommentResponseDto addComment(Long itemId, Long authorId, CommentCreateRe
                 .orElseThrow(() -> new NotFoundException("Пользователь с id " + authorId + " не найден"));
 
         LocalDateTime now = LocalDateTime.now();
-        List<Booking> completed = bookingRepository.findByBookerIdAndItemIdAndStatus(authorId, itemId, BookingStatus.APPROVED);
-        boolean hasCompletedBooking = completed.stream()
+        List<Booking> relevantBookings = bookingRepository.findByBookerIdAndItemIdAndStatusIn(
+                authorId, itemId, List.of(BookingStatus.APPROVED, BookingStatus.WAITING));
+        boolean hasCompletedBooking = relevantBookings.stream()
                 .anyMatch(b -> !b.getEnd().isAfter(now));
 
         if (!hasCompletedBooking) {
             throw new ValidationException("Пользователь не может оставить отзыв, так как не брал вещь в аренду или аренда ещё не завершена");
         }
 
-        Comment comment = new Comment();
-        comment.setText(request.getText());
-        comment.setItem(item);
-        comment.setAuthor(author);
-        comment.setCreated(now);
-
+        Comment comment = CommentMapper.fromCreateRequest(request, item, author, now);
         Comment saved = commentRepository.save(comment);
         return CommentMapper.toResponseDto(saved);
     }
diff --git a/src/main/java/ru/practicum/shareit/item/storage/ItemStorage.java b/src/main/java/ru/practicum/shareit/item/storage/ItemStorage.java
diff --git a/src/main/java/ru/practicum/shareit/user/storage/UserStorage.java b/src/main/java/ru/practicum/shareit/user/storage/UserStorage.java

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,13 @@ public static Booking fromCreateRequest(BookingCreateRequest bookingCreateReques`
`27`	`27`	`booking.setBooker(booker);`
`28`	`28`	`return booking;`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ public static BookingShortDto toShortDto(Booking booking) {`
	`32`	`+ BookingShortDto dto = new BookingShortDto();`
	`33`	`+ dto.setId(booking.getId());`
	`34`	`+ dto.setStart(booking.getStart());`
	`35`	`+ dto.setEnd(booking.getEnd());`
	`36`	`+ dto.setBookerId(booking.getBooker().getId());`
	`37`	`+ return dto;`
	`38`	`+ }`
`30`	`39`	`}`