PI-2673 - move test data creation back to data loader

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

@@ -73,7 +73,8 @@ class DataLoader(
     private val disabilityRepository: DisabilityRepository,
     private val offenceRepository: OffenceRepository,
     private val mainOffenceRepository: MainOffenceRepository,
-    private val teamOfficeLinkRepository: TeamOfficeLinkRepository
+    private val teamOfficeLinkRepository: TeamOfficeLinkRepository,
+    private val entityManagerDataLoader: EntityManagerDataLoader
 ) : ApplicationListener<ApplicationReadyEvent> {
 
     @PostConstruct
@@ -279,6 +280,8 @@ class DataLoader(
         )
 
         personRepository.save(PersonGenerator.FUZZY_SEARCH)
+        entityManagerDataLoader.loadData()
+        nsiManagerRepository.save(NsiGenerator.generateManager(entityManagerDataLoader.NSI_FUZZY_SEARCH!!))
 
         auditUserRepository.save(UserGenerator.LIMITED_ACCESS_USER)
         personRepository.saveAll(

projects/refer-and-monitor-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/EntityManagerDataLoader.kt

@@ -0,0 +1,23 @@
+package uk.gov.justice.digital.hmpps.data
+
+import jakarta.persistence.EntityManager
+import jakarta.persistence.PersistenceContext
+import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
+import uk.gov.justice.digital.hmpps.data.generator.NsiGenerator
+import uk.gov.justice.digital.hmpps.integrations.delius.referral.entity.Nsi
+
+@Component
+class EntityManagerDataLoader {
+
+    @PersistenceContext
+    private lateinit var entityManager: EntityManager
+
+    var NSI_FUZZY_SEARCH : Nsi? = null
+
+    @Transactional
+    fun loadData()  {
+        NSI_FUZZY_SEARCH = entityManager.merge(NsiGenerator.FUZZY_SEARCH)
+        entityManager.merge(NsiGenerator.TERMINATED)
+    }
+}

projects/refer-and-monitor-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ReferAndMonitorIntegrationTest.kt

@@ -24,7 +24,6 @@ import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.Contact
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactOutcome
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType
 import uk.gov.justice.digital.hmpps.integrations.delius.event.entity.EventRepository
-import uk.gov.justice.digital.hmpps.integrations.delius.referral.NsiManagerRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.referral.NsiRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.referral.NsiStatusHistoryRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.referral.entity.NsiStatus
@@ -66,9 +65,6 @@ internal class ReferAndMonitorIntegrationTest {
     @Autowired
     lateinit var eventRepository: EventRepository
 
-    @Autowired
-    lateinit var nsiManagerRepository: NsiManagerRepository
-
     @Test
     @Order(1)
     fun `session appointment feedback submitted failed to comply`() {
@@ -368,11 +364,6 @@ internal class ReferAndMonitorIntegrationTest {
 
     @Test
     fun `failure to find appointment is rejected with reason`() {
-        NsiGenerator.FUZZY_SEARCH = nsiRepository.save(NsiGenerator.FUZZY_SEARCH)
-        nsiManagerRepository.save(NsiGenerator.generateManager(NsiGenerator.FUZZY_SEARCH))
-
-        NsiGenerator.TERMINATED = nsiRepository.save(NsiGenerator.TERMINATED)
-
         val notification = prepNotification(
             notification("session-appointment-feedback-submitted-not-found"),
             wireMockServer.port()