fix: CARITAS-243

Merge dev into this branch and fix merge issues
virtualidentityag · Sep 11, 2024 · daf08f1 · daf08f1
1 parent 644b056
commit daf08f1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/...ava/de/caritas/cob/userservice/api/admin/service/rocketchat/RocketChatGroupOperation.java b/...ava/de/caritas/cob/userservice/api/admin/service/rocketchat/RocketChatGroupOperation.java
@@ -46,7 +46,8 @@ String resolveTypeOfSession(Session session) {
   }
 
   void removeConsultantsFromSessionGroups(Session session, List<Consultant> consultants) {
-    removeConsultantsFromRocketChatGroup(session.getGroupId(), consultants);
+    removeConsultantsFromRocketChatGroup(
+        session.getGroupId(), consultants, rocketChatFacade::removeUserFromGroup);
   }
 
   void removeConsultantsFromSessionGroup(String rcGroupId, List<Consultant> consultants) {

diff --git a/...erservice/api/admin/service/rocketchat/RocketChatRemoveFromGroupOperationServiceTest.java b/...erservice/api/admin/service/rocketchat/RocketChatRemoveFromGroupOperationServiceTest.java
@@ -129,7 +129,7 @@ void removeFromGroupOrRollbackOnFailure_Should_executeRemoveForRocketChatGroup()
 
     this.removeService.removeFromGroupOrRollbackOnFailure();
 
-    verify(this.rocketChatFacade, times(1)).removeUserFromGroup("rcId", "group");
+    verify(this.rocketChatFacade, times(1)).removeUserFromGroupIgnoreGroupNotFound("rcId", "group");
   }
 
   @Test

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
@@ -189,7 +189,8 @@ void assignEnquiry_Should_removeAllUnauthorizedMembers_When_sessionIsNotATeamSes
     verifyAsync(
         (a) ->
             verify(this.rocketChatFacade, times(1))
-                .removeUserFromGroup(consultantToRemove.getRocketChatId(), session.getGroupId()));
+                .removeUserFromGroupIgnoreGroupNotFound(
+                    consultantToRemove.getRocketChatId(), session.getGroupId()));
   }
 
   @Test

diff --git a/...est/java/de/caritas/cob/userservice/api/facade/assignsession/AssignSessionFacadeTest.java b/...est/java/de/caritas/cob/userservice/api/facade/assignsession/AssignSessionFacadeTest.java
@@ -163,21 +163,11 @@ void assignSession_ShouldNot_removeTeamMembers_When_sessionIsTeamSession() {
             verify(this.rocketChatFacade, never())
                 .removeUserFromGroupIgnoreGroupNotFound(
                     "teamConsultantRcId", session.getGroupId()));
-    verifyAsync(
-        a ->
-            verify(this.rocketChatFacade, never())
-                .removeUserFromGroupIgnoreGroupNotFound(
-                    "teamConsultantRcId", session.getFeedbackGroupId()));
     verifyAsync(
         a ->
             verify(this.rocketChatFacade, never())
                 .removeUserFromGroupIgnoreGroupNotFound(
                     "teamConsultantRcId2", session.getGroupId()));
-    verifyAsync(
-        a ->
-            verify(this.rocketChatFacade, never())
-                .removeUserFromGroupIgnoreGroupNotFound(
-                    "teamConsultantRcId2", session.getFeedbackGroupId()));
     verifyAsync(
         a ->
             verify(this.emailNotificationFacade, times(1))