fix22

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;
@@ -19,11 +20,11 @@ public interface EventRepository extends JpaRepository<Event, Long> {
             "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) " +
+            "AND (:rangeStart IS NULL OR e.eventDate >= :rangeStart) " +
+            "AND (:rangeEnd IS NULL OR e.eventDate <= :rangeEnd) " +
             "ORDER BY e.id")
     Page<Event> searchEventsAdmin(@Param("users") List<Long> users,
-                                  @Param("states") List<String> states,
+                                  @Param("states") List<EventState> states,   // теперь enum
                                   @Param("categories") List<Long> categories,
                                   @Param("rangeStart") LocalDateTime rangeStart,
                                   @Param("rangeEnd") LocalDateTime rangeEnd,
@@ -36,8 +37,8 @@ Page<Event> searchEventsAdmin(@Param("users") List<Long> users,
             "     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) " +
+            "AND (:rangeStart IS NULL OR e.eventDate >= :rangeStart) " +
+            "AND (:rangeEnd IS NULL OR e.eventDate <= :rangeEnd) " +
             "ORDER BY e.eventDate")
     Page<Event> searchEventsPublic(@Param("text") String text,
                                    @Param("categories") List<Long> categories,

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

@@ -111,10 +111,17 @@ public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
             throw new IllegalArgumentException("Параметры from и size должны быть > 0");
         }
 
+        List<EventState> states = null;
+        if (params.getStates() != null && !params.getStates().isEmpty()) {
+            states = 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(),
+                states,
                 params.getCategories(),
                 params.getRangeStart(),
                 params.getRangeEnd(),