Add Bed ID to CAS1 Out of Service Bed Summary

ministryofjustice · Jan 22, 2025 · 9f0af64 · 9f0af64
1 parent 4f97d55
commit 9f0af64
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/...lin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/Cas1SpaceBookingEntity.kt b/...lin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/Cas1SpaceBookingEntity.kt
@@ -141,12 +141,7 @@ interface Cas1SpaceBookingRepository : JpaRepository<Cas1SpaceBookingEntity, UUI
         ELSE
             oa.name
       END as personName,
-      CASE
-        WHEN 
-            apa.id IS NOT NULL THEN apa.release_type
-        ELSE
-            null
-      END as releaseType, 
+      apa.release_type as releaseType, 
       ( 
         SELECT STRING_AGG (characteristics.property_name, ',')
         FROM cas1_space_bookings_criteria sbc

diff --git a/...gital/hmpps/approvedpremisesapi/transformer/cas1/Cas1OutOfServiceBedSummaryTransformer.kt b/...gital/hmpps/approvedpremisesapi/transformer/cas1/Cas1OutOfServiceBedSummaryTransformer.kt
@@ -13,6 +13,7 @@ class Cas1OutOfServiceBedSummaryTransformer(
 
   fun toCas1OutOfServiceBedSummary(jpa: Cas1OutOfServiceBedEntity) = Cas1OutOfServiceBedSummary(
     id = jpa.id,
+    bedId = jpa.bed.id,
     roomName = jpa.bed.room.name,
     startDate = jpa.startDate,
     endDate = jpa.endDate,

diff --git a/src/main/resources/static/cas1-schemas.yml b/src/main/resources/static/cas1-schemas.yml
@@ -835,6 +835,9 @@ components:
         id:
           type: string
           format: uuid
+        bedId:
+          type: string
+          format: uuid
         roomName:
           type: string
         startDate:
@@ -851,6 +854,7 @@ components:
             $ref: '#/components/schemas/Cas1SpaceCharacteristic'
       required:
         - id
+        - bedId
         - startDate
         - endDate
         - reason

diff --git a/src/main/resources/static/codegen/built-cas1-api-spec.yml b/src/main/resources/static/codegen/built-cas1-api-spec.yml
@@ -6923,6 +6923,9 @@ components:
         id:
           type: string
           format: uuid
+        bedId:
+          type: string
+          format: uuid
         roomName:
           type: string
         startDate:
@@ -6939,6 +6942,7 @@ components:
             $ref: '#/components/schemas/Cas1SpaceCharacteristic'
       required:
         - id
+        - bedId
         - startDate
         - endDate
         - reason

diff --git a/...ps/approvedpremisesapi/unit/transformer/cas1/Cas1OutOfServiceBedSummaryTransformerTest.kt b/...ps/approvedpremisesapi/unit/transformer/cas1/Cas1OutOfServiceBedSummaryTransformerTest.kt
@@ -74,6 +74,7 @@ class Cas1OutOfServiceBedSummaryTransformerTest {
     val result = transformer.toCas1OutOfServiceBedSummary(outOfServiceBed)
 
     assertThat(result.id).isEqualTo(outOfServiceBed.id)
+    assertThat(result.bedId).isEqualTo(bed.id)
     assertThat(result.roomName).isEqualTo(bed.room.name)
     assertThat(result.startDate).isEqualTo(outOfServiceBed.startDate)
     assertThat(result.endDate).isEqualTo(outOfServiceBed.endDate)

diff --git a/...digital/hmpps/approvedpremisesapi/unit/transformer/cas1/Cas1PremisesDayTransformerTest.kt b/...digital/hmpps/approvedpremisesapi/unit/transformer/cas1/Cas1PremisesDayTransformerTest.kt
@@ -62,6 +62,7 @@ class Cas1PremisesDayTransformerTest {
     val outOfServiceBeds = listOf(
       Cas1OutOfServiceBedSummary(
         id = UUID.randomUUID(),
+        bedId = UUID.randomUUID(),
         startDate = LocalDate.now().minusDays(5),
         endDate = LocalDate.now().plusDays(5),
         reason = Cas1OutOfServiceBedReason(UUID.randomUUID(), "reason", true),