Implementing a new EventResponseDTO with field rearrangement

core/src/main/java/greencity/config/SecurityConfig.java

@@ -193,6 +193,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                     EVENTS,
                     EVENTS + "/addresses",
                     EVENTS + EVENT_ID,
+                    EVENTS + "/v2" + EVENT_ID,
                     EVENTS + EVENT_ID + ATTENDERS,
                     "/languages/codes",
                     SEARCH + ECO_NEWS,

core/src/main/java/greencity/controller/EventController.java

@@ -13,6 +13,7 @@
 import greencity.dto.event.AddressDto;
 import greencity.dto.event.EventAttenderDto;
 import greencity.dto.event.EventDto;
+import greencity.dto.event.EventResponseDto;
 import greencity.dto.event.UpdateEventRequestDto;
 import greencity.dto.filter.FilterEventDto;
 import greencity.dto.user.UserForListDto;
@@ -165,6 +166,27 @@ public ResponseEntity<EventDto> getEvent(
         return ResponseEntity.ok().body(eventService.getEvent(eventId, principal));
     }
 
+    /**
+     * Method for getting the event by event id version 2.
+     *
+     * @return {@link EventResponseDto} instance.
+     * @author Yurii Osovskyi.
+     */
+    @Operation(summary = "Get the event")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = HttpStatuses.OK),
+        @ApiResponse(responseCode = "400", description = HttpStatuses.BAD_REQUEST,
+            content = @Content(examples = @ExampleObject(HttpStatuses.BAD_REQUEST))),
+        @ApiResponse(responseCode = "404", description = HttpStatuses.NOT_FOUND,
+            content = @Content(examples = @ExampleObject(HttpStatuses.NOT_FOUND)))
+    })
+    @GetMapping("/v2/{eventId}")
+    public ResponseEntity<EventResponseDto> getEventV2(
+        @PathVariable Long eventId,
+        @Parameter(hidden = true) Principal principal) {
+        return ResponseEntity.ok().body(eventService.getEventV2(eventId, principal));
+    }
+
     /**
      * Method for getting pages of events.
      *
@@ -600,4 +622,4 @@ public ResponseEntity<Object> declineRequest(@PathVariable Long eventId, @PathVa
         eventService.declineRequest(eventId, principal.getName(), userId);
         return ResponseEntity.status(HttpStatus.OK).build();
     }
-}
+}

core/src/test/java/greencity/ModelUtils.java

@@ -18,8 +18,11 @@
 import greencity.dto.event.AddEventDtoRequest;
 import greencity.dto.event.AddressDto;
 import greencity.dto.event.EventAuthorDto;
+import greencity.dto.event.EventDateInformationDto;
 import greencity.dto.event.EventDateLocationDto;
 import greencity.dto.event.EventDto;
+import greencity.dto.event.EventInformationDto;
+import greencity.dto.event.EventResponseDto;
 import greencity.dto.event.UpdateEventDateLocationDto;
 import greencity.dto.event.UpdateEventRequestDto;
 import greencity.dto.favoriteplace.FavoritePlaceDto;
@@ -39,6 +42,7 @@
 import greencity.dto.location.LocationDto;
 import greencity.dto.location.MapBoundsDto;
 import greencity.dto.place.PlaceByBoundsDto;
+import greencity.dto.tag.TagDto;
 import greencity.dto.todolistitem.CustomToDoListItemResponseDto;
 import greencity.dto.todolistitem.ToDoListItemPostDto;
 import greencity.dto.todolistitem.ToDoListItemRequestDto;
@@ -59,15 +63,19 @@
 import greencity.enums.ArticleType;
 import greencity.enums.CommentStatus;
 import greencity.enums.EventStatus;
+import greencity.enums.EventType;
 import greencity.enums.Role;
 import greencity.enums.ToDoListItemStatus;
 import greencity.enums.TagType;
 import greencity.enums.UserStatus;
 import java.security.Principal;
 import java.sql.Date;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -588,4 +596,55 @@ public static List<PlaceByBoundsDto> getPlaceByBoundsDto() {
             .location(new LocationDto())
             .build());
     }
-}
+
+    public static EventResponseDto getEventResponseDto() {
+        return EventResponseDto.builder()
+            .id(1L)
+            .eventInformation(EventInformationDto.builder()
+                .title("Test Event")
+                .description("New Test Event")
+                .tags(List.of(TagUaEnDto.builder()
+                    .id(2L)
+                    .nameUa("Соціальний")
+                    .nameEn("Social")
+                    .build()))
+                .build())
+            .organizer(EventAuthorDto.builder().id(1L).name("Test").email("[email protected]").build())
+            .creationDate(LocalDate.of(2025, 1, 10))
+            .isOpen(true)
+            .dates(List.of(
+                EventDateInformationDto.builder()
+                    .startDate(ZonedDateTime.of(2025, 12, 26, 12, 30, 0, 0, ZoneOffset.UTC))
+                    .finishDate(ZonedDateTime.of(2025, 12, 26, 21, 59, 0, 0, ZoneOffset.UTC))
+                    .onlineLink("www.testlink.com")
+                    .coordinates(AddressDto.builder()
+                        .latitude(50.44628775288652)
+                        .longitude(30.49364829378446)
+                        .streetEn("Halytska Square")
+                        .streetUa("Галицька площа")
+                        .houseNumber("1")
+                        .cityEn("Kyiv")
+                        .cityUa("Київ")
+                        .regionEn("Kyiv")
+                        .regionUa("місто Київ")
+                        .countryEn("Ukraine")
+                        .countryUa("Україна")
+                        .formattedAddressEn("Halytska Sq, 1, Kyiv, Ukraine, 02000")
+                        .formattedAddressUa("Галицька пл., 1, Київ, Україна, 02000")
+                        .build())
+                    .build()))
+            .titleImage("https://test.png")
+            .additionalImages(List.of("https://test1.png", "https://test2.png"))
+            .type(EventType.OFFLINE)
+            .isRelevant(true)
+            .likes(3)
+            .dislikes(1)
+            .countComments(1)
+            .eventRate(20.0)
+            .currentUserGrade(50)
+            .isSubscribed(false)
+            .isFavorite(false)
+            .isOrganizedByFriend(false)
+            .build();
+    }
+}

core/src/test/java/greencity/controller/EventControllerTest.java

@@ -7,6 +7,7 @@
 import greencity.dto.PageableAdvancedDto;
 import greencity.dto.event.AddEventDtoRequest;
 import greencity.dto.event.EventDto;
+import greencity.dto.event.EventResponseDto;
 import greencity.dto.event.UpdateEventRequestDto;
 import greencity.dto.filter.FilterEventDto;
 import greencity.dto.user.UserVO;
@@ -756,4 +757,34 @@ void declineRequestTest() {
             .andExpect(status().isOk());
         verify(eventService).declineRequest(eventId, principal.getName(), userId);
     }
+
+    @Test
+    @SneakyThrows
+    void getEventV2Test() {
+        Long eventId = 1L;
+        EventResponseDto eventResponseDto = ModelUtils.getEventResponseDto();
+
+        when(eventService.getEventV2(eventId, principal)).thenReturn(eventResponseDto);
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.findAndRegisterModules();
+        String expectedJson = objectMapper.writeValueAsString(eventResponseDto);
+
+        mockMvc.perform(get(EVENTS_CONTROLLER_LINK + "/v2/{eventId}", eventId)
+            .principal(principal)
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().json(expectedJson));
+
+        verify(eventService, times(1)).getEventV2(eventId, principal);
+    }
+
+    @Test
+    @SneakyThrows
+    void getEventV2FailedTest() {
+        mockMvc.perform(get(EVENTS_CONTROLLER_LINK + "/v2/{eventId}", "not_number").principal(principal))
+            .andExpect(status().isBadRequest());
+
+        verify(eventService, times(0)).getEventV2(1L, principal);
+    }
 }

core/src/test/java/greencity/webcontroller/ManagementEventControllerTest.java

@@ -78,6 +78,7 @@ class ManagementEventControllerTest {
 
     @BeforeEach
     void setUp() {
+        Locale.setDefault(Locale.ENGLISH);
         this.mockMvc = MockMvcBuilders.standaloneSetup(managementEventController)
             .setCustomArgumentResolvers(new PageableHandlerMethodArgumentResolver())
             .setValidator(mockValidator)

service-api/src/main/java/greencity/dto/event/EventDateInformationDto.java

@@ -0,0 +1,18 @@
+package greencity.dto.event;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+@SuperBuilder
+@NoArgsConstructor
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+public class EventDateInformationDto extends AbstractEventDateLocationDto {
+    private Long id;
+    private EventResponseDto event;
+    private AddressDto coordinates;
+}

service-api/src/main/java/greencity/dto/event/EventInformationDto.java

@@ -0,0 +1,20 @@
+package greencity.dto.event;
+
+import greencity.dto.tag.TagUaEnDto;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.util.List;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class EventInformationDto {
+    private String title;
+    private String description;
+    @NotEmpty
+    private List<TagUaEnDto> tags;
+}

service-api/src/main/java/greencity/dto/event/EventResponseDto.java

@@ -0,0 +1,57 @@
+package greencity.dto.event;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import greencity.enums.EventType;
+import jakarta.validation.constraints.Max;
+import lombok.Builder;
+import lombok.Data;
+import org.springframework.lang.Nullable;
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@Builder
+public class EventResponseDto {
+    private Long id;
+
+    private EventInformationDto eventInformation;
+
+    private EventAuthorDto organizer;
+
+    private LocalDate creationDate;
+
+    private Boolean isOpen;
+
+    @Max(7)
+    private List<EventDateInformationDto> dates;
+
+    @Nullable
+    private String titleImage;
+
+    @Nullable
+    @Max(4)
+    private List<String> additionalImages;
+
+    private EventType type;
+
+    @JsonProperty("isSubscribed")
+    private boolean isSubscribed;
+
+    @JsonProperty("isFavorite")
+    private boolean isFavorite;
+
+    private Boolean isRelevant;
+
+    private Integer likes;
+
+    private Integer dislikes;
+
+    private Integer countComments;
+
+    @JsonProperty("isOrganizedByFriend")
+    private boolean isOrganizedByFriend;
+
+    private Double eventRate;
+
+    private Integer currentUserGrade;
+}

service-api/src/main/java/greencity/service/EventService.java

@@ -6,6 +6,7 @@
 import greencity.dto.event.AddressDto;
 import greencity.dto.event.EventAttenderDto;
 import greencity.dto.event.EventDto;
+import greencity.dto.event.EventResponseDto;
 import greencity.dto.event.EventVO;
 import greencity.dto.event.UpdateEventRequestDto;
 import greencity.dto.filter.FilterEventDto;
@@ -45,6 +46,14 @@ public interface EventService {
      */
     EventDto getEvent(Long eventId, Principal principal);
 
+    /**
+     * Method for getting Event instance.
+     *
+     * @param eventId - event id.
+     * @return {@link EventResponseDto} instance.
+     */
+    EventResponseDto getEventV2(Long eventId, Principal principal);
+
     /**
      * Method for getting all Event instances filtered.
      *

service/src/main/java/greencity/mapping/events/EventDtoMapper.java

@@ -9,10 +9,9 @@
 import greencity.entity.event.Address;
 import greencity.entity.event.Event;
 import greencity.entity.event.EventDateLocation;
-import greencity.entity.event.EventGrade;
 import greencity.entity.event.EventImages;
-import java.time.ZonedDateTime;
 import greencity.service.CommentService;
+import greencity.utils.EventUtils;
 import org.modelmapper.AbstractConverter;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +50,7 @@ public EventDto convert(Event event) {
         eventDto.setTitleImage(event.getTitleImage());
         eventDto.setOpen(event.isOpen());
         eventDto.setType(event.getType());
-        eventDto.setIsRelevant(isRelevant(event.getDates()));
+        eventDto.setIsRelevant(EventUtils.isRelevant(event.getDates()));
         eventDto.setLikes(event.getUsersLikedEvents().size());
         eventDto.setCountComments(commentService.countCommentsForEvent(event.getId()));
         User organizer = event.getOrganizer();
@@ -80,7 +79,7 @@ public EventDto convert(Event event) {
             eventDto.setAdditionalImages(event.getAdditionalImages().stream()
                 .map(EventImages::getLink).collect(Collectors.toList()));
         }
-        eventDto.setEventRate(calculateEventRate(event.getEventGrades()));
+        eventDto.setEventRate(EventUtils.calculateEventRate(event.getEventGrades()));
         return eventDto;
     }
 
@@ -111,16 +110,4 @@ private EventDateLocationDto convertEventDateLocation(EventDateLocation eventDat
         }
         return eventDateLocationDto;
     }
-
-    private double calculateEventRate(List<EventGrade> eventGrades) {
-        return eventGrades.stream()
-            .mapToInt(EventGrade::getGrade)
-            .average()
-            .orElse(0.0);
-    }
-
-    private boolean isRelevant(List<EventDateLocation> dates) {
-        return dates.getLast().getFinishDate().isAfter(ZonedDateTime.now())
-            || dates.getLast().getFinishDate().isEqual(ZonedDateTime.now());
-    }
-}
+}