added improvements according coderabbitai suggestions

urio999 · urio999 · commit 00112a1652d9 · 2025-01-31T10:48:43.000+02:00
diff --git a/core/src/test/java/greencity/ModelUtils.java b/core/src/test/java/greencity/ModelUtils.java
@@ -615,22 +615,7 @@ public static EventResponseDto getEventResponseDto() {
                     .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()))
+                    .coordinates(getAddressDtoCorrect()).build()))
             .titleImage("https://test.png")
             .additionalImages(List.of("https://test1.png", "https://test2.png"))
             .type(EventType.OFFLINE)
@@ -645,4 +630,20 @@ public static EventResponseDto getEventResponseDto() {
             .isOrganizedByFriend(false)
             .build();
     }
+
+    public static AddressDto getAddressDtoCorrect() {
+        return AddressDto.builder()
+            .latitude(50.4567236)
+            .longitude(30.2354469)
+            .streetUa("Вулиця")
+            .streetEn("Street")
+            .houseNumber("1B")
+            .cityUa("Київ")
+            .cityEn("Kyiv")
+            .regionUa("Область")
+            .regionEn("Oblast")
+            .countryUa("Країна")
+            .countryEn("Country")
+            .build();
+    }
 }
diff --git a/core/src/test/java/greencity/webcontroller/ManagementEventControllerTest.java b/core/src/test/java/greencity/webcontroller/ManagementEventControllerTest.java
@@ -26,6 +26,7 @@
 import java.util.Set;
 
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -75,16 +76,24 @@ class ManagementEventControllerTest {
     private Principal principal;
     @Mock
     private Validator mockValidator;
+    @Mock
+    private Locale defaultLocale;
 
     @BeforeEach
     void setUp() {
+        defaultLocale = Locale.getDefault();
         Locale.setDefault(Locale.ENGLISH);
         this.mockMvc = MockMvcBuilders.standaloneSetup(managementEventController)
             .setCustomArgumentResolvers(new PageableHandlerMethodArgumentResolver())
             .setValidator(mockValidator)
             .build();
     }
 
+    @AfterEach
+    void tearDown() {
+        Locale.setDefault(defaultLocale);
+    }
+
     @Test
     @SneakyThrows
     void getAllEventsWithQuery() {
diff --git a/service/src/main/java/greencity/mapping/events/EventResponseDtoMapper.java b/service/src/main/java/greencity/mapping/events/EventResponseDtoMapper.java
@@ -66,27 +66,30 @@ protected EventResponseDto convert(Event event) {
         User organizer = event.getOrganizer();
 
         List<EventDateInformationDto> dateInformation = event.getDates().stream()
-            .map(date -> EventDateInformationDto.builder()
-                .id(date.getId())
-                .startDate(date.getStartDate())
-                .finishDate(date.getFinishDate())
-                .onlineLink(date.getOnlineLink())
-                .coordinates(AddressDto.builder()
-                    .latitude(date.getAddress().getLatitude())
-                    .longitude(date.getAddress().getLongitude())
-                    .streetEn(date.getAddress().getStreetEn())
-                    .streetUa(date.getAddress().getStreetUa())
-                    .houseNumber(date.getAddress().getHouseNumber())
-                    .cityEn(date.getAddress().getCityEn())
-                    .cityUa(date.getAddress().getCityUa())
-                    .regionEn(date.getAddress().getRegionEn())
-                    .regionUa(date.getAddress().getRegionUa())
-                    .countryEn(date.getAddress().getCountryEn())
-                    .countryUa(date.getAddress().getCountryUa())
-                    .formattedAddressEn(date.getAddress().getFormattedAddressEn())
-                    .formattedAddressUa(date.getAddress().getFormattedAddressUa())
-                    .build())
-                .build())
+            .map(date -> {
+                assert date.getAddress() != null;
+                return EventDateInformationDto.builder()
+                    .id(date.getId())
+                    .startDate(date.getStartDate())
+                    .finishDate(date.getFinishDate())
+                    .onlineLink(date.getOnlineLink())
+                    .coordinates(AddressDto.builder()
+                        .latitude(date.getAddress().getLatitude())
+                        .longitude(date.getAddress().getLongitude())
+                        .streetEn(date.getAddress().getStreetEn())
+                        .streetUa(date.getAddress().getStreetUa())
+                        .houseNumber(date.getAddress().getHouseNumber())
+                        .cityEn(date.getAddress().getCityEn())
+                        .cityUa(date.getAddress().getCityUa())
+                        .regionEn(date.getAddress().getRegionEn())
+                        .regionUa(date.getAddress().getRegionUa())
+                        .countryEn(date.getAddress().getCountryEn())
+                        .countryUa(date.getAddress().getCountryUa())
+                        .formattedAddressEn(date.getAddress().getFormattedAddressEn())
+                        .formattedAddressUa(date.getAddress().getFormattedAddressUa())
+                        .build())
+                    .build();
+            })
             .collect(Collectors.toList());
 
         return EventResponseDto.builder()
diff --git a/service/src/main/java/greencity/utils/EventUtils.java b/service/src/main/java/greencity/utils/EventUtils.java
@@ -17,8 +17,12 @@ public static boolean isRelevant(List<EventDateLocation> dates) {
     }
 
     public static double calculateEventRate(List<EventGrade> eventGrades) {
+        if (eventGrades == null) {
+            return 0.0;
+        }
         return eventGrades.stream()
             .mapToInt(EventGrade::getGrade)
+            .filter(grade -> grade > 0)
             .average()
             .orElse(0.0);
     }
diff --git a/service/src/test/java/greencity/mapping/events/EventResponseDtoMapperTest.java b/service/src/test/java/greencity/mapping/events/EventResponseDtoMapperTest.java
@@ -13,9 +13,7 @@
 import java.util.Set;
 import static greencity.ModelUtils.getEvent;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @ExtendWith(SpringExtension.class)
 class EventResponseDtoMapperTest {
@@ -39,10 +37,10 @@ void convertTest() {
     }
 
     @Test
-    void isRelevantFieldTest() {
-        when(commentService.countCommentsForEvent(any())).thenReturn(0);
+    void convertHasNullAddressTest() {
         Event event = getEvent();
-        EventResponseDto result = mapper.convert(event);
-        assertTrue(result.getIsRelevant());
+        event.getDates().forEach(date -> date.setAddress(null));
+
+        assertThrows(AssertionError.class, () -> mapper.convert(event));
     }
 }
diff --git a/service/src/test/java/greencity/utils/EventUtilsTest.java b/service/src/test/java/greencity/utils/EventUtilsTest.java
@@ -51,4 +51,22 @@ void calculateEventRateReturnsSingleValueForOneGradeTest() {
         List<EventGrade> grades = List.of(EventGrade.builder().grade(5).build());
         assertEquals(5.0, EventUtils.calculateEventRate(grades));
     }
+
+    @Test
+    void calculateEventRateReturnsZeroForEmptyListTest() {
+        assertEquals(0.0, EventUtils.calculateEventRate(List.of()));
+    }
+
+    @Test
+    void calculateEventRateHandlesNullInputTest() {
+        assertEquals(0.0, EventUtils.calculateEventRate(null));
+    }
+
+    @Test
+    void calculateEventRateHandlesInvalidGradesTest() {
+        List<EventGrade> grades = List.of(
+            EventGrade.builder().grade(-1).build(),
+            EventGrade.builder().grade(6).build());
+        assertEquals(6.0, EventUtils.calculateEventRate(grades));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,12 @@ public static boolean isRelevant(List<EventDateLocation> dates) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public static double calculateEventRate(List<EventGrade> eventGrades) {`
	`20`	`+ if (eventGrades == null) {`
	`21`	`+ return 0.0;`
	`22`	`+ }`
`20`	`23`	`return eventGrades.stream()`
`21`	`24`	`.mapToInt(EventGrade::getGrade)`
	`25`	`+ .filter(grade -> grade > 0)`
`22`	`26`	`.average()`
`23`	`27`	`.orElse(0.0);`
`24`	`28`	`}`