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..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 @@ -9,9 +9,9 @@ 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; import java.util.List; @@ -33,7 +33,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 CaseAssignmentUserRolesResource caseRoleRequest ); @GetMapping( @@ -79,6 +90,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/CaseAssignmentUserRolesWithOrganisationRequest.java similarity index 86% rename from src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesRequest.java rename to src/main/java/uk/gov/hmcts/reform/ccd/client/model/CaseAssignmentUserRolesWithOrganisationRequest.java index 525e0b82..0531f90b 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/CaseAssignmentUserRolesWithOrganisationRequest.java @@ -12,7 +12,7 @@ @Data @Builder @Jacksonized -public class CaseAssignmentUserRolesRequest { +public class CaseAssignmentUserRolesWithOrganisationRequest { @JsonProperty("case_users") private List caseAssignmentUserRolesWithOrganisation;