get All Evens add isOrganizedByFriend (#6740)

ita-social-projects · Dec 5, 2023 · 18b5be7 · 18b5be7
1 parent 45e4ccf
commit 18b5be7
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 0 deletions.
diff --git a/service-api/src/main/java/greencity/dto/event/EventDto.java b/service-api/src/main/java/greencity/dto/event/EventDto.java
@@ -55,6 +55,8 @@ public class EventDto {
 
     private int countComments;
 
+    private boolean isOrganizedByFriend;
+
     /**
      * Return String of event tags in English.
      *

diff --git a/service/src/main/java/greencity/service/EventServiceImpl.java b/service/src/main/java/greencity/service/EventServiceImpl.java
@@ -776,6 +776,22 @@ private PageableAdvancedDto<EventDto> buildPageableAdvancedDto(Page<Event> event
             new TypeToken<List<EventDto>>() {
             }.getType());
 
+        if (Objects.nonNull(eventDtos)) {
+            eventDtos.forEach(eventDto -> {
+                if (Objects.nonNull(eventDto.getOrganizer())) {
+                    Long idOrganizer = eventDto.getOrganizer().getId();
+                    if (Objects.nonNull(idOrganizer)) {
+                        boolean isOrganizedByFriend = userRepo.isFriend(idOrganizer, userId);
+                        eventDto.setOrganizedByFriend(isOrganizedByFriend);
+                    } else {
+                        eventDto.setOrganizedByFriend(false);
+                    }
+                } else {
+                    eventDto.setOrganizedByFriend(false);
+                }
+            });
+        }
+
         if (CollectionUtils.isNotEmpty(eventDtos)) {
             setSubscribes(eventDtos, userId);
             setFollowers(eventDtos, userId);

diff --git a/service/src/test/java/greencity/service/EventServiceImplTest.java b/service/src/test/java/greencity/service/EventServiceImplTest.java
@@ -8,6 +8,7 @@
 import greencity.dto.PageableAdvancedDto;
 import greencity.dto.event.AddEventDtoRequest;
 import greencity.dto.event.EventAttenderDto;
+import greencity.dto.event.EventAuthorDto;
 import greencity.dto.event.EventDto;
 import greencity.dto.event.UpdateEventDto;
 import greencity.dto.event.AddressDto;
@@ -1180,6 +1181,74 @@ void getAllWithCurrentUser() {
         verify(eventRepo).findSubscribedAmongEventIds(eventIds, user.getId());
     }
 
+    @Test
+    void getAllWithCurrentUser_WithNullInOrganizerEvent() {
+        List<Event> events = List.of(ModelUtils.getEvent().setOrganizer(null));
+        EventDto expected = ModelUtils.getEventDto().setOrganizer(null);
+        Principal principal = ModelUtils.getPrincipal();
+        PageRequest pageRequest = PageRequest.of(0, 1);
+
+        when(eventRepo.findAllByOrderByIdDesc(pageRequest))
+            .thenReturn(new PageImpl<>(events, pageRequest, events.size()));
+        when(restClient.findByEmail(principal.getName())).thenReturn(TEST_USER_VO);
+        when(modelMapper.map(TEST_USER_VO, User.class)).thenReturn(ModelUtils.getUser());
+        when(modelMapper.map(events,
+            new TypeToken<List<EventDto>>() {
+            }.getType())).thenReturn(List.of(expected));
+
+        PageableAdvancedDto<EventDto> eventDtoPageableAdvancedDto = eventService.getAll(pageRequest, principal);
+        EventDto actual = eventDtoPageableAdvancedDto.getPage().get(0);
+
+        assertEquals(expected.getId(), actual.getId());
+        assertEquals(expected.getDescription(), actual.getDescription());
+
+        verify(modelMapper).map(events,
+            new TypeToken<List<EventDto>>() {
+            }.getType());
+
+        verify(eventRepo).findAllByOrderByIdDesc(any());
+        verify(restClient).findByEmail(any());
+        verify(modelMapper).map(TEST_USER_VO, User.class);
+
+        verify(modelMapper).map(events,
+            new TypeToken<List<EventDto>>() {
+            }.getType());
+    }
+
+    @Test
+    void getAllWithCurrentUser_WithNullInIdOrganizerEvent() {
+        User user = ModelUtils.getUser();
+        List<Event> events = List.of(ModelUtils.getEvent().setOrganizer(user.setId(null)));
+        EventDto expected = ModelUtils.getEventDto().setOrganizer(EventAuthorDto.builder()
+            .name("User")
+            .id(null)
+            .build());
+        Principal principal = ModelUtils.getPrincipal();
+        PageRequest pageRequest = PageRequest.of(0, 1);
+
+        when(eventRepo.findAllByOrderByIdDesc(pageRequest))
+            .thenReturn(new PageImpl<>(events, pageRequest, events.size()));
+        when(restClient.findByEmail(principal.getName())).thenReturn(TEST_USER_VO);
+        when(modelMapper.map(TEST_USER_VO, User.class)).thenReturn(ModelUtils.getUser());
+        when(modelMapper.map(events,
+            new TypeToken<List<EventDto>>() {
+            }.getType())).thenReturn(List.of(expected));
+
+        PageableAdvancedDto<EventDto> eventDtoPageableAdvancedDto = eventService.getAll(pageRequest, principal);
+        EventDto actual = eventDtoPageableAdvancedDto.getPage().get(0);
+
+        assertEquals(expected.getId(), actual.getId());
+        assertEquals(expected.getDescription(), actual.getDescription());
+
+        verify(eventRepo).findAllByOrderByIdDesc(any());
+        verify(restClient).findByEmail(any());
+        verify(modelMapper).map(TEST_USER_VO, User.class);
+
+        verify(modelMapper).map(events,
+            new TypeToken<List<EventDto>>() {
+            }.getType());
+    }
+
     @Test
     void searchEventsBy() {
         List<Event> events = Collections.singletonList(ModelUtils.getEvent());
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,8 @@ public class EventDto { @@
         private int countComments;
+        private boolean isOrganizedByFriend;
         /**
          * Return String of event tags in English.
          *
@@ Expand Down @@