Skip to content

Add case assignment user roles request without organisation #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toby-plunkett wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add case assignment user roles request without organisation #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4713962
HDPI-3210 Add option to use add role request without organisation
toby-plunkett Dec 9, 2025
5437db3
HDPI-3210 remove duplicate class
toby-plunkett Dec 9, 2025
18fe6cd
HDPI-3210 fix wrong body in request
toby-plunkett Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/functionalTest/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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")
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/uk/gov/hmcts/reform/ccd/client/CaseAssignmentApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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(
Expand Down Expand Up @@ -79,6 +90,6 @@ CaseAssignmentUserRolesResource getUserRoles(
CaseAssignmentUserRolesResponse removeCaseUserRoles(
@RequestHeader(AUTHORIZATION) String authorisation,
@RequestHeader(SERVICE_AUTHORIZATION) String serviceAuthorization,
@RequestBody CaseAssignmentUserRolesRequest caseRoleRequest
@RequestBody CaseAssignmentUserRolesWithOrganisationRequest caseRoleRequest
);
}
2 changes: 1 addition & 1 deletion ...model/CaseAssignmentUserRolesRequest.java → ...mentUserRolesWithOrganisationRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Data
@Builder
@Jacksonized
public class CaseAssignmentUserRolesRequest {
public class CaseAssignmentUserRolesWithOrganisationRequest {

@JsonProperty("case_users")
private List<CaseAssignmentUserRoleWithOrganisation> caseAssignmentUserRolesWithOrganisation;
Expand Down