Merge pull request #51 from CaritasDeutschland/feature-optimize-livee…

…vent-trigger Feature optimize liveevent trigger
Onlineberatung · Nov 3, 2020 · 0364d59 · 0364d59
2 parents 9630e9d + e72f4ac
commit 0364d59
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/.../java/de/caritas/cob/userservice/api/service/liveevents/LiveEventNotificationService.java b/.../java/de/caritas/cob/userservice/api/service/liveevents/LiveEventNotificationService.java
@@ -1,6 +1,7 @@
 package de.caritas.cob.userservice.api.service.liveevents;
 
 import static de.caritas.cob.userservice.liveservice.generated.web.model.EventType.DIRECTMESSAGE;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import de.caritas.cob.userservice.api.helper.AuthenticatedUser;
@@ -36,6 +37,12 @@ public void sendLiveDirectMessageEventToUsers(String rcGroupId) {
           .collectUserIds(rcGroupId).stream()
           .filter(this::notInitiatingUser)
           .collect(Collectors.toList());
+      triggerLiveEvent(rcGroupId, userIds);
+    }
+  }
+
+  private void triggerLiveEvent(String rcGroupId, List<String> userIds) {
+    if (isNotEmpty(userIds)) {
       try {
         this.liveControllerApi.sendLiveEvent(userIds, DIRECTMESSAGE.toString());
       } catch (RestClientException e) {

diff --git a/...ritas/cob/userservice/api/service/liveevents/RelevantUserAccountIdsBySessionProvider.java b/...ritas/cob/userservice/api/service/liveevents/RelevantUserAccountIdsBySessionProvider.java
@@ -38,7 +38,7 @@ public List<String> collectUserIds(String rcGroupId) {
   }
 
   private List<String> extractDependentUserIds(Session session) {
-    if (isNull(session)) {
+    if (isNull(session) || isNull(session.getConsultant())) {
       return emptyList();
     }
     return Stream.of(session.getUser().getUserId(), session.getConsultant().getId())

diff --git a/...a/de/caritas/cob/userservice/api/service/liveevents/LiveEventNotificationServiceTest.java b/...a/de/caritas/cob/userservice/api/service/liveevents/LiveEventNotificationServiceTest.java
@@ -3,7 +3,7 @@
 
 import static de.caritas.cob.userservice.liveservice.generated.web.model.EventType.DIRECTMESSAGE;
 import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -87,6 +87,7 @@ public void sendLiveDirectMessageEventToUsers_Should_doNothing_When_rcGroupIdIsN
   @Test
   public void sendLiveDirectMessageEventToUsers_Should_logError_When_apiCallFailes() {
     when(this.userIdsProviderFactory.byRocketChatGroup(any())).thenReturn(bySessionProvider);
+    when(this.bySessionProvider.collectUserIds(any())).thenReturn(singletonList("test"));
     doThrow(new RestClientException("")).when(this.liveControllerApi)
         .sendLiveEvent(any(), anyString());
 
@@ -110,13 +111,12 @@ public void sendLiveDirectMessageEventToUsers_Should_sendEventToAllUsersInsteadO
   }
 
   @Test
-  public void sendLiveDirectMessageEventToUsers_Should_sendEmptyList_When_noIdsAreProvided() {
+  public void sendLiveDirectMessageEventToUsers_Should_sendNothing_When_noIdsAreProvided() {
     when(this.userIdsProviderFactory.byRocketChatGroup(any())).thenReturn(this.byChatProvider);
 
     this.liveEventNotificationService.sendLiveDirectMessageEventToUsers("group id");
 
-    verify(this.liveControllerApi, times(1)).sendLiveEvent(eq(emptyList()),
-        eq(DIRECTMESSAGE.toString()));
+    verifyZeroInteractions(this.liveControllerApi);
   }
 
   @Test

diff --git a/...s/cob/userservice/api/service/liveevents/RelevantUserAccountIdsBySessionProviderTest.java b/...s/cob/userservice/api/service/liveevents/RelevantUserAccountIdsBySessionProviderTest.java
@@ -113,4 +113,13 @@ public void collectUserIds_Should_returnAllUserIds_When_authenticatedUserIsOther
     assertThat(userIds.get(1), is("consultant"));
   }
 
+  @Test
+  public void collectUserIds_Should_returnEmptyList_When_sessionHasNoConsultant() {
+    when(sessionRepository.findByFeedbackGroupId(any())).thenReturn(Optional.of(new Session()));
+
+    List<String> userIds = this.bySessionProvider.collectUserIds("rcGroupId");
+
+    assertThat(userIds, hasSize(0));
+  }
+
 }