Lpt 1784

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>uk.gov.moj.cpp.progression</groupId>
     <artifactId>progression-parent</artifactId>
-    <version>17.0.247-SNAPSHOT</version>
+    <version>17.0.245-cct-1981-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Progression services application</name>
@@ -67,7 +67,7 @@
         <json-transformer.version>1.0.6</json-transformer.version>
         <access.control.version>6.4.1</access.control.version>
         <referencedata.version>17.103.129</referencedata.version>
-        <listing.version>17.103.152</listing.version>
+        <listing.version>17.103.147-cct-1981-SNAPSHOT</listing.version>
         <hearing.version>17.0.144</hearing.version>
         <usersgroups.version>17.104.46</usersgroups.version>
         <defence.version>17.0.85</defence.version>

progression-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-command</artifactId>
     <packaging>pom</packaging>

progression-command/progression-command-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-command</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-command-api</artifactId>
     <packaging>war</packaging>

progression-command/progression-command-api/src/raml/json/schema/progression.correct-hearing-days-without-court-centre.json

@@ -4,13 +4,13 @@
   "type": "object",
   "properties": {
     "id": {
-      "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/uuid"
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
     },
     "hearingDays": {
       "type": "array",
       "minItems": 1,
       "items": {
-        "$ref": "http://justice.gov.uk/core/courts/hearingDay.json"
+        "$ref": "http://moj.gov.uk/progression/hearingDay.json"
       }
     }
   },

progression-command/progression-command-handler/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-command</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-command-handler</artifactId>
     <packaging>war</packaging>

progression-command/progression-command-handler/src/raml/json/schema/progression.command.correct-hearing-days-without-court-centre.json

@@ -4,13 +4,13 @@
   "type": "object",
   "properties": {
     "id": {
-      "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/uuid"
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
     },
     "hearingDays": {
       "type": "array",
       "minItems": 1,
       "items": {
-        "$ref": "http://justice.gov.uk/core/courts/hearingDay.json"
+        "$ref": "http://moj.gov.uk/progression/hearingDay.json"
       }
     }
   },

progression-domain/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>uk.gov.moj.cpp.progression</groupId>
     <artifactId>progression-parent</artifactId>
-    <version>17.0.247-SNAPSHOT</version>
+    <version>17.0.245-cct-1981-SNAPSHOT</version>
   </parent>
   <artifactId>progression-domain</artifactId>
   <packaging>pom</packaging>

progression-domain/progression-datatypes-common/pom.xml

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

progression-domain/progression-datatypes-common/src/main/resources/json/schema/moj-progression-hearingDay.json

@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "http://moj.gov.uk/progression/hearingDay.json",
+  "type": "object",
+  "properties": {
+    "sittingDay": {
+      "type": "string",
+      "format": "date-time"
+    },
+    "listingSequence": {
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/positiveInteger"
+    },
+    "listedDurationMinutes": {
+      "description": "The listed duration in minutes",
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/positiveInteger"
+    },
+    "courtCentreId": {
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
+    },
+    "courtRoomId": {
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
+    },
+    "hasSharedResults": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "sittingDay",
+    "listedDurationMinutes"
+  ],
+  "additionalProperties": false
+}

progression-domain/progression-datatypes-common/src/main/resources/json/schema/shared-definitions.json

@@ -3,11 +3,19 @@
   "id": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json",
   "type": "object",
   "definitions": {
+    "uuid": {
+      "type": "string",
+      "pattern": "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    },
+    "positiveInteger": {
+      "type": "integer",
+      "minimum": 0
+    },
     "refData": {
       "type": "object",
       "properties": {
         "directionRefDataId": {
-          "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/uuid"
+          "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
         },
         "directionRefDataType": {
           "type": "string"

progression-domain/progression-domain-aggregate/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>progression-domain</artifactId>
         <groupId>uk.gov.moj.cpp.progression</groupId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>progression-domain-aggregate</artifactId>

progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregateTest.java

@@ -4473,7 +4473,7 @@ private Hearing getHearing(final UUID offenceId) {
 
     private HearingDaysWithoutCourtCentreCorrected createHearingDaysWithoutCourtCentreCorrected() {
         return HearingDaysWithoutCourtCentreCorrected.hearingDaysWithoutCourtCentreCorrected()
-                .withHearingDays(asList(HearingDay.hearingDay()
+                .withHearingDays(asList(uk.gov.moj.progression.HearingDay.hearingDay()
                         .withCourtCentreId(UUID.randomUUID())
                         .withCourtRoomId(UUID.randomUUID())
                         .withListedDurationMinutes(30)

progression-domain/progression-domain-common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-domain</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-domain-common</artifactId>
     <dependencies>

progression-domain/progression-domain-message/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-domain</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-domain-message</artifactId>
     <properties>

progression-domain/progression-domain-message/src/raml/json/schema/progression.events.hearing-days-without-court-centre-corrected.json

@@ -1,21 +1,21 @@
 {
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"id": "http://justice.gov.uk/progression/events/progression.events.hearing-days-without-court-centre-corrected.json",
-	"type": "object",
-	"properties": {
-		"hearingDays": {
-			"type": "array",
-			"items": {
-				"$ref": "http://justice.gov.uk/core/courts/hearingDay.json"
-			}
-		},
-		"id": {
-			"$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
-		}
-	},
-	"required": [
-		"id",
-		"hearingDays"
-	],
-	"additionalProperties": false
-}
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "http://justice.gov.uk/progression/events/progression.events.hearing-days-without-court-centre-corrected.json",
+  "type": "object",
+  "properties": {
+    "hearingDays": {
+      "type": "array",
+      "items": {
+        "$ref": "http://moj.gov.uk/progression/hearingDay.json"
+      }
+    },
+    "id": {
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
+    }
+  },
+  "required": [
+    "id",
+    "hearingDays"
+  ],
+  "additionalProperties": false
+}

progression-event-sources/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>progression-parent</artifactId>
         <groupId>uk.gov.moj.cpp.progression</groupId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

progression-event/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event</artifactId>
     <packaging>pom</packaging>

progression-event/progression-event-indexer/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-event</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event-indexer</artifactId>
     <packaging>war</packaging>

progression-event/progression-event-listener/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-event</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event-listener</artifactId>
     <packaging>war</packaging>

progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingDaysWithoutCourtCentreCorrectedEventListener.java

@@ -48,10 +48,10 @@ public void correctHearingDaysWithoutCourtCentre(final JsonEnvelope event) {
         }
         final HearingDaysWithoutCourtCentreCorrected hearingDaysWithoutCourtCentreCorrected = jsonObjectToObjectConverter.convert(event.payloadAsJsonObject(), HearingDaysWithoutCourtCentreCorrected.class);
 
-        final List<HearingDay> hearingDays = hearingDaysWithoutCourtCentreCorrected.getHearingDays();
+        final List<uk.gov.moj.progression.HearingDay> correctedHearingDays = hearingDaysWithoutCourtCentreCorrected.getHearingDays();
         final UUID hearingId = hearingDaysWithoutCourtCentreCorrected.getId();
-        final UUID courtCentreId = hearingDays.get(0).getCourtCentreId();
-        final UUID courtRoomId = hearingDays.get(0).getCourtRoomId();
+        final UUID courtCentreId = correctedHearingDays.get(0).getCourtCentreId();
+        final UUID courtRoomId = correctedHearingDays.get(0).getCourtRoomId();
 
         final HearingEntity dbHearingEntity = hearingRepository.findBy(hearingId);
         final JsonObject dbHearingJsonObject = jsonFromString(dbHearingEntity.getPayload());

progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingDaysWithoutCourtCentreCorrectedEventListenerTest.java

@@ -7,7 +7,7 @@
 import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;
 
 import uk.gov.justice.core.courts.Hearing;
-import uk.gov.justice.core.courts.HearingDay;
+import uk.gov.moj.progression.HearingDay;
 import uk.gov.justice.progression.events.HearingDaysWithoutCourtCentreCorrected;
 import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
 import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter;

progression-event/progression-event-listener/src/yaml/json/schema/progression.events.hearing-days-without-court-centre-corrected.json

@@ -6,16 +6,16 @@
     "hearingDays": {
       "type": "array",
       "items": {
-        "$ref": "http://justice.gov.uk/core/courts/hearingDay.json"
+        "$ref": "http://moj.gov.uk/progression/hearingDay.json"
       }
     },
     "id": {
-      "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
     }
   },
   "required": [
     "id",
     "hearingDays"
   ],
   "additionalProperties": false
-}
+}

progression-event/progression-event-processor/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-event</artifactId>
-        <version>17.0.247-SNAPSHOT</version>
+        <version>17.0.245-cct-1981-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event-processor</artifactId>
     <packaging>war</packaging>
@@ -39,6 +39,11 @@
             <artifactId>progression-domain-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.moj.cpp.progression</groupId>
+            <artifactId>progression-datatypes-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>uk.gov.moj.cpp.material</groupId>
             <artifactId>material-client</artifactId>

progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessorTest.java

@@ -442,6 +442,33 @@ public void shouldHearingOffenceVerdictUpdated() {
 
     }
 
+    @Test
+    public void shouldHandlerHearingChangedToProbationCaseWorkerSendCorrectHearingDaysCommand() {
+        final UUID hearingId = randomUUID();
+        final JsonObject payload = createObjectBuilder()
+                .add("id", hearingId.toString())
+                .add("hearingDays", Json.createArrayBuilder()
+                        .add(createObjectBuilder()
+                                .add("sittingDay", "2020-10-13T10:00:00.000Z")
+                                .add("listedDurationMinutes", 60)
+                                .build())
+                        .build())
+                .build();
+        final JsonEnvelope jsonEnvelope = envelopeFrom(
+                metadataWithRandomUUID("public.events.listing.hearing-days-without-court-centre-corrected"),
+                payload);
+
+        eventProcessor.handlerHearingChangedToProbationCaseWorker(jsonEnvelope);
+
+        verify(sender, times(1)).send(senderJsonEnvelopeCaptor.capture());
+        final DefaultEnvelope sent = senderJsonEnvelopeCaptor.getValue();
+        assertThat(sent.metadata().name(), is("progression.command.correct-hearing-days-without-court-centre"));
+        assertThat(sent.payload().toString(), isJson(allOf(
+                withJsonPath("$.id", is(hearingId.toString())),
+                withJsonPath("$.hearingDays.length()", is(1)),
+                withJsonPath("$.hearingDays[0].listedDurationMinutes", is(60)))));
+    }
+
     @Test
     public void shouldUpdateDefendantOnApplicationHearing() {
         final UUID applicationId1 = randomUUID();

progression-event/progression-event-processor/src/yaml/json/schema/progression.events.hearing-days-without-court-centre-corrected.json

@@ -6,16 +6,16 @@
     "hearingDays": {
       "type": "array",
       "items": {
-        "$ref": "http://justice.gov.uk/core/courts/hearingDay.json"
+        "$ref": "http://moj.gov.uk/progression/hearingDay.json"
       }
     },
     "id": {
-      "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
     }
   },
   "required": [
     "id",
     "hearingDays"
   ],
   "additionalProperties": false
-}
+}

progression-event/progression-event-processor/src/yaml/json/schema/public.events.listing.hearing-days-without-court-centre-corrected.json

@@ -4,13 +4,13 @@
   "type": "object",
   "properties": {
     "id": {
-      "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
+      "$ref": "http://moj.gov.uk/cpp/progression/common/shared-definitions.json#/definitions/uuid"
     },
     "hearingDays": {
       "type": "array",
       "minItems": 1,
       "items": {
-        "$ref": "http://justice.gov.uk/core/courts/hearingDay.json"
+        "$ref": "http://moj.gov.uk/progression/hearingDay.json"
       }
     }
   },