Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion listing-command/listing-command-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>listing-command</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-command/listing-command-handler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-command</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-command/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-parent</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-parent</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-domain/listing-domain-aggregate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-domain</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-domain/listing-domain-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-domain</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-domain/listing-domain-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-domain</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-domain/listing-domain-xhibit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-domain</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-domain/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>uk.gov.moj.cpp.listing</groupId>
<artifactId>listing-parent</artifactId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>

<artifactId>listing-domain</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion listing-event-sources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-parent</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-event/listing-event-listener/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-event</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-event/listing-event-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-event</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.listing</groupId>
<artifactId>listing-parent</artifactId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-healthchecks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-parent</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-integration-test-persistence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-parent</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion listing-integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>listing-parent</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataCourtMappings;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataCpCourtRooms;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataJudiciaries;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataResultDefinitions;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataXhibitCourtRoomMappings;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubOrganisationUnit;

Expand All @@ -26,6 +27,7 @@
import uk.gov.moj.cpp.listing.steps.data.UpdatedHearingData;

import java.time.LocalTime;
import java.util.UUID;

public class DailyListPayloadSteps extends AbstractIT {

Expand All @@ -34,6 +36,7 @@ public class DailyListPayloadSteps extends AbstractIT {
private static final LocalTime DEFAULT_START_TIME = LocalTime.of(10, 0);
private static final String EXPECTED_JUDICIARY_NAME = "Recorder Ainsworth judge";
private static final String EXPECTED_PROSECUTOR_ORGANISATION_NAME = "Transport for London";
private static final UUID JUDICIAL_RESULT_ID = UUID.fromString("065b6fcb-0787-4f0d-a9cd-af4b5c36e047");

private final UpdatedHearingData updatedHearingData;

Expand All @@ -50,6 +53,7 @@ public DailyListPayloadSteps(final HearingsData hearingsData, final UpdatedHeari
stubOrganisationUnit(updatedHearingData.getCourtCentreId());
stubGetReferenceDataJudiciaries(updatedHearingData.getJudiciary().get(0).getJudicialId());
stubGetProsecutorPoliceFlag(hearingsData.getHearingData().get(0).getListedCases().get(0).getAuthorityId());
stubGetReferenceDataResultDefinitions(JUDICIAL_RESULT_ID);
}

public void verifyDailyListPayloadContainsHearing(final String publishCourtListType) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ public class ReferenceDataStub {
private static final String REFERENCE_DATA_OU_COURTROOMS_MEDIA_TYPE = "application/vnd.referencedata.ou-courtrooms+json";
private static final String REFERENCE_DATA_PROSECUTOR_QUERY_URL = "/referencedata-service/query/api/rest/referencedata/prosecutors/%s";
private static final String REFERENCE_DATA_PROSECUTOR_MEDIA_TYPE = "application/vnd.referencedata.query.prosecutor+json";
private static final String REFERENCE_DATA_RESULT_DEFINITIONS_URL = "/referencedata-service/query/api/rest/referencedata/result-definitions";
private static final String REFERENCE_DATA_RESULT_DEFINITIONS_MEDIA_TYPE = "application/vnd.referencedata.query-result-definitions-by-ids+json";

private static final Map<UUID, String> COURT_CENTER_IDS = new HashMap<>(){{
put(fromString("9b583616-049b-30f9-a14f-028a53b7cfe8"), "Liverpool Crown Court");
Expand Down Expand Up @@ -415,6 +417,19 @@ public static void stubOrganisationUnit(final UUID ouId) {
.withBody(payload)));
}

public static void stubGetReferenceDataResultDefinitions(final UUID judicialResultId) {
stubPingForReferenceDataService();
String payload = getPayload("stub-data/referencedata.query-result-definitions-by-ids.json")
.replace("JUDICIAL_RESULT_ID", judicialResultId.toString());

stubFor(get(urlPathMatching(REFERENCE_DATA_RESULT_DEFINITIONS_URL))
.withQueryParam("ids", containing(judicialResultId.toString()))
.willReturn(aResponse().withStatus(SC_OK)
.withHeader("CPPID", randomUUID().toString())
.withHeader("Content-Type", REFERENCE_DATA_RESULT_DEFINITIONS_MEDIA_TYPE)
.withBody(payload)));
}

public static void stubGetProsecutorPoliceFlag(final UUID prosecutorId) {
stubPingForReferenceDataService();

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"resultDefinitions": [
{
"id": "JUDICIAL_RESULT_ID",
"label": "Reporting restriction applied",
"welshLabel": "Cyfyngiad adrodd wedi'i gymhwyso"
}
]
}
2 changes: 1 addition & 1 deletion listing-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>listing-parent</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>

<artifactId>listing-json</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion listing-performance-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.listing</groupId>
<artifactId>listing-parent</artifactId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>

<artifactId>listing-performance-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion listing-query/listing-query-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>uk.gov.moj.cpp.listing</groupId>
<artifactId>listing-query</artifactId>
<version>17.104.8-cct-1981-SNAPSHOT</version>
<version>17.104.9-cct-1981-SNAPSHOT</version>
</parent>

<artifactId>listing-query-api</artifactId>
Expand Down
Loading
Loading