Merge pull request #2849 from ministryofjustice/APS-1825-booking-made…

…-domain-event-change APS-1825. Added characteristics to booking made domain event and schema version 2.
ministryofjustice · Jan 22, 2025 · d7c4e49 · d7c4e49
2 parents d1bdbd4 + 8bcc473
commit d7c4e49
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/...n/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/DomainEventEntity.kt b/...n/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/DomainEventEntity.kt
@@ -207,6 +207,10 @@ enum class DomainEventType(
     Cas1EventType.bookingMade.value,
     "An Approved Premises booking has been made",
     TimelineEventType.approvedPremisesBookingMade,
+    schemaVersions = listOf(
+      DEFAULT_DOMAIN_EVENT_SCHEMA_VERSION,
+      DomainEventSchemaVersion(2, "Added characteristics field"),
+    ),
   ),
   APPROVED_PREMISES_PERSON_ARRIVED(
     DomainEventCas.CAS1,

diff --git a/...v/justice/digital/hmpps/approvedpremisesapi/service/cas1/Cas1BookingDomainEventService.kt b/...v/justice/digital/hmpps/approvedpremisesapi/service/cas1/Cas1BookingDomainEventService.kt
@@ -345,6 +345,7 @@ class Cas1BookingDomainEventService(
         } else {
           null
         },
+        schemaVersion = 2,
         data = BookingMadeEnvelope(
           id = domainEventId,
           timestamp = bookingCreatedAt.toInstant(),
@@ -378,6 +379,7 @@ class Cas1BookingDomainEventService(
             releaseType = releaseType,
             sentenceType = sentenceType,
             situation = situation,
+            characteristics = bookingInfo.characteristics,
           ),
         ),
         metadata = mapOfNonNullValues(
@@ -485,6 +487,7 @@ class Cas1BookingDomainEventService(
     val arrivalDate: LocalDate,
     val departureDate: LocalDate,
     val isSpaceBooking: Boolean,
+    val characteristics: List<Cas1SpaceCharacteristic>? = null,
   )
 
   private fun BookingEntity.toBookingInfo() = BookingInfo(
@@ -505,6 +508,7 @@ class Cas1BookingDomainEventService(
     arrivalDate = canonicalArrivalDate,
     departureDate = canonicalDepartureDate,
     isSpaceBooking = true,
+    characteristics = criteria.toCas1SpaceCharacteristics(),
   )
 
   private data class CancellationInfo(

diff --git a/src/main/resources/static/domain-events-api.yml b/src/main/resources/static/domain-events-api.yml
@@ -1228,6 +1228,10 @@ components:
           type: string
         situation:
           type: string
+        characteristics:
+          type: array
+          items:
+            $ref: '#/components/schemas/Cas1SpaceCharacteristic'
       required:
         - applicationId
         - applicationUrl

diff --git a/...ital/hmpps/approvedpremisesapi/unit/service/cas1/Cas1BookingCas1DomainEventServiceTest.kt b/...ital/hmpps/approvedpremisesapi/unit/service/cas1/Cas1BookingCas1DomainEventServiceTest.kt
@@ -97,6 +97,7 @@ class Cas1BookingCas1DomainEventServiceTest {
       .withCanonicalDepartureDate(LocalDate.of(2025, 12, 12))
       .withPremises(premises)
       .withCreatedAt(createdAt)
+      .withCriteria(CharacteristicEntityFactory().withModelScope("room").withPropertyName("hasEnSuite").produce())
       .produce()
 
     val placementRequest = PlacementRequestEntityFactory()
@@ -150,6 +151,7 @@ class Cas1BookingCas1DomainEventServiceTest {
       assertThat(domainEvent.occurredAt).isEqualTo(createdAt.toInstant())
       assertThat(domainEvent.data.eventType).isEqualTo(EventType.bookingMade)
       assertThat(domainEvent.data.timestamp).isEqualTo(createdAt.toInstant())
+      assertThat(domainEvent.schemaVersion).isEqualTo(2)
 
       val data = domainEvent.data.eventDetails
       assertThat(data.createdAt).isEqualTo(createdAt.toInstant())
@@ -170,6 +172,7 @@ class Cas1BookingCas1DomainEventServiceTest {
       assertThat(data.releaseType).isEqualTo(application.releaseType)
       assertThat(data.sentenceType).isEqualTo(application.sentenceType)
       assertThat(data.situation).isEqualTo(application.situation)
+      assertThat(data.characteristics).isEqualTo(listOf(Cas1SpaceCharacteristic.hasEnSuite))
 
       assertThat(domainEvent.metadata).isEqualTo(mapOf(MetaDataName.CAS1_PLACEMENT_REQUEST_ID to placementRequest.id.toString()))
     }
@@ -286,6 +289,7 @@ class Cas1BookingCas1DomainEventServiceTest {
       assertThat(data.releaseType).isEqualTo(application.releaseType)
       assertThat(data.sentenceType).isEqualTo(application.sentenceType)
       assertThat(data.situation).isEqualTo(application.situation)
+      assertThat(data.characteristics).isNull()
 
       assertThat(domainEvent.metadata).isEqualTo(mapOf(MetaDataName.CAS1_PLACEMENT_REQUEST_ID to placementRequest.id.toString()))
     }