PI-2726 Mark previous reviews as complete + update notes (#4549)

Author: marcus-bcl

projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt

@@ -121,7 +121,9 @@ class DataLoader(
             val contact = entityManager.merge(ContactGenerator.generateContact(this, type.registrationContactType!!))
             val registration =
                 RegistrationGenerator.generate(this.id, LocalDate.parse("2023-06-14"), contact, type, level)
-            val reviewContact = entityManager.merge(ContactGenerator.generateContact(this, type.reviewContactType!!))
+            val reviewContact = entityManager.merge(
+                ContactGenerator.generateContact(this, type.reviewContactType!!).withNotes("existing notes")
+            )
             saveAll(this, registration.withReview(reviewContact))
         }
         return this

projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt

@@ -23,6 +23,7 @@ import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator
 import uk.gov.justice.digital.hmpps.data.generator.ReferenceDataGenerator
 import uk.gov.justice.digital.hmpps.data.generator.RegistrationGenerator
 import uk.gov.justice.digital.hmpps.datetime.DeliusDateFormatter
+import uk.gov.justice.digital.hmpps.datetime.toDeliusDate
 import uk.gov.justice.digital.hmpps.enum.RiskLevel
 import uk.gov.justice.digital.hmpps.enum.RiskOfSeriousHarmType
 import uk.gov.justice.digital.hmpps.enum.RiskType
@@ -343,7 +344,6 @@ internal class IntegrationTest {
         assertThat(
             review.contact.notes?.trim(), equalTo(
                 """
-                    The OASys assessment of Review on 07/12/2023 identified the Risk to children to be H.
                     Type: Safeguarding - Risk to children
                     Next Review Date: ${DeliusDateFormatter.format(LocalDate.now().plusMonths(6))}
                 """.trimIndent()
@@ -361,6 +361,7 @@ internal class IntegrationTest {
             registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.CHILDREN.code).single()
         assertThat(riskToChildrenBefore.level?.code, equalTo(RiskLevel.H.code))
         assertThat(riskToChildrenBefore.reviews, hasSize(1))
+        assertThat(riskToChildrenBefore.reviews[0].completed, equalTo(false))
         val riskToPrisonerBefore = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.PRISONER.code)
         assertThat(riskToPrisonerBefore, hasSize(0))
         val altRiskToPrisonerBefore =
@@ -382,18 +383,41 @@ internal class IntegrationTest {
 
         val domainEvents = domainEventRepository.findAllForCrn(PersonGenerator.EXISTING_RISKS.crn)
 
-        // Unchanged value from OASys - adds a review
+        // Unchanged value from OASys - completes existing review and adds a new review
         val riskToChildren =
             registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.CHILDREN.code).single()
         assertThat(riskToChildren.level?.code, equalTo(RiskLevel.H.code))
         assertThat(riskToChildren.reviews, hasSize(2))
-        val expectedReviewNotes = """
+        assertThat(riskToChildren.nextReviewDate, equalTo(LocalDate.now().plusMonths(6)))
+        val completedReview = riskToChildren.reviews.single { it.completed }
+        assertThat(completedReview.date, equalTo(LocalDate.now()))
+        assertThat(completedReview.reviewDue, equalTo(LocalDate.now().plusMonths(6)))
+        """
+            existing notes
+            The OASys assessment of Review on 07/12/2023 identified the Risk to children to be H.
+
+            *R10.1 Who is at risk*
+            Known adults - Joe Bloggs
+
+            *R10.2 What is the nature of the risk*
+            Physical harm - Physical assault, shown willingness to use a weapon
+        """.trimIndent().let { assertThat(completedReview.notes?.trim(), equalTo(it)) }
+        """
+            existing notes
             The OASys assessment of Review on 07/12/2023 identified the Risk to children to be H.
+
+            See review for more details
+        """.trimIndent().let { assertThat(completedReview.contact.notes?.trim(), equalTo(it)) }
+        val newReview = riskToChildren.reviews.single { !it.completed }
+        assertThat(newReview.date, equalTo(LocalDate.now().plusMonths(6)))
+        assertThat(newReview.reviewDue, nullValue())
+        """
             Type: Safeguarding - Risk to children
-            Next Review Date: 14/12/2023
-        """.trimIndent()
-        assertThat(riskToChildren.reviews[1].notes?.trim(), equalTo(expectedReviewNotes))
-        assertThat(riskToChildren.reviews[1].contact.notes?.trim(), equalTo(expectedReviewNotes))
+            Next Review Date: ${LocalDate.now().plusMonths(6).toDeliusDate()}
+        """.trimIndent().let {
+            assertThat(newReview.notes?.trim(), equalTo(it))
+            assertThat(newReview.contact.notes?.trim(), equalTo(it))
+        }
         assertThat(domainEvents.ofType(RiskType.CHILDREN), hasSize(0))
 
         // No existing registration - add new
@@ -423,10 +447,21 @@ internal class IntegrationTest {
         val riskToPublic = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.PUBLIC.code).single()
         assertThat(riskToPublic.level?.code, equalTo(RiskLevel.V.code))
         assertThat(riskToPublic.reviews, hasSize(1))
-        assertThat(
-            riskToPublic.notes,
-            startsWith("The OASys assessment of Review on 07/12/2023 identified the Risk to public to have increased to V.")
-        )
+        """
+            The OASys assessment of Review on 07/12/2023 identified the Risk to public to have increased to V.
+
+            *R10.1 Who is at risk*
+            Known adults - Joe Bloggs
+
+            *R10.2 What is the nature of the risk*
+            Physical harm - Physical assault, shown willingness to use a weapon
+        """.trimIndent().let { assertThat(riskToPublic.notes, equalTo(it)) }
+        """
+            
+            The OASys assessment of Review on 07/12/2023 identified the Risk to public to have increased to V.
+
+            See Register for more details
+        """.trimIndent().let { assertThat(riskToPublic.contact.notes, equalTo(it)) }
         assertThat(domainEvents.ofType(RiskType.PUBLIC), hasSize(2))
         assertThat(
             domainEvents.ofType(RiskType.PUBLIC).map { it.eventType },

projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/entity/Registration.kt

@@ -77,16 +77,16 @@ class Registration(
     var reviews: MutableList<RegistrationReview> = mutableListOf()
         private set
 
-    fun withReview(contact: Contact): Registration {
-        reviews += RegistrationReview(personId, this, contact, nextReviewDate, null, teamId, staffId, contact.notes)
+    fun withReview(contact: Contact, notes: String? = contact.notes): Registration {
+        reviews += RegistrationReview(personId, this, contact, nextReviewDate, null, teamId, staffId, notes)
         return this
     }
 
     fun deregister(contact: Contact) {
         deregistration = DeRegistration(LocalDate.now(), this, personId, contact, contact.teamId, contact.staffId)
         deregistered = true
         nextReviewDate = null
-        reviews.removeIf { !it.completed && it.notes == null }
+        reviews.removeIf { !it.completed && it.lastUpdatedDatetime == it.createdDatetime }
         reviews.firstOrNull()?.reviewDue = null
     }
 }
@@ -159,7 +159,7 @@ class RegistrationReview(
     val contact: Contact,
 
     @Column(name = "review_date")
-    val date: LocalDate?,
+    var date: LocalDate?,
 
     @Column(name = "review_date_due")
     var reviewDue: LocalDate?,
@@ -171,10 +171,10 @@ class RegistrationReview(
     val staffId: Long,
 
     @Lob
-    val notes: String? = null,
+    var notes: String? = null,
 
     @Convert(converter = YesNoConverter::class)
-    val completed: Boolean = false,
+    var completed: Boolean = false,
 
     @Column(columnDefinition = "number")
     @Convert(converter = NumericBooleanConverter::class)

projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt

@@ -76,21 +76,24 @@ class RiskService(
             val (matchingRegistrations, registrationsToRemove) = registrations.partition { it.level!!.code == riskLevel.code }
             val events = registrationsToRemove.map { person.removeRegistration(it) }.toMutableList()
 
-            // Add registration with the identified level if it doesn't already exist
+            // Get RoSH answers from OASys
             val type = registerTypeRepository.getByCode(riskType.code)
             val existingLevel = RiskLevel.maxByCode(registrationsToRemove.mapNotNull { it.level?.code })
             val assessmentNote = "The OASys assessment of ${summary.furtherInformation.pOAssessmentDesc} on " +
                 "${summary.dateCompleted.toDeliusDate()} identified the ${type.description} " +
                 "${existingLevel.increasedOrDecreasedTo(riskLevel)} ${level.description}."
-
-            if (matchingRegistrations.isEmpty()) {
-                val roshSummary = ordsClient.getRoshSummary(summary.assessmentPk)?.assessments?.singleOrNull()
-                val notes = """
+            val roshSummary = ordsClient.getRoshSummary(summary.assessmentPk)?.assessments?.singleOrNull()
+            val roshNotes = """
                     |$assessmentNote
                     |${roshSummary?.whoAtRisk?.let { "\n|*R10.1 Who is at risk*\n|$it" }}
                     |${roshSummary?.natureOfRisk?.let { "\n|*R10.2 What is the nature of the risk*\n|$it" }}
                     """.trimMargin()
-                events += registrations.addRegistration(person, type, level, notes).regEvent(person.crn)
+
+            // Add registration with the identified level if it doesn't already exist
+            if (matchingRegistrations.isEmpty()) {
+                val contactNotes = "$assessmentNote\n\nSee Register for more details"
+                events += registrations.addRegistration(person, type, level, roshNotes, contactNotes)
+                    .regEvent(person.crn)
 
                 // Registrations in the type's duplicate group should also be removed
                 registerTypeRepository.findOtherTypesInGroup(riskType.code)
@@ -102,9 +105,17 @@ class RiskService(
                     }
             }
 
-            // Always add a review, regardless of whether the register level has changed
+            // Complete any open reviews and add a new one, regardless of whether the level has changed
             registrationRepository.findByPersonIdAndTypeCode(person.id, riskType.code).singleOrNull()?.let {
-                it.withReview(it.reviewContact(person, "$assessmentNote\n${it.notes()}"))
+                it.nextReviewDate = it.type.reviewPeriod?.let { LocalDate.now().plusMonths(it) }
+                it.reviews.filter { !it.completed }.forEach { review ->
+                    review.completed = true
+                    review.date = LocalDate.now()
+                    review.reviewDue = it.nextReviewDate
+                    review.notes = review.notes?.let { "$it\n$roshNotes" } ?: roshNotes
+                    review.contact.withNotes("$assessmentNote\n\nSee review for more details")
+                }
+                it.withReview(it.reviewContact(person))
             }
 
             return@flatMap events
@@ -116,13 +127,14 @@ class RiskService(
         type: RegisterType,
         level: ReferenceData? = null,
         notes: String? = null,
+        contactNotes: String? = null,
     ): Registration {
         val nextReviewDate = type.reviewPeriod?.let { LocalDate.now().plusMonths(it) }
 
         val contact = contactService.createContact(
             ContactDetail(
                 ContactType.Code.REGISTRATION,
-                notes = reviewNotes(type, nextReviewDate),
+                notes = contactNotes ?: reviewNotes(type, nextReviewDate),
                 contactType = type.registrationContactType
             ),
             person
@@ -146,7 +158,7 @@ class RiskService(
 
     private fun Person.removeRegistration(
         registration: Registration,
-        notes: String = registration.notes()
+        notes: String = registration.type.notes()
     ): HmppsDomainEvent {
         val contact = contactService.createContact(ContactDetail(DEREGISTRATION, notes = notes), this)
         registration.deregister(contact)
@@ -163,8 +175,10 @@ class RiskService(
     )
 }
 
+fun RegisterType.notes() = "Type: ${flag.description} - $description"
+
 fun reviewNotes(type: RegisterType, nextReviewDate: LocalDate?) = listOfNotNull(
-    "Type: ${type.flag.description} - ${type.description}",
+    type.notes(),
     nextReviewDate?.let { "Next Review Date: ${it.toDeliusDate()}" }
 ).joinToString(System.lineSeparator())