fix15

Author: ivanvznkv

ewm-service/src/main/java/ru/practicum/ewm/event/repository/EventRepository.java

@@ -31,24 +31,21 @@ Page<Event> findAllByAdminFilters(@Param("users") List<Long> users,
                                       @Param("rangeEnd") LocalDateTime rangeEnd,
                                       Pageable pageable);
 
-    @Query(value = "SELECT DISTINCT e.* FROM events e " +
-            "LEFT JOIN categories c ON c.id = e.category_id " +
-            "LEFT JOIN users u ON u.id = e.initiator_id " +
+    @Query("SELECT DISTINCT e FROM Event e " +
+            "LEFT JOIN FETCH e.category " +
+            "LEFT JOIN FETCH e.initiator " +
             "WHERE e.state = 'PUBLISHED' " +
-            "AND (:text IS NULL OR (LOWER(e.annotation::text) LIKE LOWER(CONCAT('%', :text, '%')) " +
-            "OR LOWER(e.description::text) LIKE LOWER(CONCAT('%', :text, '%')))) " +
-            "AND (:categories IS NULL OR e.category_id IN (:categories)) " +
+            "AND (:text IS NULL OR LOWER(e.annotation) LIKE LOWER(CONCAT('%', :text, '%')) OR LOWER(e.description) LIKE LOWER(CONCAT('%', :text, '%'))) " +
+            "AND (:categories IS NULL OR e.category.id IN :categories) " +
             "AND (:paid IS NULL OR e.paid = :paid) " +
-            "AND (:rangeStart IS NULL OR e.event_date >= :rangeStart) " +
-            "AND (:rangeEnd IS NULL OR e.event_date <= :rangeEnd) " +
-            "OFFSET :offset ROWS FETCH NEXT :size ROWS ONLY", nativeQuery = true)
-    List<Event> findPublishedEventsWithFilters(@Param("text") String text,
+            "AND (:rangeStart IS NULL OR e.eventDate >= :rangeStart) " +
+            "AND (:rangeEnd IS NULL OR e.eventDate <= :rangeEnd)")
+    Page<Event> findPublishedEventsWithFilters(@Param("text") String text,
                                                @Param("categories") List<Long> categories,
                                                @Param("paid") Boolean paid,
                                                @Param("rangeStart") LocalDateTime rangeStart,
                                                @Param("rangeEnd") LocalDateTime rangeEnd,
-                                               @Param("offset") int offset,
-                                               @Param("size") int size);
+                                               Pageable pageable);
 
     @Query("SELECT COUNT(r) FROM Request r WHERE r.event.id = :eventId AND r.status = 'CONFIRMED'")
     Long countConfirmedRequests(@Param("eventId") Long eventId);

ewm-service/src/main/java/ru/practicum/ewm/event/service/EventServiceImpl.java

@@ -5,6 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.practicum.ewm.category.model.Category;
@@ -194,9 +195,11 @@ public List<EventShortDto> getEventsForPublic(PublicEventSearchParams params, Ht
 
         statsClient.sendHit(request);
 
-        List<Event> events = eventRepository.findPublishedEventsWithFilters(
+        Pageable pageable = PageRequest.of(from / size, size);
+        Page<Event> eventPage = eventRepository.findPublishedEventsWithFilters(
                 params.getText(), params.getCategories(), params.getPaid(),
-                rangeStart, rangeEnd, from, size);
+                rangeStart, rangeEnd, pageable);
+        List<Event> events = eventPage.getContent();
 
         Map<Long, Long> confirmedRequestsMap = getConfirmedRequestsMap(events);