PI-2469: Added static phone type reference data (#4230)

ministryofjustice · Sep 13, 2024 · de3de53 · de3de53
1 parent f638c17
commit de3de53
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/...api-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/...api-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
@@ -16,6 +16,7 @@ import uk.gov.justice.digital.hmpps.data.generator.RegistrationGenerator.REFDATA
 import uk.gov.justice.digital.hmpps.model.PersonIdentifier
 import uk.gov.justice.digital.hmpps.model.ProbationReferenceData
 import uk.gov.justice.digital.hmpps.model.RefData
+import uk.gov.justice.digital.hmpps.service.PhoneTypes
 import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.contentAsJson
 import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.withToken
 import java.time.LocalDate
@@ -152,11 +153,18 @@ internal class IntegrationTest {
             .andExpect(status().is2xxSuccessful)
             .andReturn().response.contentAsJson<ProbationReferenceData>()
         Assertions.assertEquals(
-            response.probationReferenceData.get("GENDER"),
+            response.probationReferenceData["GENDER"],
             listOf(
                 RefData(REFDATA_FEMALE.code, REFDATA_FEMALE.description),
                 RefData(REFDATA_MALE.code, REFDATA_MALE.description)
             )
         )
+        Assertions.assertEquals(
+            response.probationReferenceData["PHONE_TYPE"],
+            listOf(
+                RefData(PhoneTypes.TELEPHONE.name, PhoneTypes.TELEPHONE.description),
+                RefData(PhoneTypes.MOBILE.name, PhoneTypes.MOBILE.description)
+            )
+        )
     }
 }
diff --git a/.../main/kotlin/uk/gov/justice/digital/hmpps/integration/delius/entity/RegistrationEntity.kt b/.../main/kotlin/uk/gov/justice/digital/hmpps/integration/delius/entity/RegistrationEntity.kt
@@ -96,7 +96,7 @@ interface RegistrationRepository : JpaRepository<RegistrationEntity, Long> {
         on rdm.reference_data_master_id = rdl.reference_data_master_id
         where rdm.code_set_name in ('GENDER','ETHNICITY')
         union
-        select 'REGISTER_TYPES' as set_name, rt.code, rt.description 
+        select 'REGISTER_TYPE' as set_name, rt.code, rt.description 
         from r_register_type rt
         order by codeSet, code        
     """, nativeQuery = true

diff --git a/...i-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferenceDataService.kt b/...i-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferenceDataService.kt
@@ -9,9 +9,19 @@ import uk.gov.justice.digital.hmpps.model.RefData
 class ReferenceDataService(
     private val registrationRepository: RegistrationRepository,
 ) {
-    fun getReferenceData(): ProbationReferenceData =
-        ProbationReferenceData(
+    fun getReferenceData(): ProbationReferenceData {
+
+        val refData = LinkedHashMap<String, MutableList<RefData>>()
+        refData["PHONE_TYPE"] = PhoneTypes.entries.map { RefData(it.name, it.description) }.toMutableList()
+        refData.putAll(
             registrationRepository.getReferenceData()
                 .groupByTo(LinkedHashMap(), { it.codeSet.trim() }, { RefData(it.code.trim(), it.description) })
         )
-}
+        return ProbationReferenceData(refData)
+    }
+}
+
+enum class PhoneTypes(val description: String) {
+    TELEPHONE("Home"),
+    MOBILE("Mobile")
+}