From ecbc7026ae64dadddc8a0f852085ec108d69635d Mon Sep 17 00:00:00 2001 From: skandala-cgi Date: Tue, 2 Sep 2025 21:40:49 +0100 Subject: [PATCH 1/4] RWA-3080-changes --- .../StartEventForCaseWorkerConsumerTest.java | 3 +- .../ccd/StartForCaseWorkerConsumerTest.java | 4 +-- .../SubmitEventForCaseWorkerConsumerTest.java | 31 ++---------------- .../ccd/SubmitForCaseWorkerConsumerTest.java | 32 +------------------ .../PactDslBuilderForCaseDetailsList.java | 8 ++--- .../ccd/CcdGetCasesByCaseIdPactTest.java | 10 ++++-- 6 files changed, 19 insertions(+), 69 deletions(-) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java index ae8da75365..56e2f7b443 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java @@ -31,7 +31,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") public RequestResponsePact startEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Start Event for a Caseworker is requested", @@ -64,6 +64,7 @@ public void verifyStartEventForCaseworker() { START_APPEAL); assertThat(startEventResponse.getEventId(), is(START_APPEAL)); + assertNotNull(startEventResponse.getToken()); assertCaseDetails(startEventResponse.getCaseDetails()); } diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java index 700ab66608..9e78c3e5ef 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java @@ -32,7 +32,7 @@ public Map setUpStateMapForProviderWithoutCaseData() { return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") public RequestResponsePact startForCaseWorker(PactDslWithProvider builder) { return builder .given("A Start for a Caseworker is requested", setUpStateMapForProviderWithoutCaseData()) @@ -62,7 +62,7 @@ public void verifyStartEventForCaseworker() { START_APPEAL); assertThat(startEventResponse.getEventId(), equalTo(START_APPEAL)); - assertNotNull(startEventResponse.getCaseDetails()); + assertNotNull(startEventResponse.getToken()); } private String buildPath() { diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java index 74bd8e5ba7..7e593c1a10 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java @@ -33,7 +33,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") public RequestResponsePact submitEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Submit Event for a Caseworker is requested", @@ -68,34 +68,7 @@ public void verifySubmitEventForCaseworker() throws Exception { true, caseDataContent); - assertThat(caseDetails.getId(), is(CASE_ID)); - assertThat(caseDetails.getJurisdiction(), is("IA")); - assertCaseDetails(caseDetails); - } - - private void assertCaseDetails(final CaseDetails caseDetails) { - assertNotNull(caseDetails); - - Map caseDataMap = caseDetails.getData(); - - assertThat(caseDataMap.get("appellantTitle"), is("Mr")); - assertThat(caseDataMap.get("appellantGivenNames"), is("Bob")); - assertThat(caseDataMap.get("appellantFamilyName"), is("Smith")); - assertThat(caseDataMap.get("appellantDateOfBirth"), is("1990-12-07")); - assertThat(caseDataMap.get("homeOfficeReferenceNumber"), is("000123456")); - assertThat(caseDataMap.get("homeOfficeDecisionDate"), is("2019-08-01")); - assertThat(caseDataMap.get("appealType"), is("protection")); - assertThat(caseDataMap.get("submissionOutOfTime"), is("Yes")); - assertThat(caseDataMap.get("applicationOutOfTimeExplanation"), is("test case")); - - //caseManagementLocation - @SuppressWarnings("unchecked") - Map caseManagementLocation = (Map) caseDataMap.get("caseManagementLocation"); - assertThat(caseManagementLocation.get("region"), is("1")); - assertThat(caseManagementLocation.get("baseLocation"), is("765324")); - - assertThat(caseDataMap.get("staffLocation"), is("Taylor House")); - + assertThat(caseDetails.getCaseTypeId(), is("Asylum")); } private String buildPath() { diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java index f40a0a2e18..700ff62300 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java @@ -36,7 +36,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") public RequestResponsePact submitCaseWorkerDetails(PactDslWithProvider builder) throws Exception { return builder .given("A Submit for a Caseworker is requested", @@ -70,37 +70,7 @@ public void submitForCaseWorker() { true, caseDataContent); - assertNotNull(caseDetailsResponse); - assertNotNull(caseDetailsResponse.getCaseTypeId()); assertEquals(caseDetailsResponse.getCaseTypeId(), "Asylum"); - assertEquals(caseDetailsResponse.getJurisdiction(), "IA"); - assertCaseDetails(caseDetailsResponse); - } - - - private void assertCaseDetails(final CaseDetails caseDetails) { - assertNotNull(caseDetails); - - Map caseDataMap = caseDetails.getData(); - - assertThat(caseDataMap.get("appellantTitle"), is("Mr")); - assertThat(caseDataMap.get("appellantGivenNames"), is("Bob")); - assertThat(caseDataMap.get("appellantFamilyName"), is("Smith")); - assertThat(caseDataMap.get("appellantDateOfBirth"), is("1990-12-07")); - assertThat(caseDataMap.get("homeOfficeReferenceNumber"), is("000123456")); - assertThat(caseDataMap.get("homeOfficeDecisionDate"), is("2019-08-01")); - assertThat(caseDataMap.get("appealType"), is("protection")); - assertThat(caseDataMap.get("submissionOutOfTime"), is("Yes")); - assertThat(caseDataMap.get("applicationOutOfTimeExplanation"), is("test case")); - - //caseManagementLocation - @SuppressWarnings("unchecked") - Map caseManagementLocation = (Map) caseDataMap.get("caseManagementLocation"); - assertThat(caseManagementLocation.get("region"), is("1")); - assertThat(caseManagementLocation.get("baseLocation"), is("765324")); - - assertThat(caseDataMap.get("staffLocation"), is("Taylor House")); - } private String buildPath() { diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java index 3dd4f32974..1f17f92693 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/util/PactDslBuilderForCaseDetailsList.java @@ -21,9 +21,9 @@ public static DslPart buildStartEventForCaseWorkerPactDsl(String eventId) { .object("case_details", cd -> { cd.numberType("id", 2000); cd.stringMatcher("jurisdiction", ALPHABETIC_REGEX, "IA"); - cd.stringMatcher("case_type", ALPHABETIC_REGEX, "Asylum"); + cd.stringMatcher("case_type_id", ALPHABETIC_REGEX, "Asylum"); cd.stringValue("state", "appealStarted"); - cd.stringValue("securityClassification", "PUBLIC"); + cd.stringValue("security_classification", "PUBLIC"); cd.object("case_data", PactDslBuilderForCaseDetailsList::getCaseDataPactDsl); })).build(); } @@ -49,8 +49,8 @@ public static DslPart buildSubmitForCaseWorkedPactDsl(Long caseId) { .stringType("jurisdiction", "IA") .stringValue("case_type_id", "Asylum") .stringValue("state", "appealStarted") - .stringValue("securityClassification", "PUBLIC") - .stringValue("callbackResponseStatus", "CALLBACK_COMPLETED") + .stringValue("security_classification", "PUBLIC") + .stringValue("callback_response_status", "CALLBACK_COMPLETED") .object("case_data", PactDslBuilderForCaseDetailsList::getCaseDataPactDsl)).build(); } diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java index c1074388d6..a872cba418 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java @@ -24,6 +24,7 @@ import java.util.Map; +import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; @@ -53,7 +54,7 @@ void setUp() { ccdDataService = new CcdDataService(ccdDataServiceApi, authTokenGenerator, systemTokenGenerator); } - @Pact(provider = "ccd_data_store_get_case_by_id", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") public RequestResponsePact executeCcdGetCasesByCaseId(PactDslWithProvider builder) { Map responseHeaders = Map.of("Content-Type", "application/json"); @@ -79,14 +80,19 @@ public void verifyGetCaseById() { assertThat(caseDetails.getSecurityClassification(), is("PRIVATE")); assertThat(caseDetails.getJurisdiction(), is("IA")); assertThat(caseDetails.getCaseType(), is("Asylum")); + assertNotNull(caseDetails.getData()); } private PactDslJsonBody createCasesResponse() { - return new PactDslJsonBody() + PactDslJsonBody body = new PactDslJsonBody() .stringType("id", "1593694526480034") .stringValue("jurisdiction", "IA") .stringValue("case_type", "Asylum") .stringValue("security_classification", "PRIVATE"); + + body.object("data") + .closeObject(); + return body; } private CaseDetails read(String caseData) { From e80dd92fc66aca95493f084cd99032e283b71471 Mon Sep 17 00:00:00 2001 From: skandala-cgi Date: Wed, 3 Sep 2025 10:37:40 +0100 Subject: [PATCH 2/4] RWA-3080-changes --- .../consumer/ccd/StartForCaseWorkerConsumerTest.java | 2 +- .../consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java | 1 - .../consumer/ccd/SubmitForCaseWorkerConsumerTest.java | 3 --- .../consumer/ccd/CcdGetCasesByCaseIdPactTest.java | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java index 9e78c3e5ef..6c2a72ef5e 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java @@ -13,9 +13,9 @@ import java.util.Map; -import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java index 7e593c1a10..957b49c094 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java @@ -17,7 +17,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java index 700ff62300..48b646fc7f 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java @@ -16,10 +16,7 @@ import java.util.Map; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java index a872cba418..c381c01310 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java @@ -24,9 +24,9 @@ import java.util.Map; -import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.when; @PactTestFor(providerName = "ccdDataStoreAPI_Cases", port = "8891") From b7e5280fc70cd44dd0bc1ab8c9d54c2e440ea1d7 Mon Sep 17 00:00:00 2001 From: skandala-cgi Date: Wed, 24 Sep 2025 15:52:51 +0100 Subject: [PATCH 3/4] RWA-3687 reverting provider name changes --- .../ccd/StartEventForCaseWorkerConsumerTest.java | 2 +- .../consumer/ccd/StartForCaseWorkerConsumerTest.java | 2 +- .../ccd/SubmitEventForCaseWorkerConsumerTest.java | 2 +- .../consumer/ccd/SubmitForCaseWorkerConsumerTest.java | 2 +- .../consumer/ccd/CcdGetCasesByCaseIdPactTest.java | 2 +- .../hmcts/reform/wataskmanagementapi/utils/Common.java | 9 +++++---- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java index 56e2f7b443..4ab1219d04 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartEventForCaseWorkerConsumerTest.java @@ -31,7 +31,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") public RequestResponsePact startEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Start Event for a Caseworker is requested", diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java index 6c2a72ef5e..b9186bd780 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/StartForCaseWorkerConsumerTest.java @@ -32,7 +32,7 @@ public Map setUpStateMapForProviderWithoutCaseData() { return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") public RequestResponsePact startForCaseWorker(PactDslWithProvider builder) { return builder .given("A Start for a Caseworker is requested", setUpStateMapForProviderWithoutCaseData()) diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java index 957b49c094..6f6fa390fb 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitEventForCaseWorkerConsumerTest.java @@ -32,7 +32,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") public RequestResponsePact submitEventForCaseWorker(PactDslWithProvider builder) throws JSONException { return builder .given("A Submit Event for a Caseworker is requested", diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java index 48b646fc7f..840de3019c 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/consumer/ccd/SubmitForCaseWorkerConsumerTest.java @@ -33,7 +33,7 @@ public Map setUpStateMapForProviderWithCaseData(CaseDataContent return caseDataContentMap; } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") public RequestResponsePact submitCaseWorkerDetails(PactDslWithProvider builder) throws Exception { return builder .given("A Submit for a Caseworker is requested", diff --git a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java index c381c01310..4ac9c84816 100644 --- a/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java +++ b/src/contractTest/java/uk/gov/hmcts/reform/wataskmanagementapi/wataskconfigurationapi/consumer/ccd/CcdGetCasesByCaseIdPactTest.java @@ -54,7 +54,7 @@ void setUp() { ccdDataService = new CcdDataService(ccdDataServiceApi, authTokenGenerator, systemTokenGenerator); } - @Pact(provider = "ccdDataStoreAPI_WorkAllocation", consumer = "wa_task_management_api") + @Pact(provider = "ccdDataStoreAPI_Cases", consumer = "wa_task_management_api") public RequestResponsePact executeCcdGetCasesByCaseId(PactDslWithProvider builder) { Map responseHeaders = Map.of("Content-Type", "application/json"); diff --git a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java index 7838c0369c..65d16f53e1 100644 --- a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java +++ b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java @@ -28,6 +28,7 @@ import uk.gov.hmcts.reform.wataskmanagementapi.services.AuthorizationProvider; import java.io.IOException; +import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -48,7 +49,7 @@ public class Common { public static final String DEFAULT_TASK_TYPE = "reviewTheAppeal"; public static final String DEFAULT_TASK_NAME = "A Task"; public static final WarningValues DEFAULT_WARNINGS = new WarningValues(); - public static final DateTimeFormatter ROLE_ASSIGNMENT_DATA_TIME_FORMATTER = ofPattern("yyyy-MM-dd'T'HH:mm:ssX"); + public static final DateTimeFormatter ROLE_ASSIGNMENT_DATA_TIME_FORMATTER = ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX"); private static final String ENDPOINT_COMPLETE_TASK = "task/{task-id}/complete"; public static final String R2_ROLE_ASSIGNMENT_REQUEST = "requests/roleAssignment/r2/set-organisational-role-assignment-request.json"; public static final String R1_ROLE_ASSIGNMENT_REQUEST = "requests/roleAssignment/set-organisational-role-assignment-request.json"; @@ -233,8 +234,8 @@ public TestVariables setupWATaskWithWarningsAndRetrieveIds(String taskType, Stri public void cleanUpTask(String... taskId) { Stream.of(taskId).forEach(task -> { log.info("Cleaning task {}", task); - camundaApiActions.post(ENDPOINT_COMPLETE_TASK, task, - authorizationProvider.getServiceAuthorizationHeadersOnly()); +// camundaApiActions.post(ENDPOINT_COMPLETE_TASK, task, +// authorizationProvider.getServiceAuthorizationHeadersOnly()); }); } @@ -1102,7 +1103,7 @@ private String getBody(final String caseId, } else { assignmentRequestBody = assignmentRequestBody.replace( "{END_TIME_PLACEHOLDER}", - ZonedDateTime.now().plusHours(2).format(ROLE_ASSIGNMENT_DATA_TIME_FORMATTER) + ZonedDateTime.now().plusHours(4).format(ROLE_ASSIGNMENT_DATA_TIME_FORMATTER) ); } From c781891ca1886bb95e7ee93b540859342c329802 Mon Sep 17 00:00:00 2001 From: skandala-cgi Date: Wed, 24 Sep 2025 16:02:09 +0100 Subject: [PATCH 4/4] RWA-3687 reverting provider name changes --- .../hmcts/reform/wataskmanagementapi/utils/Common.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java index 65d16f53e1..7838c0369c 100644 --- a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java +++ b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/utils/Common.java @@ -28,7 +28,6 @@ import uk.gov.hmcts.reform.wataskmanagementapi.services.AuthorizationProvider; import java.io.IOException; -import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -49,7 +48,7 @@ public class Common { public static final String DEFAULT_TASK_TYPE = "reviewTheAppeal"; public static final String DEFAULT_TASK_NAME = "A Task"; public static final WarningValues DEFAULT_WARNINGS = new WarningValues(); - public static final DateTimeFormatter ROLE_ASSIGNMENT_DATA_TIME_FORMATTER = ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX"); + public static final DateTimeFormatter ROLE_ASSIGNMENT_DATA_TIME_FORMATTER = ofPattern("yyyy-MM-dd'T'HH:mm:ssX"); private static final String ENDPOINT_COMPLETE_TASK = "task/{task-id}/complete"; public static final String R2_ROLE_ASSIGNMENT_REQUEST = "requests/roleAssignment/r2/set-organisational-role-assignment-request.json"; public static final String R1_ROLE_ASSIGNMENT_REQUEST = "requests/roleAssignment/set-organisational-role-assignment-request.json"; @@ -234,8 +233,8 @@ public TestVariables setupWATaskWithWarningsAndRetrieveIds(String taskType, Stri public void cleanUpTask(String... taskId) { Stream.of(taskId).forEach(task -> { log.info("Cleaning task {}", task); -// camundaApiActions.post(ENDPOINT_COMPLETE_TASK, task, -// authorizationProvider.getServiceAuthorizationHeadersOnly()); + camundaApiActions.post(ENDPOINT_COMPLETE_TASK, task, + authorizationProvider.getServiceAuthorizationHeadersOnly()); }); } @@ -1103,7 +1102,7 @@ private String getBody(final String caseId, } else { assignmentRequestBody = assignmentRequestBody.replace( "{END_TIME_PLACEHOLDER}", - ZonedDateTime.now().plusHours(4).format(ROLE_ASSIGNMENT_DATA_TIME_FORMATTER) + ZonedDateTime.now().plusHours(2).format(ROLE_ASSIGNMENT_DATA_TIME_FORMATTER) ); }