fix28

Author: ivanvznkv

ewm-service/src/main/java/ru/practicum/ewm/event/controller/AdminEventController.java

@@ -22,27 +22,8 @@
 public class AdminEventController {
     private final EventService eventService;
 
-//    @GetMapping
-//    public List<EventFullDto> getEvents(@Valid @ModelAttribute AdminEventSearchParams params) {
-//        return eventService.getEventsForAdmin(params);
-//    }
-
     @GetMapping
-    public List<EventFullDto> getEvents(@RequestParam(required = false) List<Long> users,
-                                        @RequestParam(required = false) List<String> states,
-                                        @RequestParam(required = false) List<Long> categories,
-                                        @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime rangeStart,
-                                        @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime rangeEnd,
-                                        @RequestParam(defaultValue = "0") @PositiveOrZero int from,
-                                        @RequestParam(defaultValue = "10") @Positive int size) {
-        AdminEventSearchParams params = new AdminEventSearchParams();
-        params.setUsers(users);
-        params.setStates(states);
-        params.setCategories(categories);
-        params.setRangeStart(rangeStart);
-        params.setRangeEnd(rangeEnd);
-        params.setFrom(from);
-        params.setSize(size);
+    public List<EventFullDto> getEvents(@Valid @ModelAttribute AdminEventSearchParams params) {
         return eventService.getEventsForAdmin(params);
     }
 

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

@@ -16,34 +16,21 @@ 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 (: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 (:rangeStart IS NULL OR e.eventDate >= :rangeStart) " +
-            "AND (:rangeEnd IS NULL OR e.eventDate <= :rangeEnd) " +
+            "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<EventState> states,   //enum
+                                  @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 " +

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

@@ -102,33 +102,6 @@ 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) {
@@ -138,18 +111,10 @@ public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
             throw new IllegalArgumentException("Параметры from и size должны быть > 0");
         }
 
-        // Преобразуем строки в enum
-        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(),
-                stateEnums,
+                params.getStates(),
                 params.getCategories(),
                 params.getRangeStart(),
                 params.getRangeEnd(),