From 4713962d66be747fc108ff60ac73057fc77d185a Mon Sep 17 00:00:00 2001 From: Toby Plunkett Date: Tue, 9 Dec 2025 15:43:46 +0000 Subject: [PATCH 1/3] HDPI-3210 Add option to use add role request without organisation --- .../ccd/client/CaseAssignmentApiTest.java | 6 +++--- .../reform/ccd/client/CaseAssignmentApi.java | 16 +++++++++++++-- .../model/CaseAssignmentUserRolesRequest.java | 2 +- ...nmentUserRolesWithOrganisationRequest.java | 20 +++++++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesWithOrganisationRequest.java diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApiTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApiTest.java index 25a274c3..0351e384 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApiTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApiTest.java @@ -7,9 +7,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRole; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRoleWithOrganisation; -import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesRequest; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesResource; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesResponse; +import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesWithOrganisationRequest; import uk.gov.hmcts.reform.ccd.client.model.CaseDetails; import java.util.Collections; @@ -26,14 +26,14 @@ class CaseAssignmentApiTest extends BaseTest { private User caseWorker; private User manager; private CaseDetails caseDetails; - private CaseAssignmentUserRolesRequest caseAssignmentRequest; + private CaseAssignmentUserRolesWithOrganisationRequest caseAssignmentRequest; @BeforeEach void init() { caseWorker = createCaseworker(); manager = createCaseworker(); caseDetails = createCaseForCaseworker(caseWorker); - caseAssignmentRequest = CaseAssignmentUserRolesRequest.builder() + caseAssignmentRequest = CaseAssignmentUserRolesWithOrganisationRequest.builder() .caseAssignmentUserRolesWithOrganisation(Collections.singletonList( CaseAssignmentUserRoleWithOrganisation.builder() .organisationId("TESTTORG") diff --git a/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java b/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java index c4112412..a56f8a81 100644 --- a/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java +++ b/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java @@ -12,6 +12,7 @@ import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesRequest; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesResource; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesResponse; +import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesWithOrganisationRequest; import java.util.List; @@ -33,7 +34,18 @@ public interface CaseAssignmentApi { CaseAssignmentUserRolesResponse addCaseUserRoles( @RequestHeader(AUTHORIZATION) String authorisation, @RequestHeader(SERVICE_AUTHORIZATION) String serviceAuthorization, - @RequestBody CaseAssignmentUserRolesRequest caseRoleRequest + @RequestBody CaseAssignmentUserRolesWithOrganisationRequest caseRoleRequest + ); + + @PostMapping( + value = "/case-users", + consumes = MediaType.APPLICATION_JSON_VALUE + ) + @ResponseBody + CaseAssignmentUserRolesResponse addCaseUserRoles( + @RequestHeader(AUTHORIZATION) String authorisation, + @RequestHeader(SERVICE_AUTHORIZATION) String serviceAuthorization, + @RequestBody CaseAssignmentUserRolesRequest caseRoleRequest ); @GetMapping( @@ -79,6 +91,6 @@ CaseAssignmentUserRolesResource getUserRoles( CaseAssignmentUserRolesResponse removeCaseUserRoles( @RequestHeader(AUTHORIZATION) String authorisation, @RequestHeader(SERVICE_AUTHORIZATION) String serviceAuthorization, - @RequestBody CaseAssignmentUserRolesRequest caseRoleRequest + @RequestBody CaseAssignmentUserRolesWithOrganisationRequest caseRoleRequest ); } diff --git a/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java b/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java index 525e0b82..e3395cf5 100644 --- a/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java +++ b/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java @@ -15,6 +15,6 @@ public class CaseAssignmentUserRolesRequest { @JsonProperty("case_users") - private List caseAssignmentUserRolesWithOrganisation; + private List caseAssignmentUserRoles; } diff --git a/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesWithOrganisationRequest.java b/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesWithOrganisationRequest.java new file mode 100644 index 00000000..0531f90b --- /dev/null +++ b/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesWithOrganisationRequest.java @@ -0,0 +1,20 @@ +package uk.gov.hmcts.reform.ccd.client.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Builder; +import lombok.Data; +import lombok.Getter; +import lombok.extern.jackson.Jacksonized; + +import java.util.List; + +@Getter +@Data +@Builder +@Jacksonized +public class CaseAssignmentUserRolesWithOrganisationRequest { + + @JsonProperty("case_users") + private List caseAssignmentUserRolesWithOrganisation; + +} From 5437db380a6f5a431fa448091ab0ca2fd4429647 Mon Sep 17 00:00:00 2001 From: Toby Plunkett Date: Tue, 9 Dec 2025 16:01:10 +0000 Subject: [PATCH 2/3] HDPI-3210 remove duplicate class --- .../reform/ccd/client/CaseAssignmentApi.java | 3 +-- .../model/CaseAssignmentUserRolesRequest.java | 20 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java diff --git a/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java b/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java index a56f8a81..0269c1aa 100644 --- a/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java +++ b/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesRequest; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesResource; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesResponse; import uk.gov.hmcts.reform.ccd.client.model.CaseAssignmentUserRolesWithOrganisationRequest; @@ -45,7 +44,7 @@ CaseAssignmentUserRolesResponse addCaseUserRoles( CaseAssignmentUserRolesResponse addCaseUserRoles( @RequestHeader(AUTHORIZATION) String authorisation, @RequestHeader(SERVICE_AUTHORIZATION) String serviceAuthorization, - @RequestBody CaseAssignmentUserRolesRequest caseRoleRequest + @RequestBody CaseAssignmentUserRolesResponse caseRoleRequest ); @GetMapping( diff --git a/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java b/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java deleted file mode 100644 index e3395cf5..00000000 --- a/src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package uk.gov.hmcts.reform.ccd.client.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Builder; -import lombok.Data; -import lombok.Getter; -import lombok.extern.jackson.Jacksonized; - -import java.util.List; - -@Getter -@Data -@Builder -@Jacksonized -public class CaseAssignmentUserRolesRequest { - - @JsonProperty("case_users") - private List caseAssignmentUserRoles; - -} From 18fe6cd12549a118710f163b2f99b9add96bb6c2 Mon Sep 17 00:00:00 2001 From: Toby Plunkett Date: Tue, 9 Dec 2025 17:24:29 +0000 Subject: [PATCH 3/3] HDPI-3210 fix wrong body in request --- .../java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java b/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java index 0269c1aa..f22ecbf9 100644 --- a/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java +++ b/src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java @@ -44,7 +44,7 @@ CaseAssignmentUserRolesResponse addCaseUserRoles( CaseAssignmentUserRolesResponse addCaseUserRoles( @RequestHeader(AUTHORIZATION) String authorisation, @RequestHeader(SERVICE_AUTHORIZATION) String serviceAuthorization, - @RequestBody CaseAssignmentUserRolesResponse caseRoleRequest + @RequestBody CaseAssignmentUserRolesResource caseRoleRequest ); @GetMapping(