fix2

Author: ivanvznkv

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

@@ -50,13 +50,12 @@ public CompilationDto updateCompilation(Long compId, UpdateCompilationRequest re
         if (request.getPinned() != null) {
             compilation.setPinned(request.getPinned());
         }
-        Set<Event> events = compilation.getEvents();
-        if (request.getEvents() != null) {
-            events = Set.copyOf(eventRepository.findAllById(request.getEvents()));
+        if (request.getEvents() != null && !request.getEvents().isEmpty()) {
+            Set<Event> events = Set.copyOf(eventRepository.findAllById(request.getEvents()));
             compilation.setEvents(events);
         }
         compilation = compilationRepository.save(compilation);
-        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/service/AdminEventServiceImpl.java

@@ -30,8 +30,19 @@ public class AdminEventServiceImpl implements AdminEventService {
     @Transactional(readOnly = true)
     public List<EventFullDto> getEvents(List<Long> users, List<EventState> states, List<Long> categories,
                                         LocalDateTime rangeStart, LocalDateTime rangeEnd, int from, int size) {
+        if (size <= 0) {
+            size = 10;
+        }
+        if (from < 0) {
+            from = 0;
+        }
+
+        LocalDateTime start = (rangeStart != null) ? rangeStart : LocalDateTime.of(1970, 1, 1, 0, 0, 0);
+        LocalDateTime end = (rangeEnd != null) ? rangeEnd : LocalDateTime.of(3000, 1, 1, 0, 0, 0);
+
         PageRequest page = PageRequest.of(from / size, size);
-        Page<Event> eventsPage = eventRepository.findAllByAdminFilters(users, states, categories, rangeStart, rangeEnd, page);
+        Page<Event> eventsPage = eventRepository.findAllByAdminFilters(users, states, categories, start, end, page);
+
         return eventsPage.stream()
                 .map(event -> EventMapper.toEventFullDto(event, 0L, eventRepository.countConfirmedRequests(event.getId())))
                 .collect(Collectors.toList());

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

@@ -106,6 +106,7 @@ private void sendHit(HttpServletRequest request) {
             hit.setIp(request.getRemoteAddr());
             hit.setTimestamp(LocalDateTime.now());
             statsClient.sendHit(hit);
+            log.info("Хит отправлен: {} {}", hit.getUri(), hit.getIp());
         } catch (Exception e) {
             log.error("Ошибка при отправке статистики: {}", e.getMessage());
         }
@@ -117,7 +118,9 @@ private Map<Long, Long> getViewsMap(List<Event> events) {
                 .map(event -> "/events/" + event.getId())
                 .collect(Collectors.toList());
         try {
-            List<ViewStats> stats = statsClient.getStats(STATS_START, LocalDateTime.now().plusDays(1), uris, false);
+            LocalDateTime start = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
+            LocalDateTime end = LocalDateTime.now().plusSeconds(10);
+            List<ViewStats> stats = statsClient.getStats(start, end, uris, false);
             return stats.stream()
                     .collect(Collectors.toMap(
                             vs -> Long.parseLong(vs.getUri().substring(vs.getUri().lastIndexOf('/') + 1)),

ewm-service/src/main/java/ru/practicum/ewm/exception/ErrorHandler.java

@@ -8,6 +8,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -73,4 +74,12 @@ public ApiError handleArithmetic(ArithmeticException e) {
         log.error("400 {}", e.getMessage());
         return buildApiError(HttpStatus.BAD_REQUEST, "Некорректные параметры пагинации", e.getMessage());
     }
+
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiError handleMethodArgumentTypeMismatch(MethodArgumentTypeMismatchException e) {
+        log.error("400 {}", e.getMessage());
+        return buildApiError(HttpStatus.BAD_REQUEST, "Некорректное значение параметра",
+                "Параметр '" + e.getName() + "' имеет неверный тип");
+    }
 }

ewm-service/src/main/java/ru/practicum/ewm/request/dto/ParticipationRequestDto.java

@@ -13,7 +13,6 @@
 @AllArgsConstructor
 public class ParticipationRequestDto {
     private Long id;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime created;
     private Long event;