S28 2069: Search Users by `firstName` and `lastName` by lucas-phillips28 · Pull Request #932 · hmcts/pre-api

lucas-phillips28 · 2025-02-11T11:42:27Z

JIRA ticket(s)

S28-2069

Change description

Add search param:
- firstName to search by user's first name
- lastName to search by user's last name
Update search code for when searching by Level 3 role. To make the API response more correct, the API acts as if it has been asked to search by portal user (incase a user accidentally is set to have portal access but is missing Level 3 app access).

hmcts-jenkins-cnp · 2025-02-11T12:22:03Z

Plan Result (stg)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 2 to add, 6 to change, 2 to destroy.

Update
- module.apim_subscription_editvm[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_portal[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_powerplatform[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_smoketest[0].azurerm_api_management_subscription.subscription
- module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
- module.pre_b2c_product[0].azurerm_api_management_product.product
Replace
- module.pre_api[0].azurerm_api_management_api.api
- module.pre_api_b2c[0].azurerm_api_management_api.api

Change Result (Click me)

  # module.apim_subscription_editvm[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/8265f455-2bf2-4c4b-8ba3-bfd0a2f5a6b7"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_portal[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/500e642d-76ef-4d82-8741-bf9e9d979705"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_powerplatform[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/37f73c17-345b-4c67-81d5-50d582e97227"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_smoketest[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/da1d82f9-7187-4cb6-a6dd-b0020311f3bb"
        # (10 unchanged attributes hidden)
    }

  # module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/pre-stg/providers/Microsoft.Resources/deployments/PRE_API_exception"
        name                     = "PRE_API_exception"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

  # module.pre_api[0].azurerm_api_management_api.api must be replaced
-/+ resource "azurerm_api_management_api" "api" {
      ~ id                    = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/apis/pre-api;rev=126" -> (known after apply)
      ~ is_current            = true -> (known after apply)
      ~ is_online             = false -> (known after apply)
        name                  = "pre-api"
      ~ revision              = "126" -> "127" # forces replacement
      + version               = (known after apply)
      + version_set_id        = (known after apply)
        # (12 unchanged attributes hidden)

      ~ subscription_key_parameter_names (known after apply)
      - subscription_key_parameter_names {
          - header = "Ocp-Apim-Subscription-Key" -> null
          - query  = "subscription-key" -> null
        }

        # (1 unchanged block hidden)
    }

  # module.pre_api_b2c[0].azurerm_api_management_api.api must be replaced
-/+ resource "azurerm_api_management_api" "api" {
      ~ id                    = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/apis/pre-api-b2c;rev=126" -> (known after apply)
      ~ is_current            = true -> (known after apply)
      ~ is_online             = false -> (known after apply)
        name                  = "pre-api-b2c"
      ~ revision              = "126" -> "127" # forces replacement
      + version               = (known after apply)
      + version_set_id        = (known after apply)
        # (12 unchanged attributes hidden)

      ~ subscription_key_parameter_names (known after apply)
      - subscription_key_parameter_names {
          - header = "Ocp-Apim-Subscription-Key" -> null
          - query  = "subscription-key" -> null
        }

        # (1 unchanged block hidden)
    }

  # module.pre_b2c_product[0].azurerm_api_management_product.product will be updated in-place
  ~ resource "azurerm_api_management_product" "product" {
        id                    = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/products/pre-api-b2c"
      ~ subscriptions_limit   = 0 -> 20
        # (9 unchanged attributes hidden)
    }

Plan: 2 to add, 6 to change, 2 to destroy.

hmcts-jenkins-cnp · 2025-02-11T12:22:36Z

Plan Result (prod)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

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

Update
- module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
- module.pre-api-liveness-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
Replace
- module.pre_api[0].azurerm_api_management_api.api

Change Result (Click me)

  # module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/pre-prod/providers/Microsoft.Resources/deployments/PRE_API_exception"
        name                     = "PRE_API_exception"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

  # module.pre-api-liveness-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/pre-prod/providers/Microsoft.Resources/deployments/PRE_API_liveness"
        name                     = "PRE_API_liveness"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

  # module.pre_api[0].azurerm_api_management_api.api must be replaced
-/+ resource "azurerm_api_management_api" "api" {
      ~ id                    = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/ss-prod-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-prod/apis/pre-api;rev=126" -> (known after apply)
      ~ is_current            = true -> (known after apply)
      ~ is_online             = false -> (known after apply)
        name                  = "pre-api"
      ~ revision              = "126" -> "127" # forces replacement
      + version               = (known after apply)
      + version_set_id        = (known after apply)
        # (12 unchanged attributes hidden)

      ~ subscription_key_parameter_names (known after apply)
      - subscription_key_parameter_names {
          - header = "Ocp-Apim-Subscription-Key" -> null
          - query  = "subscription-key" -> null
        }

        # (1 unchanged block hidden)
    }

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

lydiaralphgov · 2025-11-14T11:30:00Z

Put in next BAU sprint for testing

github-actions · 2026-06-08T08:44:54Z

‼️ Change to API Spec detected

Monitor carefully when deploying to production.

Follow the release process and manually check that the Streaming Manager and portal are healthy after the release.

See https://tools.hmcts.net/confluence/spaces/S28/pages/1958069495/API+release+process for details.

lydiaralphgov · 2026-06-18T10:31:41Z

PMD issues need fixing

RuthKirby

Looks good, I note that I cannot find tests for the new service methods in PortalAccessService and AppAccessService:
undeleteByUserId
deleteUserById

lucas-phillips28 added 2 commits February 11, 2025 11:34

add search params for users firstName and lastName

a01cbff

add tests

cc8c1ca

lucas-phillips28 added the enable_keep_helm label Feb 11, 2025

Update Swagger v2 Spec Bump APIm revision to 94

50e24c9

lucas-phillips28 mentioned this pull request Feb 11, 2025

S28 2069: Admin Search and View Users hmcts/pre-portal#696

Closed

coverage

397e3d2

hmcts-jenkins-cnp Bot added the stg/destroy label Feb 11, 2025

hmcts-jenkins-cnp Bot added the prod/destroy label Feb 11, 2025

hmcts-jenkins-cnp Bot requested a deployment to preview February 11, 2025 12:22 Abandoned

hmcts-jenkins-cnp Bot added ns:pre prd:pre rel:pre-api-pr-932 labels Feb 11, 2025

hmcts-jenkins-cnp Bot deployed to preview February 11, 2025 13:28 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 12, 2025 06:55 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 12, 2025 09:58 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 13, 2025 06:56 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 17, 2025 07:01 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 18, 2025 06:55 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 20, 2025 06:56 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 21, 2025 06:58 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 24, 2025 16:22 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 26, 2025 07:25 View deployment

hmcts-jenkins-cnp Bot deployed to preview February 27, 2025 06:58 View deployment

lucas-phillips28 removed the enable_keep_helm label Feb 28, 2025

lucas-phillips28 marked this pull request as ready for review February 28, 2025 11:42

lucas-phillips28 requested a review from a team as a code owner February 28, 2025 11:42

hmcts-jenkins-cnp Bot deployed to preview February 28, 2025 11:50 View deployment

hmcts-jenkins-cnp Bot deployed to preview March 3, 2025 09:26 View deployment

jasonpaige previously approved these changes Mar 3, 2025

View reviewed changes

Merge branch 'master' into S28-2069/admin-search-users

b9d1dd0

lydiaralphgov dismissed jasonpaige’s stale review via b9d1dd0 November 14, 2025 11:28

lydiaralphgov previously approved these changes Nov 14, 2025

View reviewed changes

Bumped APIm revision to 127

55390a5

github-actions Bot dismissed lydiaralphgov’s stale review via 55390a5 November 14, 2025 11:30

hmcts-jenkins-cnp Bot deployed to preview November 14, 2025 11:37 View deployment

hmcts-jenkins-cnp Bot deployed to preview November 14, 2025 11:41 View deployment

lydiaralphgov and others added 2 commits November 17, 2025 12:52

Merge branch 'master' into S28-2069/admin-search-users

31075ce

Fix Admin Search users Tests

b9dfe41

GeorgeBarnesUK added the enable_keep_helm label Jun 8, 2026

Update OpenAPI Spec for pre-api

60c832f

GeorgeBarnesUK and others added 3 commits June 8, 2026 09:47

Merge branch 'master' into S28-2069/admin-search-users

6010635

Ignore conflicts in API spec as it will be re-generated by Actions

b4968ac

Update OpenAPI Spec for pre-api

99412d4

lydiaralphgov added 6 commits June 18, 2026 15:48

PMD changes. Still need to change tests to match new param list.

c7474a1

Fixed UserService tests

e3566de

Fixed controller tests

6f3c551

Merge branch 'master' into S28-2069/admin-search-users

41d7b4d

Updated IT

9549174

Checkstyle

af73cb3

RuthKirby reviewed Jun 19, 2026

View reviewed changes

Comment thread src/test/java/uk/gov/hmcts/reform/preapi/controller/UserControllerTest.java Outdated

RuthKirby requested changes Jun 19, 2026

View reviewed changes

lydiaralphgov added 4 commits June 22, 2026 09:05

Use native null check

81246e1

T&Cs unit test

ea01d32

App and portal access services + tests

b018b0e

Checkstyle

3819181

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

S28 2069: Search Users by `firstName` and `lastName`#932

S28 2069: Search Users by `firstName` and `lastName`#932
lucas-phillips28 wants to merge 22 commits into
masterfrom
S28-2069/admin-search-users

lucas-phillips28 commented Feb 11, 2025

Uh oh!

hmcts-jenkins-cnp Bot commented Feb 11, 2025 •

edited

Loading

Uh oh!

hmcts-jenkins-cnp Bot commented Feb 11, 2025 •

edited

Loading

Uh oh!

lydiaralphgov commented Nov 14, 2025

Uh oh!

github-actions Bot commented Jun 8, 2026

Uh oh!

lydiaralphgov commented Jun 18, 2026

Uh oh!

Uh oh!

RuthKirby left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

lucas-phillips28 commented Feb 11, 2025

JIRA ticket(s)

Change description

Uh oh!

hmcts-jenkins-cnp Bot commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Plan Result (stg)

⚠️ Resource Deletion will happen

Uh oh!

hmcts-jenkins-cnp Bot commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Plan Result (prod)

⚠️ Resource Deletion will happen

Uh oh!

lydiaralphgov commented Nov 14, 2025

Uh oh!

github-actions Bot commented Jun 8, 2026

Uh oh!

lydiaralphgov commented Jun 18, 2026

Uh oh!

Uh oh!

RuthKirby left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

hmcts-jenkins-cnp Bot commented Feb 11, 2025 •

edited

Loading

hmcts-jenkins-cnp Bot commented Feb 11, 2025 •

edited

Loading