fix21

Author: ivanvznkv

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

@@ -1,18 +1,51 @@
 package ru.practicum.ewm.event.repository;
 
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import ru.practicum.ewm.event.model.Event;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-public interface EventRepository extends JpaRepository<Event, Long>, EventRepositoryCustom {
+public interface EventRepository extends JpaRepository<Event, Long> {
 
     boolean existsByCategoryId(Long categoryId);
 
+    @Query("SELECT e FROM Event e " +
+            "WHERE (:users IS NULL OR e.initiator.id IN :users) " +
+            "AND (:states IS NULL OR e.state IN :states) " +
+            "AND (:categories IS NULL OR e.category.id IN :categories) " +
+            "AND (CAST(:rangeStart AS timestamp) IS NULL OR e.eventDate >= :rangeStart) " +
+            "AND (CAST(:rangeEnd AS timestamp) IS NULL OR e.eventDate <= :rangeEnd) " +
+            "ORDER BY e.id")
+    Page<Event> searchEventsAdmin(@Param("users") List<Long> users,
+                                  @Param("states") List<String> states,
+                                  @Param("categories") List<Long> categories,
+                                  @Param("rangeStart") LocalDateTime rangeStart,
+                                  @Param("rangeEnd") LocalDateTime rangeEnd,
+                                  Pageable pageable);
+
+    @Query("SELECT e FROM Event e " +
+            "WHERE e.state = 'PUBLISHED' " +
+            "AND (:text IS NULL OR :text = '' 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 (CAST(:rangeStart AS timestamp) IS NULL OR e.eventDate >= :rangeStart) " +
+            "AND (CAST(:rangeEnd AS timestamp) IS NULL OR e.eventDate <= :rangeEnd) " +
+            "ORDER BY e.eventDate")
+    Page<Event> searchEventsPublic(@Param("text") String text,
+                                   @Param("categories") List<Long> categories,
+                                   @Param("paid") Boolean paid,
+                                   @Param("rangeStart") LocalDateTime rangeStart,
+                                   @Param("rangeEnd") LocalDateTime rangeEnd,
+                                   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/repository/EventRepositoryCustom.java

@@ -3,7 +3,9 @@
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 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.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -109,13 +111,16 @@ public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
             throw new IllegalArgumentException("Параметры from и size должны быть > 0");
         }
 
-        LocalDateTime start = params.getRangeStart();
-        LocalDateTime end = params.getRangeEnd();
-
-        List<Event> events = eventRepository.searchEventsAdmin(
-                params.getUsers(), params.getStates(), params.getCategories(),
-                start, end, from, size);
+        Pageable pageable = PageRequest.of(from / size, size, Sort.by("id"));
+        Page<Event> page = eventRepository.searchEventsAdmin(
+                params.getUsers(),
+                params.getStates(),
+                params.getCategories(),
+                params.getRangeStart(),
+                params.getRangeEnd(),
+                pageable);
 
+        List<Event> events = page.getContent();
         List<Long> eventIds = events.stream().map(Event::getId).collect(Collectors.toList());
         Map<Long, Long> confirmedRequestsMap = eventRepository.countConfirmedRequestsBatch(eventIds);
 
@@ -185,19 +190,22 @@ public List<EventShortDto> getEventsForPublic(PublicEventSearchParams params, Ht
             throw new IllegalArgumentException("Параметры from и size должны быть > 0");
         }
 
-        LocalDateTime rangeStart = params.getRangeStart();
-        LocalDateTime rangeEnd = params.getRangeEnd();
-
         try {
             statsClient.sendHit(request);
         } catch (Exception e) {
             log.warn("Не удалось отправить статистику: {}", e.getMessage());
         }
 
-        List<Event> events = eventRepository.searchEventsPublic(
-                params.getText(), params.getCategories(), params.getPaid(),
-                rangeStart, rangeEnd, from, size);
+        Pageable pageable = PageRequest.of(from / size, size, Sort.by("eventDate").ascending());
+        Page<Event> page = eventRepository.searchEventsPublic(
+                params.getText(),
+                params.getCategories(),
+                params.getPaid(),
+                params.getRangeStart(),
+                params.getRangeEnd(),
+                pageable);
 
+        List<Event> events = page.getContent();
         Map<Long, Long> confirmedRequestsMap = getConfirmedRequestsMap(events);
 
         if (params.getOnlyAvailable()) {