PI-2063: Fixed order of sentences and added rarActivity flag (#3609)

ministryofjustice · Apr 10, 2024 · 7397e34 · 7397e34
1 parent 1fafc16
commit 7397e34
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/...lius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ComplianceIntegrationTest.kt b/...lius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ComplianceIntegrationTest.kt
@@ -43,7 +43,7 @@ internal class ComplianceIntegrationTest {
         assertThat(res.currentSentences[0].activity.compliedAppointmentsCount, equalTo(2))
         assertThat(res.currentSentences[0].activity.outcomeNotRecordedCount, equalTo(3))
         assertThat(res.currentSentences[0].activity.acceptableAbsenceCount, equalTo(1))
-        assertThat(res.previousOrders.orders[0].status, equalTo(TERMINATION_REASON.description))
+        assertThat(res.previousOrders.orders[1].status, equalTo(TERMINATION_REASON.description))
     }
 
     @Test

diff --git a/...on-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/activity/Activity.kt b/...on-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/activity/Activity.kt
@@ -42,6 +42,7 @@ data class Activity(
     val isEmailOrTextToPop: Boolean? = false,
     val isPhoneCallToPop: Boolean? = false,
     val isPastAppointment: Boolean = (isAppointment && ZonedDateTime.now() > startDateTime),
+    val countsTowardsRAR: Boolean?,
     val lastUpdated: ZonedDateTime,
     val lastUpdatedBy: Name
 )
diff --git a/...c/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/Contact.kt b/...c/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/Contact.kt
@@ -246,7 +246,7 @@ interface ContactRepository : JpaRepository<Contact, Long> {
             and (to_char(c.contact_date, 'YYYY-MM-DD') < :dateNow
             or (to_char(c.contact_date, 'YYYY-MM-DD') = :dateNow and to_char(c.contact_start_time, 'HH24:MI') < :timeNow))
             and c.soft_deleted = 0
-            order by c.contact_date, c.contact_start_time asc
+            order by c.contact_date, c.contact_start_time desc
         """,
         nativeQuery = true
     )

diff --git a/...src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/Event.kt b/...src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/Event.kt
@@ -63,7 +63,8 @@ interface EventRepository : JpaRepository<Event, Long> {
             "LEFT JOIN FETCH e.additionalOffences ao " +
             "LEFT JOIN FETCH m.offence mo " +
             "LEFT JOIN FETCH ao.offence aoo " +
-            "WHERE e.personId = :personId"
+            "WHERE e.personId = :personId " +
+            "ORDER BY e.eventNumber DESC"
     )
     fun findByPersonId(personId: Long): List<Event>
 }

diff --git a/...vision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ScheduleService.kt b/...vision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ScheduleService.kt
@@ -83,6 +83,7 @@ fun Contact.toActivity() = Activity(
     officerName = staff?.forename?.let { Name(forename = it, surname = staff.surname) },
     rarCategory = requirement?.mainCategory?.description,
     rarToolKit = requirement?.mainCategory?.description,
+    countsTowardsRAR = rarActivity,
     rescheduled = rescheduledPop(),
     rescheduledStaff = rescheduledPop() || rescheduledStaff(),
     rescheduledPop = rescheduledPop(),