DTSRD-2139.Update Organisation user idam id endpoint

src/contractTest/java/uk/gov/hmcts/reform/professionalapi/provider/OrganisationalInternalControllerProviderTest.java

@@ -357,12 +357,12 @@ private Organisation getOrganisation() {
         contactInformation.setId(UUID.randomUUID());
         organisation.setContactInformations(List.of(contactInformation));
 
-        SuperUser superUser = new SuperUser("firstName", "lastName",
-                "email", organisation);
+        SuperUser superUser = new SuperUser("firstName", "lastName","email", organisation);
         superUser.setUserIdentifier(UUID.randomUUID().toString());
         List<SuperUser> users = new ArrayList<>();
         users.add(superUser);
         organisation.setUsers(users);
+
         return organisation;
     }
 

src/functionalTest/java/uk/gov/hmcts/reform/professionalapi/ProfessionalInternalUserFunctionalTest.java

@@ -18,6 +18,7 @@
 import uk.gov.hmcts.reform.professionalapi.controller.request.OrganisationCreationRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.PbaRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.PbaUpdateRequest;
+import uk.gov.hmcts.reform.professionalapi.controller.request.ProfessionalUserIdentifierRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.UpdatePbaRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.response.FetchPbaByStatusResponse;
 import uk.gov.hmcts.reform.professionalapi.controller.response.OrganisationsWithPbaStatusResponse;
@@ -38,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static java.util.Objects.nonNull;
@@ -689,6 +691,50 @@ void findOrganisationByPbaStatusShouldReturn403WhenToggledOff() {
 
     }
 
+    @Test
+    @ExtendWith(FeatureToggleConditionExtension.class)
+    @DisplayName("Update Organisation's Idam id should return 200 when toggled off")
+    @ToggleEnable(mapKey = "OrganisationInternalController.retrieveOrgByPbaStatus", withFeature = false)
+    void updateUserIdamForOrganisationShouldReturnSuccess() {
+        log.info("updateUserIdamForOrganisationShouldReturnSuccess :: STARTED");
+        OrganisationCreationRequest orgReq = createOrganisationRequest().build();
+        Map<String, Object> response = professionalApiClient.createOrganisation(orgReq);
+        String orgIdentifier = (String) response.get("organisationIdentifier");
+        orgReq.setStatus("ACTIVE");
+        professionalApiClient.updateOrganisation(orgReq, hmctsAdmin,
+            orgIdentifier, OK);
+
+        NewUserCreationRequest newUserCreationRequest =
+            professionalApiClient.createNewUserRequest("[email protected]");
+        Map<String, Object> newUserResponse = professionalApiClient.addNewUserToAnOrganisation(orgIdentifier,
+            hmctsAdmin, newUserCreationRequest, HttpStatus.CREATED);
+        assertThat(newUserResponse).isNotNull();
+        assertThat(newUserResponse.get("userIdentifier")).isNotNull();
+        String existingUserId = (String) newUserResponse.get("userIdentifier");
+        String newId = UUID.randomUUID().toString();
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest =  ProfessionalUserIdentifierRequest
+            .aUserIdentifierRequest().existingIdamId(existingUserId).newIdamId(newId)
+            .build();
+
+        Map<String, Object> updatedIdamResponse = professionalApiClient.updateUserIdamForOrganisation(
+            professionalUserIdentifierRequest, OK);
+
+        Map<String, Object> searchResponse = professionalApiClient
+            .searchOrganisationUsersByStatusInternal(orgIdentifier, hmctsAdmin, OK);
+
+        List<Map<String, Object>> professionalUsersResponses = (List<Map<String, Object>>) searchResponse.get("users");
+        Map professionalUsersResponse = getUserById(professionalUsersResponses, existingUserId);
+
+        assertThat(updatedIdamResponse).isNotNull();
+        assertThat(professionalUsersResponse).isNotNull();
+        assertThat(professionalUsersResponse.get("userIdentifier").toString())
+            .contains(newId);
+
+        professionalApiClient.deleteOrganisation(orgIdentifier, hmctsAdmin, NO_CONTENT);
+
+        log.info("updateUserIdamForOrganisationShouldReturnSuccess :: END");
+    }
+
     @Test
     @ToggleEnable(mapKey = "OrganisationInternalController.updateAnOrganisationsRegisteredPbas", withFeature = true)
     @ExtendWith(FeatureToggleConditionExtension.class)

src/functionalTest/java/uk/gov/hmcts/reform/professionalapi/client/ProfessionalApiClient.java

@@ -23,6 +23,7 @@
 import uk.gov.hmcts.reform.professionalapi.controller.request.OrganisationCreationRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.OrganisationOtherOrgsCreationRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.PbaRequest;
+import uk.gov.hmcts.reform.professionalapi.controller.request.ProfessionalUserIdentifierRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.UpdatePbaRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.UserCreationRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.UsersInOrganisationsByOrganisationIdentifiersRequest;
@@ -776,6 +777,21 @@ public Map<String, Object> retrievePaymentAccountsByEmail(String email, String r
         return response.body().as(Map.class);
     }
 
+    public Map<String, Object> updateUserIdamForOrganisation(
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest, HttpStatus status) {
+        Response response = getMultipleAuthHeadersInternal()
+            .body(professionalUserIdentifierRequest)
+            .put("/refdata/internal/v1/organisations/userIdam")
+            .andReturn();
+
+        response.then()
+            .assertThat()
+            .statusCode(OK.value());
+
+        return response.body().as(Map.class);
+    }
+
+
     public Map<String, Object> retrievePaymentAccountsByEmailV2(String email, String role) {
         Response response = getUserEmailAsHeaderWithExisting(idamOpenIdClient
                 .getcwdAdminOpenIdToken("prd-admin"), email)
@@ -1287,8 +1303,8 @@ public void updateOrganisationV2(OrganisationOtherOrgsCreationRequest organisati
 
     public void updateOrganisation(String organisationIdentifier, String role) {
 
-        OrganisationCreationRequest organisationCreationRequest = createOrganisationRequest().status("ACTIVE").build();
-
+        OrganisationCreationRequest organisationCreationRequest = createOrganisationRequest().status("ACTIVE")
+            .statusMessage("Activate organisation").build();
         updateOrganisation(organisationCreationRequest, role, organisationIdentifier);
     }
 

src/integrationTest/java/uk/gov/hmcts/reform/professionalapi/ModifyUserIdamIdIntegrationTest.java

@@ -0,0 +1,160 @@
+package uk.gov.hmcts.reform.professionalapi;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
+import uk.gov.hmcts.reform.lib.util.serenity5.SerenityTest;
+import uk.gov.hmcts.reform.professionalapi.controller.request.ProfessionalUserIdentifierRequest;
+import uk.gov.hmcts.reform.professionalapi.util.AuthorizationEnabledIntegrationTest;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SerenityTest
+@Slf4j
+class ModifyUserIdamIdIntegrationTest extends AuthorizationEnabledIntegrationTest {
+
+    @Test
+    void ac1_modify_idamId_of_active_user_for_an_active_organisation_should_return_200() {
+        //create and update organisation
+        String organisationIdentifier = createOrganisationRequest();
+        updateOrganisation(organisationIdentifier, hmctsAdmin, ACTIVE);
+
+        //create new user
+        List<String> userRoles = new ArrayList<>();
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+        userRoles.add(puiCaseManager);
+
+        Map<String, Object> newUserResponse =
+            professionalReferenceDataClient.addUserToOrganisation(organisationIdentifier,
+                inviteUserCreationRequest(randomAlphabetic(5) + "@email.com",
+                    userRoles), hmctsAdmin);
+        String existingUserIdentifier = (String) newUserResponse.get(USER_IDENTIFIER);
+
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest =  ProfessionalUserIdentifierRequest
+            .aUserIdentifierRequest().existingIdamId(existingUserIdentifier).newIdamId(UUID.randomUUID().toString())
+            .build();
+
+        //modify Idam  details in user Profile
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+
+        updateUserProfileRolesMock(HttpStatus.OK);
+
+        Map<String, Object> modifiedUserResponse =
+            professionalReferenceDataClient.updateUserIdamForOrganisation(professionalUserIdentifierRequest,hmctsAdmin);
+
+
+        //validate overall response should be 200 always
+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();
+        assertThat(modifiedUserResponse.get("http_status")).isEqualTo("200 OK");
+
+    }
+
+
+    @Test
+    void ac2_modify_idam_newId_null_should_return_400() {
+
+        //create and update organisation
+        String organisationIdentifier = createOrganisationRequest();
+        updateOrganisation(organisationIdentifier, hmctsAdmin, ACTIVE);
+
+        //create new user
+        List<String> userRoles = new ArrayList<>();
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+        userRoles.add(puiCaseManager);
+
+        Map<String, Object> newUserResponse =
+            professionalReferenceDataClient.addUserToOrganisation(organisationIdentifier,
+                inviteUserCreationRequest(randomAlphabetic(5) + "@email.com",
+                    userRoles), hmctsAdmin);
+        String existingUserIdentifier = (String) newUserResponse.get(USER_IDENTIFIER);
+
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest =  ProfessionalUserIdentifierRequest
+            .aUserIdentifierRequest().existingIdamId(existingUserIdentifier).newIdamId(null)
+            .build();
+
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+        updateUserProfileRolesMock(HttpStatus.BAD_REQUEST);
+
+        Map<String, Object> modifiedUserResponse =
+            professionalReferenceDataClient.updateUserIdamForOrganisation(professionalUserIdentifierRequest,hmctsAdmin);
+
+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();
+        assertThat(modifiedUserResponse).containsEntry("http_status","400");
+
+    }
+
+
+    @Test
+    void ac2_modify_idam_existingId_null_should_return_400() {
+
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest =  ProfessionalUserIdentifierRequest
+            .aUserIdentifierRequest().existingIdamId(null).newIdamId(UUID.randomUUID().toString())
+            .build();
+
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+        updateUserProfileRolesMock(HttpStatus.BAD_REQUEST);
+
+        Map<String, Object> modifiedUserResponse =
+            professionalReferenceDataClient.updateUserIdamForOrganisation(professionalUserIdentifierRequest,hmctsAdmin);
+
+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();
+        assertThat(modifiedUserResponse).containsEntry("http_status","400");
+    }
+
+    void ac2_modify_idam_empty_Request_should_return_400() {
+
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest =  ProfessionalUserIdentifierRequest
+            .aUserIdentifierRequest().existingIdamId(null).newIdamId(UUID.randomUUID().toString())
+            .build();
+
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+        updateUserProfileRolesMock(HttpStatus.BAD_REQUEST);
+
+        Map<String, Object> modifiedUserResponse =
+            professionalReferenceDataClient.updateUserIdamForOrganisation(null,hmctsAdmin);
+
+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();
+        assertThat(modifiedUserResponse).containsEntry("http_status","400");
+    }
+
+    @Test
+    void ac1_modify_idamId_userProfileFeignClient_getUserProfileById_Bad_Request_error() {
+        //create and update organisation
+        String organisationIdentifier = createOrganisationRequest();
+        updateOrganisation(organisationIdentifier, hmctsAdmin, ACTIVE);
+
+        //create new user
+        List<String> userRoles = new ArrayList<>();
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+        userRoles.add(puiCaseManager);
+
+        Map<String, Object> newUserResponse =
+            professionalReferenceDataClient.addUserToOrganisation(organisationIdentifier,
+                inviteUserCreationRequest(randomAlphabetic(5) + "@email.com",
+                    userRoles), hmctsAdmin);
+        String existingUserIdentifier = (String) newUserResponse.get(USER_IDENTIFIER);
+
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest =  ProfessionalUserIdentifierRequest
+            .aUserIdentifierRequest().existingIdamId(existingUserIdentifier).newIdamId(UUID.randomUUID().toString())
+            .build();
+
+        //modify Idam  details in user Profile
+        userProfileCreateUserWireMock(HttpStatus.CREATED);
+
+        updateUserProfileRolesMock(HttpStatus.BAD_REQUEST);
+
+        Map<String, Object> modifiedUserResponse =
+            professionalReferenceDataClient.updateUserIdamForOrganisation(professionalUserIdentifierRequest,hmctsAdmin);
+
+        //validate overall response should be 200 always
+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();
+        assertThat(modifiedUserResponse).containsEntry("http_status","400");
+
+    }
+}

src/integrationTest/java/uk/gov/hmcts/reform/professionalapi/util/ProfessionalReferenceDataClient.java

@@ -27,6 +27,7 @@
 import uk.gov.hmcts.reform.professionalapi.controller.request.OrganisationCreationRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.OrganisationOtherOrgsCreationRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.PbaRequest;
+import uk.gov.hmcts.reform.professionalapi.controller.request.ProfessionalUserIdentifierRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.UpdatePbaRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.request.UsersInOrganisationsByOrganisationIdentifiersRequest;
 import uk.gov.hmcts.reform.professionalapi.controller.response.OrganisationMinimalInfoResponse;
@@ -664,6 +665,27 @@ public Map<String, Object> modifyUserRolesOfOrganisation(UserProfileUpdatedData
         return getResponse(responseEntity);
     }
 
+    public Map<String, Object> updateUserIdamForOrganisation(
+        ProfessionalUserIdentifierRequest professionalUserIdentifierRequest, String hmctsAdmin) {
+        ResponseEntity<Map> responseEntity = null;
+        String urlPath = "http://localhost:" + prdApiPort + APP_INT_BASE_PATH + "/userIdam/";
+
+        try {
+            HttpEntity<ProfessionalUserIdentifierRequest> requestEntity =
+                new HttpEntity<>(professionalUserIdentifierRequest,
+                getMultipleAuthHeaders(hmctsAdmin));
+            responseEntity = restTemplate.exchange(urlPath, HttpMethod.PUT, requestEntity, Map.class);
+        } catch (RestClientResponseException ex) {
+            HashMap<String, Object> statusAndBody = new HashMap<>(2);
+            statusAndBody.put("http_status", String.valueOf(ex.getRawStatusCode()));
+            statusAndBody.put("response_body", ex.getResponseBodyAsString());
+            return statusAndBody;
+        }
+
+
+        return getResponse(responseEntity);
+    }
+
     public Map<String, Object> modifyUserRolesOfOrganisationExternal(UserProfileUpdatedData userProfileUpdatedData,
                                                                      String userIdentifier, String externalRole) {
         ResponseEntity<Map> responseEntity = null;