fix19

Author: ivanvznkv

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

@@ -23,13 +23,13 @@ public interface EventRepository extends JpaRepository<Event, Long> {
             "AND e.event_date >= COALESCE(:rangeStart, '1900-01-01'::timestamp) " +
             "AND e.event_date <= COALESCE(:rangeEnd, '3000-01-01'::timestamp) " +
             "OFFSET :offset ROWS FETCH NEXT :size ROWS ONLY", nativeQuery = true)
-    List<Event> findAllByAdminFilters(@Param("users") List<Long> users,
-                                      @Param("states") List<String> states,
-                                      @Param("categories") List<Long> categories,
-                                      @Param("rangeStart") LocalDateTime rangeStart,
-                                      @Param("rangeEnd") LocalDateTime rangeEnd,
-                                      @Param("offset") int offset,
-                                      @Param("size") int size);
+    List<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,
+                                  @Param("offset") int offset,
+                                  @Param("size") int size);
 
     @Query(value = "SELECT DISTINCT e.* FROM events e " +
             "LEFT JOIN categories c ON c.id = e.category_id " +
@@ -43,13 +43,13 @@ List<Event> findAllByAdminFilters(@Param("users") List<Long> users,
             "AND e.event_date >= COALESCE(:rangeStart, '1900-01-01'::timestamp) " +
             "AND e.event_date <= COALESCE(:rangeEnd, '3000-01-01'::timestamp) " +
             "OFFSET :offset ROWS FETCH NEXT :size ROWS ONLY", nativeQuery = true)
-    List<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);
+    List<Event> searchEventsPublic(@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);
 
     @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

@@ -110,7 +110,7 @@ public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
         LocalDateTime start = params.getRangeStart();
         LocalDateTime end = params.getRangeEnd();
 
-        List<Event> events = eventRepository.findAllByAdminFilters(
+        List<Event> events = eventRepository.searchEventsAdmin(
                 params.getUsers(), params.getStates(), params.getCategories(),
                 start, end, from, size);
 
@@ -188,7 +188,7 @@ public List<EventShortDto> getEventsForPublic(PublicEventSearchParams params, Ht
 
         statsClient.sendHit(request);
 
-        List<Event> events = eventRepository.findPublishedEventsWithFilters(
+        List<Event> events = eventRepository.searchEventsPublic(
                 params.getText(), params.getCategories(), params.getPaid(),
                 rangeStart, rangeEnd, from, size);