DTSRD-2139.Update Organisation user idam id endpoint #1562

SabinaHMCTS · 2024-02-12T21:20:27Z

Jira link (if applicable)

Change description

Checklist

commit messages are meaningful and follow good commit message guidelines
README and other documentation has been updated / added (if needed)
tests have been updated / new tests has been added (if needed)
Does this PR introduce a breaking change

rajkatla-hmcts · 2024-07-02T10:35:23Z

...nalTest/java/uk/gov/hmcts/reform/professionalapi/ProfessionalInternalUserFunctionalTest.java

+
+        NewUserCreationRequest newUserCreationRequest =
+            professionalApiClient.createNewUserRequest("[email protected]");
+        Map<String, Object> newUserResponse = professionalApiClient.addNewUserToAnOrganisation(orgIdentifier,


dont need to add new user to update idam id for existing user

creating a new user as test user to use as existing user for updating id

rajkatla-hmcts · 2024-07-02T10:37:13Z

...nalTest/java/uk/gov/hmcts/reform/professionalapi/ProfessionalInternalUserFunctionalTest.java

+        professionalApiClient.deleteOrganisation(orgIdentifier, hmctsAdmin, NO_CONTENT);
+
+        assertThat(updatedIdamResponse).isNotNull();
+        assertThat(professionalUsersResponse).isNotNull();


add assertion to verify that the user's idam id is updated with new id value

rajkatla-hmcts · 2024-07-02T10:38:33Z

...nalTest/java/uk/gov/hmcts/reform/professionalapi/ProfessionalInternalUserFunctionalTest.java

+        List<Map<String, Object>> professionalUsersResponses = (List<Map<String, Object>>) searchResponse.get("users");
+        Map professionalUsersResponse = getUserById(professionalUsersResponses, existingUserId);
+
+        professionalApiClient.deleteOrganisation(orgIdentifier, hmctsAdmin, NO_CONTENT);


move this line to after assertions

rajkatla-hmcts · 2024-07-02T10:39:11Z

...ntegrationTest/java/uk/gov/hmcts/reform/professionalapi/ModifyUserIdamIdIntegrationTest.java

+        updateOrganisation(organisationIdentifier, hmctsAdmin, ACTIVE);
+
+        //create new user
+        List<String> userRoles = new ArrayList<>();


dont need to add new user

creating test user

rajkatla-hmcts · 2024-07-02T10:39:31Z

...ntegrationTest/java/uk/gov/hmcts/reform/professionalapi/ModifyUserIdamIdIntegrationTest.java

+
+
+        //validate overall response should be 200 always
+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();


add assertion to verify that the user's idam id is updated with new id value

not fetching id in response

rajkatla-hmcts · 2024-07-02T10:42:47Z

.../uk/gov/hmcts/reform/professionalapi/controller/internal/OrganisationInternalController.java

+
+    @Operation(
+        summary = "Updates idam id for a user in an organisation",
+        description = "**IDAM Roles to access API** :<br> pui-organisation-manager",


change role name to prd-admin

src/main/java/uk/gov/hmcts/reform/professionalapi/service/impl/OrganisationServiceImpl.java

rajkatla-hmcts · 2024-07-02T14:56:45Z

src/main/java/uk/gov/hmcts/reform/professionalapi/service/impl/OrganisationServiceImpl.java

+            Response userResponse = userProfileFeignClient
+                .modifyUserRoles(userProfileUpdatedData, existingUserIdentifier," ");
+
+            Optional<ProfessionalUser> professionalUser = Optional


update in PRD only when user profile update is success

rajkatla-hmcts · 2024-07-02T20:42:09Z

...ntegrationTest/java/uk/gov/hmcts/reform/professionalapi/ModifyUserIdamIdIntegrationTest.java

+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();
+        assertThat(modifiedUserResponse).containsEntry("http_status","400");
+    }
+}


add error scenario test cases for below user profile calls:

userProfileFeignClient.getUserProfileById

userProfileFeignClient.modifyUserRoles. (change this method name as its confusing)

added error testcase

rajkatla-hmcts · 2024-07-02T20:44:38Z

...ntegrationTest/java/uk/gov/hmcts/reform/professionalapi/ModifyUserIdamIdIntegrationTest.java

+
+        assertThat(modifiedUserResponse.get("http_status")).isNotNull();
+        assertThat(modifiedUserResponse).containsEntry("http_status","400");
+    }


add test case for error scenario: "Request is empty"

hmcts-jenkins-j-to-z · 2024-07-17T11:35:23Z

Plan Result (aat)

Plan: 0 to add, 1 to change, 0 to destroy.

Update
- azurerm_resource_group.rg

Change Result (Click me)

  # azurerm_resource_group.rg will be updated in-place
  ~ resource "azurerm_resource_group" "rg" {
        id         = "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/rd-professional-api-aat"
        name       = "rd-professional-api-aat"
      ~ tags       = {
          - "Deployment Environment" = "aat"
          - "Team Name"              = "RD"
          - "lastUpdated"            = "2024-07-17T09:07:18Z"
        } -> (known after apply)
        # (2 unchanged attributes hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.

hmcts-jenkins-j-to-z · 2024-07-17T11:35:55Z

Plan Result (prod)

Plan: 0 to add, 1 to change, 0 to destroy.

Update
- azurerm_resource_group.rg

Change Result (Click me)

  # azurerm_resource_group.rg will be updated in-place
  ~ resource "azurerm_resource_group" "rg" {
        id         = "/subscriptions/8999dec3-0104-4a27-94ee-6588559729d1/resourceGroups/rd-professional-api-prod"
        name       = "rd-professional-api-prod"
      ~ tags       = {
          - "Deployment Environment" = "prod"
          - "Team Name"              = "RD"
          - "lastUpdated"            = "2024-07-17T09:18:35Z"
        } -> (known after apply)
        # (2 unchanged attributes hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.

SabinaHMCTS and others added 10 commits February 9, 2024 08:59

Upgrading perftest branch to V16 and adding subnet_suffix

9a50a6d

End point to update Idam id for a professional user

d82e858

Merge branch 'master' into DTSRD-2139

e8fc944

Delete User and User Profile

9b93b8d

Delete User and User Profile

afa9069

Delete User and User Profile

3e9c773

Delete User and User Profile

97d98d5

Merge branch 'master' into DTSRD-2139

45c19ac

Merge branch 'master' into DTSRD-2139

7bfa4a4

Delete User and User Profile

681846a

hmcts-jenkins-j-to-z bot deployed to preview May 2, 2024 08:13 View deployment

hmcts-jenkins-j-to-z bot added ns:rd prd:rd rel:rd-professional-api-pr-1562 labels May 2, 2024

SabinaHMCTS and others added 2 commits May 7, 2024 21:43

Merge branch 'master' into DTSRD-2139

ebf7086

updateUserIdamForOrganisation

f3bae92

hmcts-jenkins-j-to-z bot deployed to preview May 7, 2024 20:59 View deployment

SabinaHMCTS and others added 7 commits June 11, 2024 21:47

Merge branch 'master' into DTSRD-2139

1297067

update admin unit tests

d0f7116

update admin unit tests

df2a523

update admin unit tests

70abbd7

update admin unit tests

548a071

update admin unit tests

71c907c

update admin unit tests

bae5f68

hmcts-jenkins-j-to-z bot deployed to preview June 12, 2024 08:58 View deployment

rajkatla-hmcts requested changes Jul 2, 2024

View reviewed changes

Merge branch 'master' into DTSRD-2139

fff2c8a

hmcts-jenkins-j-to-z bot deployed to preview July 9, 2024 15:35 View deployment

update functional tests

ed445d5

hmcts-jenkins-j-to-z bot deployed to preview July 9, 2024 17:21 View deployment

SabinaHMCTS added 3 commits July 9, 2024 18:22

update functional tests

40acc8e

update functional tests

f8178fd

update functional tests

f87d92b

hmcts-jenkins-j-to-z bot deployed to preview July 9, 2024 17:45 View deployment

hmcts-jenkins-j-to-z bot deployed to preview July 16, 2024 08:48 View deployment

SabinaHMCTS and others added 2 commits July 17, 2024 12:12

update pact tests

3eabbed

Merge branch 'master' into DTSRD-2139

eef197a

hmcts-jenkins-j-to-z bot deployed to preview July 17, 2024 11:23 View deployment

SabinaHMCTS and others added 2 commits July 17, 2024 12:24

update pact tests

5f5b2e3

Updating Terraform Formatting

5c17dec

hmcts-jenkins-j-to-z bot added the aat/add-or-update label Jul 17, 2024

hmcts-jenkins-j-to-z bot added the prod/add-or-update label Jul 17, 2024

hmcts-jenkins-j-to-z bot deployed to preview July 17, 2024 11:35 View deployment

hmcts-jenkins-j-to-z bot deployed to preview July 17, 2024 11:43 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DTSRD-2139.Update Organisation user idam id endpoint #1562

DTSRD-2139.Update Organisation user idam id endpoint #1562

SabinaHMCTS commented Feb 12, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024 •

edited

Loading

rajkatla-hmcts Jul 2, 2024

SabinaHMCTS Jul 9, 2024

hmcts-jenkins-j-to-z bot commented Jul 17, 2024

hmcts-jenkins-j-to-z bot commented Jul 17, 2024



		//validate overall response should be 200 always
		assertThat(modifiedUserResponse.get("http_status")).isNotNull();

DTSRD-2139.Update Organisation user idam id endpoint #1562

Are you sure you want to change the base?

DTSRD-2139.Update Organisation user idam id endpoint #1562

Conversation

SabinaHMCTS commented Feb 12, 2024

Jira link (if applicable)

Change description

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SabinaHMCTS Jul 9, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hmcts-jenkins-j-to-z bot commented Jul 17, 2024

Plan Result (aat)

hmcts-jenkins-j-to-z bot commented Jul 17, 2024

Plan Result (prod)

SabinaHMCTS Jul 9, 2024 •

edited

Loading