Change Approved Premises Residency NSI Staff

This commit modifies the automatic opening and closure of the residency NSI to use the staff member who recorded the arrival/departure, instead of the associated keyworker
ministryofjustice · Dec 23, 2024 · 4ae4301 · 4ae4301
1 parent a357d88
commit 4ae4301
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 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
@@ -88,7 +88,7 @@ object EventDetailsGenerator {
             premises = premises(),
             arrivedAt = ZonedDateTime.now(),
             expectedDepartureOn = LocalDate.now().plusMonths(6),
-            keyWorker = staffMember(keyWorker),
+            recordedBy = staffMember(keyWorker),
             notes = "Arrived on time",
             applicationSubmittedOn = LocalDate.now().minusDays(1),
             eventNumber = "11"

diff --git a/...lius/src/dev/resources/simulations/__files/approved-premises-person-arrived-inactive.json b/...lius/src/dev/resources/simulations/__files/approved-premises-person-arrived-inactive.json
@@ -17,7 +17,7 @@
       "apCode": "NEHOPE1",
       "legacyApCode": "Q001"
     },
-    "keyWorker": {
+    "recordedBy": {
       "staffCode": "N54A001",
       "forenames": "John",
       "surname": "Smith",

diff --git a/...es-and-delius/src/dev/resources/simulations/__files/approved-premises-person-arrived.json b/...es-and-delius/src/dev/resources/simulations/__files/approved-premises-person-arrived.json
@@ -17,7 +17,7 @@
       "apCode": "NEHOPE1",
       "legacyApCode": "Q001"
     },
-    "keyWorker": {
+    "recordedBy": {
       "staffCode": "N54A001",
       "forenames": "John",
       "surname": "Smith",

diff --git a/...ius/src/dev/resources/simulations/__files/approved-premises-person-departed-inactive.json b/...ius/src/dev/resources/simulations/__files/approved-premises-person-departed-inactive.json
@@ -37,7 +37,7 @@
         "code": "XYZ456"
       }
     },
-    "keyWorker": {
+    "recordedBy": {
       "staffCode": "N54A001",
       "staffIdentifier": 1501234567,
       "forenames": "John",

diff --git a/...s-and-delius/src/dev/resources/simulations/__files/approved-premises-person-departed.json b/...s-and-delius/src/dev/resources/simulations/__files/approved-premises-person-departed.json
@@ -37,7 +37,7 @@
         "code": "XYZ456"
       }
     },
-    "keyWorker": {
+    "recordedBy": {
       "staffCode": "N54A001",
       "staffIdentifier": 1501234567,
       "forenames": "John",

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
@@ -167,7 +167,7 @@ data class PersonArrived(
     val applicationId: String,
     val applicationUrl: String,
     val premises: Premises,
-    val keyWorker: StaffMember,
+    val recordedBy: StaffMember,
     val applicationSubmittedOn: LocalDate,
     val arrivedAt: ZonedDateTime,
     val expectedDepartureOn: LocalDate?,
@@ -180,7 +180,7 @@ data class PersonDeparted(
     val applicationId: String,
     val applicationUrl: String,
     val bookingId: String,
-    val keyWorker: StaffMember,
+    val recordedBy: StaffMember,
     val departedAt: ZonedDateTime,
     val premises: Premises,
     val legacyReasonCode: String,

diff --git a/...ed-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/NsiService.kt b/...ed-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/NsiService.kt
@@ -42,7 +42,7 @@ class NsiService(
     ): Pair<PersonAddress?, PersonAddress>? {
         val externalReference = EXT_REF_BOOKING_PREFIX + details.bookingId
         nsiRepository.findByPersonIdAndExternalReference(person.id, externalReference) ?: run {
-            val staff = staffRepository.getByCode(details.keyWorker.staffCode)
+            val staff = staffRepository.getByCode(details.recordedBy.staffCode)
             val nsi = nsiRepository.save(
                 Nsi(
                     person = person,
@@ -111,7 +111,7 @@ class NsiService(
             person = person,
             eventId = eventRepository.getEvent(person.id, details.eventNumber).id,
             team = teamRepository.getApprovedPremisesTeam(details.premises.legacyApCode),
-            staff = staffRepository.getByCode(details.keyWorker.staffCode),
+            staff = staffRepository.getByCode(details.recordedBy.staffCode),
             probationAreaCode = ap.probationArea.code
         )
         referralService.personDeparted(person, details)

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
@@ -186,7 +186,7 @@ class ReferralService(
     fun personArrived(person: Person, ap: ApprovedPremises, details: PersonArrived) {
         val referral = getReferral(person, EXT_REF_BOOKING_PREFIX + details.bookingId)
         referral.admissionDate = details.arrivedAt.toLocalDate()
-        val kw = staffRepository.getByCode(details.keyWorker.staffCode)
+        val kw = staffRepository.getByCode(details.recordedBy.staffCode)
         residenceRepository.save(details.residence(person, ap, referral, kw))
     }