fix4

Author: ivanvznkv

ewm-service/src/main/java/ru/practicum/ewm/compilation/repository/CompilationRepository.java

@@ -17,6 +17,7 @@ public interface CompilationRepository extends JpaRepository<Compilation, Long>
     @EntityGraph(attributePaths = {"events"})
     Page<Compilation> findByPinned(boolean pinned, Pageable pageable);
 
+    @Override
     @EntityGraph(attributePaths = {"events"})
     Optional<Compilation> findById(Long id);
 }

ewm-service/src/main/java/ru/practicum/ewm/compilation/service/CompilationServiceImpl.java

@@ -38,7 +38,6 @@ public CompilationDto createCompilation(NewCompilationDto dto) {
                 .collect(Collectors.toSet());
         return CompilationMapper.toCompilationDto(compilation, eventShortDtos);
     }
-
     @Override
     @Transactional
     public CompilationDto updateCompilation(Long compId, UpdateCompilationRequest request) {
@@ -55,11 +54,7 @@ public CompilationDto updateCompilation(Long compId, UpdateCompilationRequest re
             compilation.setEvents(events);
         }
         compilation = compilationRepository.save(compilation);
-        Set<Event> events = compilation.getEvents();
-        if (events == null) {
-            events = Set.of();
-        }
-        Set<EventShortDto> eventShortDtos = events.stream()
+        Set<EventShortDto> eventShortDtos = compilation.getEvents().stream()
                 .map(event -> EventMapper.toEventShortDto(event, 0L, 0L))
                 .collect(Collectors.toSet());
         return CompilationMapper.toCompilationDto(compilation, eventShortDtos);

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

@@ -36,7 +36,7 @@ Page<Event> findAllByAdminFilters(@Param("users") List<Long> users,
             "LEFT JOIN FETCH e.category " +
             "LEFT JOIN FETCH e.initiator " +
             "WHERE e.state = 'PUBLISHED' " +
-            "AND (:text IS NULL OR LOWER(e.annotation) LIKE LOWER(CONCAT('%', :text, '%')) OR LOWER(e.description) LIKE LOWER(CONCAT('%', :text, '%'))) " +
+            "AND (:text IS NULL OR (LOWER(e.annotation) LIKE LOWER(CONCAT('%', :text, '%')) OR 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 e.eventDate BETWEEN :rangeStart AND :rangeEnd")

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

@@ -36,11 +36,11 @@ public List<EventShortDto> getEvents(String text, List<Long> categories, Boolean
                                          LocalDateTime rangeStart, LocalDateTime rangeEnd,
                                          Boolean onlyAvailable, SortType sort,
                                          int from, int size, HttpServletRequest request) {
-        if (size <= 0) {
-            size = 10;
-        }
-        if (from < 0) {
-            from = 0;
+        if (size <= 0) size = 10;
+        if (from < 0) from = 0;
+
+        if (rangeStart != null && rangeEnd != null && rangeStart.isAfter(rangeEnd)) {
+            throw new IllegalArgumentException("Дата начала не может быть позже даты окончания");
         }
 
         sendHit(request);
@@ -122,7 +122,7 @@ private Map<Long, Long> getViewsMap(List<Event> events) {
                 .collect(Collectors.toList());
         try {
             LocalDateTime start = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
-            LocalDateTime end = LocalDateTime.now().plusMinutes(5);
+            LocalDateTime end = LocalDateTime.now().plusDays(1);
             List<ViewStats> stats = statsClient.getStats(start, end, uris, false);
             return stats.stream()
                     .collect(Collectors.toMap(