PI-2521: Handle soft deleted records the same as community api

ministryofjustice · Sep 16, 2024 · b6a8f00 · b6a8f00
1 parent de3de53
commit b6a8f00
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 2 deletions.
diff --git a/...ects/court-case-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt b/...ects/court-case-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt
@@ -103,6 +103,7 @@ class DataLoader(
             CourtGenerator.PROBATION_AREA,
             CourtGenerator.BHAM,
             PersonGenerator.NEW_TO_PROBATION,
+            PersonGenerator.SOFT_DELETED,
             PersonGenerator.CURRENTLY_MANAGED,
             PersonGenerator.PREVIOUSLY_MANAGED,
             PersonGenerator.NO_SENTENCE,

diff --git a/...-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PersonGenerator.kt b/...-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PersonGenerator.kt
@@ -29,6 +29,7 @@ import java.time.ZonedDateTime
 object PersonGenerator {
 
     val NEW_TO_PROBATION = generate("N123456")
+    val SOFT_DELETED = generate("S123456", softDeleted = true)
     val CURRENTLY_MANAGED = generate("C123456", currentDisposal = true)
     val PREVIOUSLY_MANAGED = generate("P123456")
     val NO_SENTENCE = generate("U123456")

diff --git a/...src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ConvictionByCrnIntegrationTest.kt b/...src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ConvictionByCrnIntegrationTest.kt
@@ -1,5 +1,7 @@
 package uk.gov.justice.digital.hmpps
 
+import org.hamcrest.MatcherAssert
+import org.hamcrest.Matchers
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
@@ -264,4 +266,13 @@ internal class ConvictionByCrnIntegrationTest {
             .andExpect(status().is2xxSuccessful)
             .andExpect(jsonPath("$.length()").value(0))
     }
+
+    @Test
+    fun `convictions record soft deleted return emptyList for convictions`() {
+        val response = mockMvc
+            .perform(get("/probation-case/S123456/convictions").withToken())
+            .andExpect(status().isOk).andReturn()
+            .response.contentAsJson<List<Conviction>>()
+        MatcherAssert.assertThat(response, Matchers.equalTo(emptyList()))
+    }
 }
diff --git a/...delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/OffenderIntegrationTest.kt b/...delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/OffenderIntegrationTest.kt
@@ -277,6 +277,33 @@ internal class OffenderIntegrationTest {
             .andExpect(status().isNotFound)
     }
 
+    @Test
+    fun `probation summary record that is soft deleted still returns`() {
+        val response = mockMvc
+            .perform(get("/probation-case/S123456").withToken())
+            .andExpect(status().isOk).andReturn()
+            .response.contentAsJson<OffenderDetailSummary>()
+        assertThat(response.softDeleted, equalTo(true))
+    }
+
+    @Test
+    fun `probation detail record that is soft deleted still returns`() {
+        val response = mockMvc
+            .perform(get("/probation-case/S123456/all").withToken())
+            .andExpect(status().isOk).andReturn()
+            .response.contentAsJson<OffenderDetail>()
+        assertThat(response.softDeleted, equalTo(true))
+    }
+
+    @Test
+    fun `Detail API call allOffenderManagers record soft deleted`() {
+        val response = mockMvc
+            .perform(get("/probation-case/S123456/allOffenderManagers").withToken())
+            .andExpect(status().isOk).andReturn()
+            .response.contentAsJson<List<OffenderManager>>()
+        assertThat(response, equalTo(emptyList()))
+    }
+
     @Test
     fun `Detail API call retuns probation record with no active sentence`() {
         val crn = PersonGenerator.NO_SENTENCE.crn

diff --git a/...s/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RegistrationsIntegrationTest.kt b/...s/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RegistrationsIntegrationTest.kt
@@ -49,4 +49,13 @@ internal class RegistrationsIntegrationTest {
         assertThat(response.registrations?.size, equalTo(2))
         assertThat(response.registrations?.get(0)?.active, equalTo(true))
     }
+
+    @Test
+    fun `registrations record soft deleted returns null registations`() {
+        val response = mockMvc
+            .perform(get("/probation-case/S123456/registrations").withToken())
+            .andExpect(status().isOk).andReturn()
+            .response.contentAsJson<Registrations>()
+        assertThat(response.registrations, equalTo(null))
+    }
 }
diff --git a/.../src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/entity/Person.kt b/.../src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/entity/Person.kt
@@ -15,7 +15,6 @@ import java.time.ZonedDateTime
 @Immutable
 @Entity
 @Table(name = "offender")
-@SQLRestriction("soft_deleted = 0")
 class Person(
 
     @Id
@@ -346,7 +345,6 @@ interface PersonRepository : JpaRepository<Person, Long> {
             left join fetch p.partitionArea pa
             left join fetch p.title title
             where p.crn = :crn
-            and p.softDeleted = false
         """
     )
     fun findByCrn(crn: String): Person?