Tmp/missing changes into cct 1981

README.md

@@ -119,5 +119,4 @@ X-Powered-By: Undertow/1
 Server: WildFly/10
 Content-Length: 0
 Date: Tue, 03 Dec 2019 16:14:28 GMT
-```
-
+```

listing-command/listing-command-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>listing-command</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-command/listing-command-handler/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-command</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-aggregate/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-event/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-xhibit/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-domain</artifactId>

listing-event-sources/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-event/listing-event-listener/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-event</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-event/listing-event-processor/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-event</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-event/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-healthchecks/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-integration-test-persistence/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-integration-test/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java

@@ -73,7 +73,7 @@ void setUp() {
         setupProgressionNotesStubs();
         setupUsersGroupPermissionsForApplicationTypeStub();
         databaseCleaner.cleanEventStoreTables(CONTEXT_NAME);
-        databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, "stream_status",
+        databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, "stream_status","processed_event",
                 "stream_buffer", "hearing", "hearing_days", "listing_notes", "cache_refdata_courtroom", "court_list_publish_status", "published_court_list");
     }
 

listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java

@@ -43,7 +43,6 @@
 @SuppressWarnings({"squid:S1607"})
 public class RangeSearchQueryForCourtCalendarIT extends AbstractIT {
 
-    private static final String CONTEXT_NAME = "listing";
     private static final Map<UUID, String> COURT_ROOMS = new LinkedHashMap<>() {{
         put(fromString("1d0199f8-8812-48a2-b13c-837e1c03ff19"), "Courtroom 01");
         put(fromString("18982e9c-2475-36a4-a852-09ab720acfc9"), "Courtroom 03");

listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java

@@ -7,7 +7,7 @@
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.Matchers.is;
 import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.getHearingFilter;
 import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.pollForHearing;
 import static uk.gov.moj.cpp.listing.steps.UpdateHearingSteps.DEFAULT_DURATION_HOURS_MINS;
@@ -46,10 +46,17 @@ public void whenHearingIsUpdatedForListingForWeekCommencingDate() {
 
         request = prepareJsonForUpdatedHearingData(updatedHearingData);
 
-        final Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING,
-                request, getLoggedInHeader());
-
-        assertThat(response.getStatus(), equalTo(SC_ACCEPTED));
+        try (Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING,  request, getLoggedInHeader())) {
+
+            String responseBody = "";
+            try {
+                responseBody = response.readEntity(String.class);
+            } catch (IllegalStateException e) {
+                //no-op in case of no response
+            }
+            assertThat(format("Post returned not expected status code with body: %s", responseBody),
+                    response.getStatus(), is(SC_ACCEPTED));
+        }
     }
 
     public void verifyHearingUpdatedWithWeekCommencingDateAndUnallocatedWhenQueryingFromAPI() {

listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java

@@ -1,7 +1,7 @@
 package uk.gov.moj.cpp.listing.utils;
 
 import static java.nio.charset.Charset.defaultCharset;
-import static javax.json.Json.createReader;
+import static uk.gov.justice.services.messaging.JsonObjects.createReader;
 import static org.apache.commons.io.FileUtils.readFileToString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsNull.notNullValue;

listing-json/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-json</artifactId>

listing-performance-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-performance-test</artifactId>

listing-query/listing-query-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-query</artifactId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-query-api</artifactId>

listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java

@@ -9,6 +9,8 @@
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
 import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
+import static uk.gov.moj.cpp.listing.domain.CourtListType.ALPHABETICAL;
+import static uk.gov.moj.cpp.listing.domain.CourtListType.JUDGE;
 import static uk.gov.moj.cpp.listing.domain.CourtListType.ONLINE_PUBLIC;
 import static uk.gov.moj.cpp.listing.domain.CourtListType.PUBLIC;
 
@@ -25,7 +27,9 @@
 import uk.gov.moj.cpp.listing.common.xhibit.ReferenceDataLoader;
 import uk.gov.moj.cpp.listing.domain.CourtListType;
 import uk.gov.moj.cpp.listing.domain.referencedata.OrganisationUnit;
+import uk.gov.moj.cpp.listing.query.api.service.AlphabeticalCourtListService;
 import uk.gov.moj.cpp.listing.query.api.service.ReferenceDataService;
+import uk.gov.moj.cpp.listing.query.document.generator.JudgeListTemplateAssembler;
 import uk.gov.moj.cpp.listing.query.document.generator.JudiciaryNameMapper;
 import uk.gov.moj.cpp.listing.query.document.generator.StandardPublicCourtListTemplateAssembler;
 import uk.gov.moj.cpp.listing.query.view.HearingQueryView;
@@ -44,7 +48,6 @@
 import javax.inject.Inject;
 import uk.gov.justice.services.messaging.JsonObjects;
 
-import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
@@ -67,6 +70,8 @@ public class HearingQueryApi {
     public static final String RESTRICTED = "restricted";
     public static final String INCLUDE_APPLICATIONS = "includeApplications";
     private static final String LIST_ID = "listId";
+    private static final String START_DATE = "startDate";
+    private static final String END_DATE = "endDate";
     private static final String OU_L2_CODE = "oucodeL2Code";
     private static final String FIRST_NAME = "firstName";
     private static final String LAST_NAME = "lastName";
@@ -103,6 +108,12 @@ public class HearingQueryApi {
     @Inject
     private StandardPublicCourtListTemplateAssembler standardPublicCourtListAssembler;
 
+    @Inject
+    private AlphabeticalCourtListService alphabeticalCourtListService;
+
+    @Inject
+    private JudgeListTemplateAssembler judgeListTemplateAssembler;
+
     @Inject
     private ReferenceDataService referenceDataService;
 
@@ -185,18 +196,23 @@ public JsonEnvelope searchHearingsForCourtListPayload(final JsonEnvelope query)
 
         final String courtCentreId = query.payloadAsJsonObject().getString(COURT_CENTRE_ID, null);
         final String courtRoomId = query.payloadAsJsonObject().getString(COURT_ROOM_ID, null);
+        final String startDate = query.payloadAsJsonObject().getString(START_DATE, null);
         final String listId = query.payloadAsJsonObject().getString(LIST_ID);
         final boolean restricted = Optional.ofNullable(query.payloadAsJsonObject().get(RESTRICTED)).map(restrictedJson -> Boolean.valueOf(restrictedJson.toString())).orElse(false);
         final boolean includeApplications = Optional.ofNullable(query.payloadAsJsonObject().get(INCLUDE_APPLICATIONS)).map(includeApplicationsJson -> Boolean.valueOf(includeApplicationsJson.toString())).orElse(false);
         final Optional<CourtListType> courtListType = CourtListType.valueFor(listId);
 
         if(courtListType.isPresent()) {
-            final JsonEnvelope queryResponse = hearingQueryView.getCourtListContent(query);
-            final Optional<JsonObject> courtListData = standardPublicCourtListAssembler.assemble(queryResponse, courtCentreId, courtRoomId, courtListType.get(), restricted, includeApplications);
+            final CourtListType listType = courtListType.get();
+            // JUDGE uses a different query (range search by judge); all other types use the standard court list content.
+            final JsonEnvelope queryResponse = JUDGE.equals(listType)
+                    ? hearingQueryView.rangeSearchHearingsForJudge(query)
+                    : hearingQueryView.getCourtListContent(query);
+            final Optional<JsonObject> courtListData = buildCourtListData(queryResponse, courtCentreId, courtRoomId, listType, restricted, includeApplications, startDate);
             if (courtListData.isPresent()) {
                 final JsonObject courtListPayload = courtListData.get();
                 final boolean isWelsh = referenceDataService.isHearingLanguageWelsh(queryResponse, courtCentreId).orElse(false);
-                final String templateName = getTemplateName(courtListType.get(), isWelsh);
+                final String templateName = getTemplateName(listType, isWelsh);
                 final JsonObjectBuilder builder = JsonObjects.createObjectBuilder();
                 courtListPayload.forEach(builder::add);
                 builder.add("templateName", templateName);
@@ -218,16 +234,16 @@ public JsonEnvelope getDailyList(final JsonEnvelope query) {
 
         final String weekCommencingStartDate = payload.getString(WEEK_COMMENCING_START_DATE, null);
         final boolean isWeekCommencing = weekCommencingStartDate != null;
-        final String startDate = isWeekCommencing ? weekCommencingStartDate : payload.getString("startDate");
+        final String startDate = isWeekCommencing ? weekCommencingStartDate : payload.getString(START_DATE);
         final String weekCommencingEndDate = isWeekCommencing ? payload.getString(WEEK_COMMENCING_END_DATE, null) : null;
-        final String endDate = isWeekCommencing ? weekCommencingEndDate : payload.getString("endDate", null);
+        final String endDate = isWeekCommencing ? weekCommencingEndDate : payload.getString(END_DATE, null);
 
         final JsonObjectBuilder requestPayloadBuilder = JsonObjects.createObjectBuilder()
                 .add(COURT_CENTRE_ID, courtCentreId)
-                .add("startDate", startDate)
+                .add(START_DATE, startDate)
                 .add("publishCourtListType", documentType);
         if (endDate != null) {
-            requestPayloadBuilder.add("endDate", endDate);
+            requestPayloadBuilder.add(END_DATE, endDate);
         }
         final JsonEnvelope courtListEnvelope = envelopeFrom(
                 metadataFrom(query.metadata()).withName("listing.courtlist"),
@@ -518,8 +534,25 @@ private JsonEnvelope processGetCaseByDefendant(final JsonObject payload, final S
         return this.hearingQueryView.getCasesByDefendantAndHearingDate(caseIds, defendants, hearingDate, query);
     }
 
+    /**
+     * Builds the court list payload for the given type, routing ALPHABETICAL and JUDGE to their dedicated
+     * assemblers (mirroring the binary /courtlist endpoint). Without this, those types fall through to the
+     * standard assembler and yield an empty payload.
+     */
+    private Optional<JsonObject> buildCourtListData(final JsonEnvelope queryResponse, final String courtCentreId, final String courtRoomId,
+                                                    final CourtListType courtListType, final boolean restricted,
+                                                    final boolean includeApplications, final String startDate) {
+        if (ALPHABETICAL.equals(courtListType)) {
+            return alphabeticalCourtListService.buildAlphabeticalCourtListData(queryResponse, courtCentreId);
+        }
+        if (JUDGE.equals(courtListType)) {
+            return judgeListTemplateAssembler.assemble(queryResponse, courtCentreId, courtRoomId, courtListType, startDate);
+        }
+        return standardPublicCourtListAssembler.assemble(queryResponse, courtCentreId, courtRoomId, courtListType, restricted, includeApplications);
+    }
+
     private String getTemplateName(final CourtListType courtListType, boolean welsh) {
-        if ((PUBLIC.equals(courtListType) || ONLINE_PUBLIC.equals(courtListType)) && welsh) {
+        if ((ALPHABETICAL.equals(courtListType) || PUBLIC.equals(courtListType) || ONLINE_PUBLIC.equals(courtListType)) && welsh) {
             return courtListType.getWelshTemplateName();
         }
         return courtListType.getTemplateName();
@@ -568,7 +601,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope
 
                     if (appDetails.isPresent()) {
                         final CourtApplication courtApplicationObj = jsonObjectToObjectConverter.convert(appDetails.get().getJsonObject("courtApplication"), CourtApplication.class);
-                        final JsonObjectBuilder appBuilder = Json.createObjectBuilder();
+                        final JsonObjectBuilder appBuilder = JsonObjects.createObjectBuilder();
                         application.forEach(appBuilder::add);
                         appBuilder.add("applicationTypeCode", courtApplicationObj.getType().getCode());
                         applicationsBuilder.add(appBuilder.build());
@@ -584,7 +617,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope
     }
 
     private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonObject hearing, final JsonArrayBuilder applicationsBuilder) {
-        final JsonObjectBuilder hearingBuilder = Json.createObjectBuilder();
+        final JsonObjectBuilder hearingBuilder = JsonObjects.createObjectBuilder();
         hearing.forEach((key, value) -> {
             if (!COURT_APPLICATIONS.equals(key)) {
                 hearingBuilder.add(key, value);
@@ -595,7 +628,7 @@ private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonO
     }
 
     private static @NonNull JsonObjectBuilder buildResponsePayloadWithUpdatedHearing(final JsonObject payload, final JsonArrayBuilder hearingsBuilder) {
-        final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder();
+        final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder();
         payload.forEach((key, value) -> {
             if (!HEARINGS.equals(key)) {
                 payloadBuilder.add(key, value);