Add is groupchat consultant to response (Onlineberatung#659)

* Add isGroupchatConsultant to /users/consultants/search response * Add isGroupchatConsultant to /users/consultants/search response
virtualidentityag · Jun 20, 2023 · d991584 · d991584
1 parent 64fded1
commit d991584
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/api/useradminservice.yaml b/api/useradminservice.yaml
@@ -1224,8 +1224,11 @@ components:
           type: integer
           example: "1"
         isGroupchatConsultant:
-          type: boolean
-          example: true
+          $ref: '#/components/schemas/IsGroupchatConsultant'
+
+    IsGroupchatConsultant:
+      type: boolean
+      example: true
 
     UpdateAdminConsultantDTO:
       type: object
@@ -1277,9 +1280,7 @@ components:
           example: true
           description: Flag that indicates does the user accepted new data privacy text
         isGroupchatConsultant:
-          type: boolean
-          example: true
-
+          $ref: '#/components/schemas/IsGroupchatConsultant'
 
     ConsultantDTO:
       type: object
@@ -1323,6 +1324,8 @@ components:
           type: array
           items:
             $ref: './../services/agencyadminservice.yaml#/components/schemas/AgencyAdminResponseDTO'
+        isGroupchatConsultant:
+          $ref: '#/components/schemas/IsGroupchatConsultant'
 
     CreateAdminDTO:
       type: object

diff --git a/src/main/java/de/caritas/cob/userservice/api/adapters/web/mapping/ConsultantDtoMapper.java b/src/main/java/de/caritas/cob/userservice/api/adapters/web/mapping/ConsultantDtoMapper.java
@@ -16,17 +16,22 @@
 import de.caritas.cob.userservice.api.adapters.web.dto.PaginationLinks;
 import de.caritas.cob.userservice.api.adapters.web.dto.UpdateAdminConsultantDTO;
 import de.caritas.cob.userservice.api.adapters.web.dto.UpdateConsultantDTO;
+import de.caritas.cob.userservice.api.config.auth.UserRole;
 import de.caritas.cob.userservice.api.model.Consultant;
+import de.caritas.cob.userservice.api.port.out.IdentityClient;
 import de.caritas.cob.userservice.generated.api.adapters.web.controller.UseradminApi;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import lombok.val;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ConsultantDtoMapper implements DtoMapperUtils {
+  @Autowired private IdentityClient identityClient;
 
   public UpdateAdminConsultantDTO updateAdminConsultantOf(
       UpdateConsultantDTO updateConsultantDTO, Consultant consultant) {
@@ -110,6 +115,9 @@ public ConsultantDTO consultantDtoOf(Map<String, Object> consultantMap) {
     consultant.setCreateDate((String) consultantMap.get("createdAt"));
     consultant.setUpdateDate((String) consultantMap.get("updatedAt"));
     consultant.setDeleteDate((String) consultantMap.get("deletedAt"));
+    val isGroupChatConsultant =
+        identityClient.userHasRole(consultant.getId(), UserRole.GROUP_CHAT_CONSULTANT.getValue());
+    consultant.setIsGroupchatConsultant(isGroupChatConsultant);
 
     var agencies = new ArrayList<AgencyAdminResponseDTO>();
     var agencyMaps = (ArrayList<Map<String, Object>>) consultantMap.get("agencies");

diff --git a/...de/caritas/cob/userservice/api/adapters/web/controller/UserControllerConsultantE2EIT.java b/...de/caritas/cob/userservice/api/adapters/web/controller/UserControllerConsultantE2EIT.java
@@ -556,6 +556,8 @@ void searchConsultantsShouldRespondOkAndFilterConsultantsByRestrictedAdminAgenci
             .andExpect(jsonPath("_embedded[0]._embedded.lastname", containsString(infix)))
             .andExpect(jsonPath("_embedded[*]._embedded.username", not(contains(nullValue()))))
             .andExpect(jsonPath("_embedded[*]._embedded.email", not(contains(nullValue()))))
+            .andExpect(jsonPath("_embedded[0]._embedded.isGroupchatConsultant", is(true)))
+            .andExpect(jsonPath("_embedded[1]._embedded.isGroupchatConsultant", is(true)))
             .andExpect(jsonPath("_embedded[0]._embedded.agencies", hasSize(1)))
             .andExpect(
                 jsonPath("_embedded[0]._embedded.agencies[0].id", not(contains(nullValue()))))

diff --git a/src/test/java/de/caritas/cob/userservice/api/testConfig/KeycloakTestConfig.java b/src/test/java/de/caritas/cob/userservice/api/testConfig/KeycloakTestConfig.java
@@ -133,6 +133,11 @@ public void deleteUser(String userId) {}
 
       @Override
       public void deactivateUser(String userId) {}
+
+      @Override
+      public boolean userHasRole(String userId, String userRole) {
+        return true;
+      }
     };
   }
 }