fix41

Author: ivanvznkv

ewm-service/src/main/java/ru/practicum/ewm/event/controller/AdminEventController.java

@@ -35,14 +35,16 @@ public List<EventFullDto> getEvents(@RequestParam(required = false) List<Long> u
         log.info("Admin getEvents called with users={}, states={}, categories={}, rangeStart={}, rangeEnd={}, from={}, size={}",
                 users, states, categories, rangeStart, rangeEnd, from, size);
 
-        AdminEventSearchParams params = new AdminEventSearchParams();
-        params.setUsers(users);
-        params.setStates(states);
-        params.setCategories(categories);
-        params.setRangeStart(rangeStart);
-        params.setRangeEnd(rangeEnd);
-        params.setFrom(from);
-        params.setSize(size);
+        AdminEventSearchParams params = AdminEventSearchParams.builder()
+                .users(users)
+                .states(states)
+                .categories(categories)
+                .rangeStart(rangeStart)
+                .rangeEnd(rangeEnd)
+                .from(from)
+                .size(size)
+                .build();
+
         return eventService.getEventsForAdmin(params);
     }
 

ewm-service/src/main/java/ru/practicum/ewm/event/dto/AdminEventSearchParams.java

@@ -3,13 +3,15 @@
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.PositiveOrZero;
+import lombok.Builder;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
+@Builder
 public class AdminEventSearchParams {
     private List<Long> users;
     private List<String> states;
@@ -18,15 +20,15 @@ public class AdminEventSearchParams {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime rangeStart;
 
-
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime rangeEnd;
 
-
     @PositiveOrZero
+    @Builder.Default
     private int from = 0;
 
     @Positive
+    @Builder.Default
     private int size = 10;
 
     @AssertTrue(message = "Дата начала не может быть позже даты окончания")

ewm-service/src/main/java/ru/practicum/ewm/event/dto/PublicEventSearchParams.java

@@ -3,6 +3,7 @@
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.PositiveOrZero;
+import lombok.Builder;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.practicum.ewm.event.util.SortType;
@@ -11,6 +12,7 @@
 import java.util.List;
 
 @Data
+@Builder
 public class PublicEventSearchParams {
     private String text;
     private List<Long> categories;
@@ -21,13 +23,18 @@ public class PublicEventSearchParams {
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime rangeEnd;
+
+    @Builder.Default
     private Boolean onlyAvailable = false;
+
     private SortType sort;
 
     @PositiveOrZero
+    @Builder.Default
     private int from = 0;
 
     @Positive
+    @Builder.Default
     private int size = 10;
 
     @AssertTrue(message = "Дата начала не может быть позже даты окончания")

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

@@ -130,19 +130,13 @@ public List<EventFullDto> getEventsForAdmin(AdminEventSearchParams params) {
 
         Pageable pageable = PageRequest.of(from / size, size, Sort.by("id"));
 
-        Page<Event> page;
-        try {
-            page = eventRepository.searchEventsAdmin(
-                    params.getUsers(),
-                    stateEnums,
-                    params.getCategories(),
-                    params.getRangeStart(),
-                    params.getRangeEnd(),
-                    pageable);
-        } catch (Exception e) {
-            log.error("Error in searchEventsAdmin: ", e);
-            throw e;
-        }
+        Page<Event> page = eventRepository.searchEventsAdmin(
+                params.getUsers(),
+                stateEnums,
+                params.getCategories(),
+                params.getRangeStart(),
+                params.getRangeEnd(),
+                pageable);
 
         List<Event> events = page.getContent();
         List<Long> eventIds = events.stream().map(Event::getId).collect(Collectors.toList());