fix1

ivanvznkv · ivanvznkv · commit 4193b1ff7cbc · 2026-04-06T18:06:26.000+03:00
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/category/dto/CategoryDto.java b/ewm-service/src/main/java/ru/practicum/ewm/category/dto/CategoryDto.java
@@ -1,5 +1,6 @@
 package ru.practicum.ewm.category.dto;
 
+import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,5 +10,7 @@
 @AllArgsConstructor
 public class CategoryDto {
     private Long id;
+
+    @Size(max = 50)
     private String name;
 }
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/category/dto/NewCategoryDto.java b/ewm-service/src/main/java/ru/practicum/ewm/category/dto/NewCategoryDto.java
@@ -1,10 +1,12 @@
 package ru.practicum.ewm.category.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @Data
 public class NewCategoryDto {
     @NotBlank(message = "Название категории не может быть пустым")
+    @Size(max = 50)
     private String name;
 }
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/compilation/mapper/CompilationMapper.java b/ewm-service/src/main/java/ru/practicum/ewm/compilation/mapper/CompilationMapper.java
@@ -31,13 +31,4 @@ public static CompilationDto toCompilationDto(Compilation compilation, Set<Event
                 compilation.getTitle()
         );
     }
-
-    public static CompilationDto toCompilationDto(Compilation compilation) {
-        return new CompilationDto(
-                compilation.getId(),
-                null,
-                compilation.getPinned(),
-                compilation.getTitle()
-        );
-    }
 }
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/compilation/service/CompilationServiceImpl.java b/ewm-service/src/main/java/ru/practicum/ewm/compilation/service/CompilationServiceImpl.java
@@ -33,7 +33,10 @@ public CompilationDto createCompilation(NewCompilationDto dto) {
         Set<Event> events = (dto.getEvents() == null) ? Set.of() : Set.copyOf(eventRepository.findAllById(dto.getEvents()));
         Compilation compilation = CompilationMapper.toCompilation(dto, events);
         compilation = compilationRepository.save(compilation);
-        return CompilationMapper.toCompilationDto(compilation);
+        Set<EventShortDto> eventShortDtos = events.stream()
+                .map(event -> EventMapper.toEventShortDto(event, 0L, 0L))
+                .collect(Collectors.toSet());
+        return CompilationMapper.toCompilationDto(compilation, eventShortDtos);
     }
 
     @Override
@@ -47,12 +50,16 @@ public CompilationDto updateCompilation(Long compId, UpdateCompilationRequest re
         if (request.getPinned() != null) {
             compilation.setPinned(request.getPinned());
         }
+        Set<Event> events = compilation.getEvents();
         if (request.getEvents() != null) {
-            Set<Event> events = Set.copyOf(eventRepository.findAllById(request.getEvents()));
+            events = Set.copyOf(eventRepository.findAllById(request.getEvents()));
             compilation.setEvents(events);
         }
         compilation = compilationRepository.save(compilation);
-        return CompilationMapper.toCompilationDto(compilation);
+        Set<EventShortDto> eventShortDtos = events.stream()
+                .map(event -> EventMapper.toEventShortDto(event, 0L, 0L))
+                .collect(Collectors.toSet());
+        return CompilationMapper.toCompilationDto(compilation, eventShortDtos);
     }
 
     @Override
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/event/dto/EventFullDto.java b/ewm-service/src/main/java/ru/practicum/ewm/event/dto/EventFullDto.java
@@ -1,5 +1,6 @@
 package ru.practicum.ewm.event.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,18 +14,24 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class EventFullDto {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createdOn;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime eventDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime publishedOn;
+
     private Long id;
     private String annotation;
     private CategoryDto category;
     private Long confirmedRequests;
-    private LocalDateTime createdOn;
     private String description;
-    private LocalDateTime eventDate;
     private UserShortDto initiator;
     private Location location;
     private Boolean paid;
     private Integer participantLimit;
-    private LocalDateTime publishedOn;
     private Boolean requestModeration;
     private String state;
     private String title;
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/event/dto/EventShortDto.java b/ewm-service/src/main/java/ru/practicum/ewm/event/dto/EventShortDto.java
@@ -1,5 +1,6 @@
 package ru.practicum.ewm.event.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,11 +13,13 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class EventShortDto {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime eventDate;
+
     private Long id;
     private String annotation;
     private CategoryDto category;
     private Long confirmedRequests;
-    private LocalDateTime eventDate;
     private UserShortDto initiator;
     private Boolean paid;
     private String title;
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/event/dto/NewEventDto.java b/ewm-service/src/main/java/ru/practicum/ewm/event/dto/NewEventDto.java
@@ -4,6 +4,7 @@
 import jakarta.validation.constraints.*;
 import lombok.Data;
 import ru.practicum.ewm.event.model.Location;
+import jakarta.validation.constraints.Min;
 
 import java.time.LocalDateTime;
 
@@ -29,6 +30,8 @@ public class NewEventDto {
     private Location location;
 
     private Boolean paid;
+
+    @Min(0)
     private Integer participantLimit;
     private Boolean requestModeration;
 
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/event/dto/UpdateEventAdminRequest.java b/ewm-service/src/main/java/ru/practicum/ewm/event/dto/UpdateEventAdminRequest.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import ru.practicum.ewm.event.model.Location;
@@ -25,6 +26,8 @@ public class UpdateEventAdminRequest {
     private Location location;
 
     private Boolean paid;
+
+    @Min(0)
     private Integer participantLimit;
     private Boolean requestModeration;
 
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/event/dto/UpdateEventUserRequest.java b/ewm-service/src/main/java/ru/practicum/ewm/event/dto/UpdateEventUserRequest.java
@@ -5,6 +5,7 @@
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import ru.practicum.ewm.event.model.Location;
+import jakarta.validation.constraints.Min;
 
 import java.time.LocalDateTime;
 
@@ -25,6 +26,8 @@ public class UpdateEventUserRequest {
     private Location location;
 
     private Boolean paid;
+
+    @Min(0)
     private Integer participantLimit;
     private Boolean requestModeration;
 
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/exception/ErrorHandler.java b/ewm-service/src/main/java/ru/practicum/ewm/exception/ErrorHandler.java
@@ -1,8 +1,10 @@
 package ru.practicum.ewm.exception;
 
+import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -50,4 +52,25 @@ private ApiError buildApiError(HttpStatus status, String reason, String message)
                 .timestamp(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
                 .build();
     }
+
+    @ExceptionHandler(MissingServletRequestParameterException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiError handleMissingParams(MissingServletRequestParameterException e) {
+        log.error("400 {}", e.getMessage());
+        return buildApiError(HttpStatus.BAD_REQUEST, "Отсутствует обязательный параметр", e.getMessage());
+    }
+
+    @ExceptionHandler(ConstraintViolationException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiError handleConstraintViolation(ConstraintViolationException e) {
+        log.error("400 {}", e.getMessage());
+        return buildApiError(HttpStatus.BAD_REQUEST, "Некорректное значение параметра", e.getMessage());
+    }
+
+    @ExceptionHandler(ArithmeticException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiError handleArithmetic(ArithmeticException e) {
+        log.error("400 {}", e.getMessage());
+        return buildApiError(HttpStatus.BAD_REQUEST, "Некорректные параметры пагинации", e.getMessage());
+    }
 }
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/request/dto/ParticipationRequestDto.java b/ewm-service/src/main/java/ru/practicum/ewm/request/dto/ParticipationRequestDto.java
@@ -1,5 +1,6 @@
 package ru.practicum.ewm.request.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,6 +13,8 @@
 @AllArgsConstructor
 public class ParticipationRequestDto {
     private Long id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime created;
     private Long event;
     private Long requester;
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/request/mapper/RequestMapper.java b/ewm-service/src/main/java/ru/practicum/ewm/request/mapper/RequestMapper.java
@@ -7,12 +7,13 @@
 import ru.practicum.ewm.user.model.User;
 
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 
 public class RequestMapper {
 
     public static Request toRequest(Event event, User requester) {
         Request request = new Request();
-        request.setCreated(LocalDateTime.now());
+        request.setCreated(LocalDateTime.now().truncatedTo(ChronoUnit.MICROS));
         request.setEvent(event);
         request.setRequester(requester);
         request.setStatus(RequestStatus.PENDING);
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/request/service/RequestServiceImpl.java b/ewm-service/src/main/java/ru/practicum/ewm/request/service/RequestServiceImpl.java
@@ -120,20 +120,19 @@ public EventRequestStatusUpdateResult updateRequestStatus(Long userId, Long even
             }
             if (update.getStatus().equals("CONFIRMED")) {
                 if (limit > 0 && confirmedNow >= limit) {
-                    req.setStatus(RequestStatus.REJECTED);
-                    rejected.add(RequestMapper.toDto(req));
-                } else {
-                    req.setStatus(RequestStatus.CONFIRMED);
-                    confirmed.add(RequestMapper.toDto(req));
-                    confirmedNow++;
+                    throw new ConflictException("Достигнут лимит участников");
                 }
+                req.setStatus(RequestStatus.CONFIRMED);
+                confirmed.add(RequestMapper.toDto(req));
+                confirmedNow++;
             } else if (update.getStatus().equals("REJECTED")) {
                 req.setStatus(RequestStatus.REJECTED);
                 rejected.add(RequestMapper.toDto(req));
             } else {
                 throw new IllegalArgumentException("Некорректный статус");
             }
         }
+
         requestRepository.saveAll(requests);
         return new EventRequestStatusUpdateResult(confirmed, rejected);
     }
diff --git a/ewm-service/src/main/java/ru/practicum/ewm/user/dto/NewUserRequest.java b/ewm-service/src/main/java/ru/practicum/ewm/user/dto/NewUserRequest.java
@@ -2,14 +2,17 @@
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @Data
 public class NewUserRequest {
     @NotBlank(message = "Имя не может быть пустым")
+    @Size(min = 2, max = 250)
     private String name;
 
     @NotBlank(message = "Email не может быть пустым")
     @Email(message = "Некорректный формат email")
+    @Size(min = 6, max = 254)
     private String email;
 }

Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,4 @@ public static CompilationDto toCompilationDto(Compilation compilation, Set<Event`
`31`	`31`	`compilation.getTitle()`
`32`	`32`	`);`
`33`	`33`	`}`
`34`		`-`
`35`		`- public static CompilationDto toCompilationDto(Compilation compilation) {`
`36`		`- return new CompilationDto(`
`37`		`- compilation.getId(),`
`38`		`- null,`
`39`		`- compilation.getPinned(),`
`40`		`- compilation.getTitle()`
`41`		`- );`
`42`		`- }`
`43`	`34`	`}`