Merge pull request #7881 from ita-social-projects/7422-apiswagger-ui-…

…wrong-link-used-in-get-request-events added custom swagger schema for FilterEventDto
ita-social-projects · Dec 6, 2024 · a81cc19 · a81cc19
2 parents 11b61ca + 9e169fd
commit a81cc19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/core/src/main/java/greencity/controller/EventController.java b/core/src/main/java/greencity/controller/EventController.java
@@ -179,7 +179,11 @@ public ResponseEntity<EventDto> getEvent(
     public ResponseEntity<PageableAdvancedDto<EventDto>> getEvents(
         @Parameter(hidden = true) Pageable pageable,
         @RequestParam(required = false, name = "user-id") Long userId,
-        FilterEventDto filterEventDto) {
+        @Schema(
+            description = "Filters for events",
+            name = "FilterEventDto",
+            type = "object",
+            example = FilterEventDto.defaultJson) FilterEventDto filterEventDto) {
         if (filterEventDto != null && filterEventDto.getStatuses() != null) {
             validateStatusesRequireUserId(filterEventDto.getStatuses(), userId);
         }

diff --git a/service-api/src/main/java/greencity/dto/filter/FilterEventDto.java b/service-api/src/main/java/greencity/dto/filter/FilterEventDto.java
@@ -23,4 +23,17 @@ public class FilterEventDto {
     private EventType type;
     private ZonedDateTime from;
     private ZonedDateTime to;
+
+    public static final String defaultJson = """
+        {
+          "time": null,
+          "cities": [],
+          "statuses": [],
+          "tags": [],
+          "title": null,
+          "type": null,
+          "from": null,
+          "to": null
+        }
+        """;
 }