Merge pull request #32 from virtualidentityag/DIAKONIE-389-fix-removi…

…ng-consultants-from-rocketchat fix: tests
virtualidentityag · Aug 30, 2024 · 10d2119 · 10d2119
2 parents 5354c9b + 1b1883c
commit 10d2119
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/de/caritas/cob/userservice/api/adapters/rocketchat/RocketChatService.java b/src/main/java/de/caritas/cob/userservice/api/adapters/rocketchat/RocketChatService.java
@@ -135,6 +135,7 @@ public class RocketChatService implements MessageClient {
       "Could not get users list from Rocket.Chat";
   private static final String USER_LIST_GET_FIELD_SELECTION = "{\"_id\":1}";
   private static final Integer PAGE_SIZE = 100;
+  private static final String ERROR_ROOM_NOT_FOUND = "error-room-not-found";
   private final LocalDateTime localDateTime1900 = LocalDateTime.of(1900, 1, 1, 0, 0);
 
   private final LocalDateTime localDateTimeFuture = nowInUtc().plusYears(1L);
@@ -1355,7 +1356,7 @@ public void removeUserFromGroupIgnoreGroupNotFound(String rcUserId, String rcGro
       try {
         response = tryRemoveUserFromGroup(rcUserId, rcGroupId);
       } catch (Exception ex) {
-        if (ex.getMessage().contains("error-group-not-found")) {
+        if (ex.getMessage().contains(ERROR_ROOM_NOT_FOUND)) {
           return;
         }
         log.error(

diff --git a/...b/userservice/api/admin/service/rocketchat/RocketChatRemoveFromGroupOperationService.java b/...b/userservice/api/admin/service/rocketchat/RocketChatRemoveFromGroupOperationService.java
@@ -81,12 +81,6 @@ public void removeFromGroupAndIgnoreGroupNotFound() {
                 session.getGroupId(), consultants)));
   }
 
-  public void removeFromGroup() {
-    this.consultantsToRemoveFromSessions.forEach(
-        ((session, consultants) ->
-            removeConsultantsFromSessionGroup(session.getGroupId(), consultants)));
-  }
-
   /**
    * Removes the given consultant from Rocket.Chat group of given session with rollback on error.
    */

diff --git a/src/main/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacade.java b/src/main/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacade.java
@@ -163,7 +163,7 @@ private void removeUnauthorizedMembers(
             .onSessionConsultants(Map.of(session, consultantsToRemoveFromRocketChat));
 
     if (rcGroupId.equalsIgnoreCase(session.getGroupId())) {
-      rocketChatRemoveFromGroupOperationService.removeFromGroup();
+      rocketChatRemoveFromGroupOperationService.removeFromGroupAndIgnoreGroupNotFound();
     }
     if (rcGroupId.equalsIgnoreCase(session.getFeedbackGroupId())) {
       rocketChatRemoveFromGroupOperationService.removeFromFeedbackGroup();

diff --git a/...est/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacadeTest.java b/...est/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacadeTest.java
@@ -383,7 +383,8 @@ void assignEnquiry_Should_removeAllUnauthorizedMembers_When_sessionIsNotATeamSes
     verifyAsync(
         (a) ->
             verify(this.rocketChatFacade, times(1))
-                .removeUserFromGroup(consultantToRemove.getRocketChatId(), session.getGroupId()));
+                .removeUserFromGroupIgnoreGroupNotFound(
+                    consultantToRemove.getRocketChatId(), session.getGroupId()));
     verifyAsync(
         (a) ->
             verify(this.rocketChatFacade, times(1))
@@ -424,7 +425,8 @@ void assignEnquiry_ShouldNot_removeTeamMembers_When_sessionIsTeamSession() {
     verifyAsync(
         (a) ->
             verify(this.rocketChatFacade, atLeastOnce())
-                .removeUserFromGroup(consultantToRemove.getRocketChatId(), session.getGroupId()));
+                .removeUserFromGroupIgnoreGroupNotFound(
+                    consultantToRemove.getRocketChatId(), session.getGroupId()));
     verifyAsync(
         (a) ->
             verify(this.rocketChatFacade, atLeastOnce())