PI-1690 use submitted date for referral date (#2755)

* PI-1690 use submitted date for referral date * PI-1690 allow submitted at to be nullable for when not provided - ie booking made without application
ministryofjustice · Nov 28, 2023 · 50d1a3b · 50d1a3b
1 parent 6f9dca0
commit 50d1a3b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/...elius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/EventDetailsGenerator.kt b/...elius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/EventDetailsGenerator.kt
@@ -60,7 +60,8 @@ object EventDetailsGenerator {
             bookedBy = bookedBy,
             eventNumber = "23",
             arrivalOn = LocalDate.now(),
-            departureOn = LocalDate.now()
+            departureOn = LocalDate.now(),
+            submittedAt = ZonedDateTime.now().minusDays(2)
         )
     )
 

diff --git a/...ises-and-delius/src/dev/resources/simulations/__files/approved-premises-booking-made.json b/...ises-and-delius/src/dev/resources/simulations/__files/approved-premises-booking-made.json
@@ -38,6 +38,7 @@
       "forenames": "Key",
       "surname": "Worker",
       "username": "KeyWorkerNPS"
-    }
+    },
+    "submittedAt": "2022-11-28T14:51:30"
   }
 }
diff --git a/...elius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationTest.kt b/...elius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationTest.kt
@@ -161,9 +161,10 @@ internal class MessagingIntegrationTest {
         assertThat(contact.eventId, equalTo(PersonGenerator.EVENT.id))
 
         val referrals = referralRepository.findAll()
-            .filter { it.personId == contact.person.id && it.createdByUserId == UserGenerator.AUDIT_USER.id && it.referralDate == contact.date }
+            .filter { it.personId == contact.person.id && it.createdByUserId == UserGenerator.AUDIT_USER.id && it.eventId == contact.eventId }
         assertThat(referrals.size, equalTo(1))
         val referral = referrals.first()
+        assertThat(referral.referralDate, equalTo(LocalDate.parse("2022-11-28")))
         assertThat(referral.activeArsonRiskId, equalTo(ReferenceDataGenerator.YN_UNKNOWN.id))
         assertThat(referral.disabilityIssuesId, equalTo(ReferenceDataGenerator.YN_UNKNOWN.id))
         assertThat(referral.singleRoomId, equalTo(ReferenceDataGenerator.YN_UNKNOWN.id))

diff --git a/...rc/main/kotlin/uk/gov/justice/digital/hmpps/integrations/approvedpremises/EventDetails.kt b/...rc/main/kotlin/uk/gov/justice/digital/hmpps/integrations/approvedpremises/EventDetails.kt
@@ -99,7 +99,8 @@ data class BookingMade(
     val bookedBy: BookedBy,
     val premises: Premises,
     val arrivalOn: LocalDate,
-    val departureOn: LocalDate
+    val departureOn: LocalDate,
+    val submittedAt: ZonedDateTime?
 ) {
     val bookingMadeAt: ZonedDateTime = createdAt.truncatedTo(ChronoUnit.SECONDS)
 }

diff --git a/...emises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt b/...emises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt
@@ -230,7 +230,7 @@ class ReferralService(
             personId = person.id,
             eventId = event.id,
             approvedPremisesId = ap.id,
-            referralDate = bookingMadeAt.toLocalDate(),
+            referralDate = submittedAt?.toLocalDate() ?: bookingMadeAt.toLocalDate(),
             referralDateTypeId = checkNotNull(
                 referenceDataRepository.findByCodeAndDatasetCode(
                     "CRC",