PI-2498: Do not use non mappa types (#4211)

* PI-2498: Do not use non mappa types * Formatting changes --------- Co-authored-by: probation-integration-bot[bot] <177347787+probation-integration-bot[bot]@users.noreply.github.com>
ministryofjustice · Sep 5, 2024 · 09a114c · 09a114c
1 parent 579ada4
commit 09a114c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/...es-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/ProbationCaseDataLoader.kt b/...es-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/ProbationCaseDataLoader.kt
@@ -72,6 +72,16 @@ class ProbationCaseDataLoader(
             )
         )
 
+        registrationRepository.save(
+            PersonGenerator.generateRegistration(
+                ProbationCaseGenerator.CASE_COMPLEX.asPerson(),
+                ReferenceDataGenerator.REGISTER_TYPES[RegisterType.Code.MAPPA.value]!!,
+                LocalDate.now().minusDays(7),
+                ReferenceDataGenerator.NON_MAPPA_CATEGORY,
+                ReferenceDataGenerator.REGISTER_LEVELS["M2"]
+            )
+        )
+
         registrationRepository.save(
             PersonGenerator.generateRegistration(
                 ProbationCaseGenerator.CASE_COMPLEX.asPerson(),

diff --git a/...lius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt b/...lius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt
@@ -69,6 +69,8 @@ object ReferenceDataGenerator {
         generate(it.name, REGISTER_LEVEL.id, "MAPPA Level ${it.name}")
     }.associateBy { it.code }
 
+    val NON_MAPPA_CATEGORY = generate("RC07", REGISTER_CATEGORY.id, "Other category")
+
     fun generate(
         code: String,
         datasetId: Long,
@@ -99,7 +101,8 @@ object ReferenceDataGenerator {
         GENDER_MALE,
         GENDER_IDENTITY_PNS,
         NATIONALITY_BRITISH,
-        RELIGION_OTHER
+        RELIGION_OTHER,
+        NON_MAPPA_CATEGORY,
     ) + REGISTER_CATEGORIES.values + REGISTER_LEVELS.values + REFERRAL_CATEGORIES.values
 
     fun generateReferralSource(code: String, id: Long = IdGenerator.getAndIncrement()) = ReferralSource(id, code)

diff --git a/...d-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/CaseService.kt b/...d-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/CaseService.kt
@@ -105,5 +105,8 @@ fun String.toMappaLevel() = Level.entries.find { it.name == this }?.number
 fun String.toMappaCategory() = Category.entries.find { it.name == this }?.number
     ?: throw IllegalStateException("Unexpected MAPPA category: $this")
 
-fun Map<Boolean, List<Registration>>.mappa() = get(true)?.firstOrNull()?.asMappa()
+fun Map<Boolean, List<Registration>>.mappa() = get(true)?.firstOrNull {
+    it.category?.code != null && Category.entries.map(Category::name).contains(it.category.code)
+}?.asMappa()
+
 fun Map<Boolean, List<Registration>>.flags() = get(false)?.map { it.asRegistration() } ?: listOf()