fix30

Author: ivanvznkv

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

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import ru.practicum.ewm.event.model.Event;
+import ru.practicum.ewm.event.model.EventState;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -15,21 +16,34 @@ public interface EventRepository extends JpaRepository<Event, Long> {
 
     boolean existsByCategoryId(Long categoryId);
 
-    @Query("SELECT e FROM Event e " +
+//    @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 DISTINCT e FROM Event e " +
+            "LEFT JOIN FETCH e.category " +
+            "LEFT JOIN FETCH e.initiator " +
             "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")
+            "AND (CAST(:rangeStart AS timestamp) IS NULL OR CAST(:rangeEnd AS timestamp) IS NULL OR e.eventDate BETWEEN :rangeStart AND :rangeEnd)")
     Page<Event> searchEventsAdmin(@Param("users") List<Long> users,
-                                  @Param("states") List<String> states,
+                                  @Param("states") List<EventState> 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 " +

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

@@ -102,6 +102,33 @@ public EventFullDto updateUserEvent(Long userId, Long eventId, UpdateEventUserRe
         return EventMapper.toEventFullDto(event, 0L, 0L);
     }
 
+//    @Override
+//    @Transactional(readOnly = true)
+//    public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
+//        int from = params.getFrom();
+//        int size = params.getSize();
+//        if (size <= 0 || from < 0) {
+//            throw new IllegalArgumentException("Параметры from и size должны быть > 0");
+//        }
+//
+//        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);
+//
+//        return events.stream()
+//                .map(event -> EventMapper.toEventFullDto(event, 0L, confirmedRequestsMap.getOrDefault(event.getId(), 0L)))
+//                .collect(Collectors.toList());
+//    }
+
     @Override
     @Transactional(readOnly = true)
     public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
@@ -110,11 +137,17 @@ public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
         if (size <= 0 || from < 0) {
             throw new IllegalArgumentException("Параметры from и size должны быть > 0");
         }
+        List<EventState> stateEnums = null;
+        if (params.getStates() != null && !params.getStates().isEmpty()) {
+            stateEnums = params.getStates().stream()
+                    .map(EventState::valueOf)
+                    .collect(Collectors.toList());
+        }
 
         Pageable pageable = PageRequest.of(from / size, size, Sort.by("id"));
         Page<Event> page = eventRepository.searchEventsAdmin(
                 params.getUsers(),
-                params.getStates(),
+                stateEnums,
                 params.getCategories(),
                 params.getRangeStart(),
                 params.getRangeEnd(),