fix36

Author: ivanvznkv

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

@@ -35,7 +35,8 @@ 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 CAST(:rangeEnd AS timestamp) IS NULL OR e.eventDate BETWEEN :rangeStart AND :rangeEnd)")
+            "AND (:rangeStart IS NULL OR e.eventDate >= :rangeStart) " +
+            "AND (:rangeEnd IS NULL OR e.eventDate <= :rangeEnd)")
     @EntityGraph(attributePaths = {"category", "initiator"})
     Page<Event> searchEventsAdmin(@Param("users") List<Long> users,
                                   @Param("states") List<EventState> states,
@@ -51,8 +52,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,