PI-1197 check for accredited programme requirements before updating i…

…aps (#1925)

projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateEventIntegrationTest.kt

@@ -14,7 +14,6 @@ import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.data.repository.findByIdOrNull
 import uk.gov.justice.digital.hmpps.data.generator.EventGenerator
 import uk.gov.justice.digital.hmpps.data.generator.OrderManagerGenerator
-import uk.gov.justice.digital.hmpps.data.repository.IapsEventRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.ContactRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.ContactTypeCode
 import uk.gov.justice.digital.hmpps.integrations.delius.event.Event
@@ -42,9 +41,6 @@ class AllocateEventIntegrationTest {
     @Autowired
     private lateinit var orderManagerRepository: OrderManagerRepository
 
-    @Autowired
-    private lateinit var iapsEventRepository: IapsEventRepository
-
     @MockBean
     private lateinit var telemetryService: TelemetryService
 
@@ -113,8 +109,6 @@ class AllocateEventIntegrationTest {
         val updatedOmCount = orderManagerRepository.findAll().count { it.eventId == event.id }
         assertThat(updatedOmCount, equalTo(originalOmCount + 1))
 
-        assert(iapsEventRepository.findById(event.id).isPresent)
-
         val cadeContact = contactRepository.findAll()
             .firstOrNull { it.eventId == oldOm.eventId && it.type.code == ContactTypeCode.CASE_ALLOCATION_DECISION_EVIDENCE.value }
 

projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocatePersonIntegrationTest.kt

@@ -13,7 +13,6 @@ import org.springframework.data.repository.findByIdOrNull
 import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator
 import uk.gov.justice.digital.hmpps.data.generator.PersonManagerGenerator
 import uk.gov.justice.digital.hmpps.data.generator.ResponsibleOfficerGenerator
-import uk.gov.justice.digital.hmpps.data.repository.IapsPersonRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.person.Person
 import uk.gov.justice.digital.hmpps.integrations.delius.person.PersonManager
 import uk.gov.justice.digital.hmpps.integrations.delius.person.PersonManagerRepository
@@ -44,9 +43,6 @@ class AllocatePersonIntegrationTest {
     @Autowired
     private lateinit var responsibleOfficerRepository: ResponsibleOfficerRepository
 
-    @Autowired
-    private lateinit var iapsPersonRepository: IapsPersonRepository
-
     @MockBean
     private lateinit var telemetryService: TelemetryService
 
@@ -143,7 +139,5 @@ class AllocatePersonIntegrationTest {
 
         val updatedRoCount = responsibleOfficerRepository.findAll().count { it.personId == person.id }
         assertThat(updatedRoCount, equalTo(originalRoCount + 1))
-
-        assert(iapsPersonRepository.findById(person.id).isPresent)
     }
 }

projects/workforce-allocations-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/event/EventRepository.kt

@@ -42,6 +42,19 @@ interface EventRepository : JpaRepository<Event, Long> {
         """
     )
     fun findAllOffencesByEventId(eventId: Long): List<Offence>
+
+    @Query(
+        """
+        select count(r) 
+        from Requirement r
+        where r.disposal.event.id = :eventId
+        and (r.mainCategory.code = 'RM38'
+            or (r.mainCategory.code = '7' and (r.subCategory.code is null or r.subCategory.code <> 'RS66'))
+            or (r.additionalMainCategory.code in ('RM38', '7'))
+        )
+    """
+    )
+    fun countAccreditedProgrammeRequirements(eventId: Long): Int
 }
 
 fun EventRepository.getByPersonCrnAndNumber(crn: String, number: String) = findByPersonCrnAndNumber(crn, number)

projects/workforce-allocations-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/PersonRepository.kt

@@ -102,6 +102,19 @@ interface PersonRepository : JpaRepository<Person, Long> {
         sentenceEndDateKeyDateTypeCode: String = "SED",
         custodialStatusCodes: List<String> = listOf("A", "C", "D", "R", "I", "AT")
     ): CaseType?
+
+    @Query(
+        """
+        select count(r) 
+        from Requirement r
+        where r.person.id = :personId
+        and (r.mainCategory.code = 'RM38'
+            or (r.mainCategory.code = '7' and (r.subCategory.code is null or r.subCategory.code <> 'RS66'))
+            or (r.additionalMainCategory.code in ('RM38', '7'))
+        )
+    """
+    )
+    fun countAccreditedProgrammeRequirements(personId: Long): Int
 }
 
 fun PersonRepository.getCaseType(crn: String) = findCaseType(crn) ?: CaseType.UNKNOWN

projects/workforce-allocations-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AllocateEventService.kt

@@ -89,7 +89,9 @@ class AllocateEventService(
 
             createCadeContact(allocationDetail, event, newOrderManager)
 
-            eventRepository.updateIaps(event.id)
+            if (event.hasAccreditedProgrammeRequirement()) {
+                eventRepository.updateIaps(event.id)
+            }
         }
 
     fun createCadeContact(allocationDetail: EventAllocationDetail, event: Event, orderManager: OrderManager) {
@@ -108,4 +110,7 @@ class AllocateEventService(
             )
         )
     }
+
+    fun Event.hasAccreditedProgrammeRequirement(): Boolean =
+        eventRepository.countAccreditedProgrammeRequirements(id) > 0
 }

projects/workforce-allocations-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AllocatePersonService.kt

@@ -80,7 +80,9 @@ class AllocatePersonService(
                 )
             )
 
-            personRepository.updateIaps(personId)
+            if (personRepository.countAccreditedProgrammeRequirements(personId) > 0) {
+                personRepository.updateIaps(personId)
+            }
         }
 
     private fun updateResponsibleOfficer(