PI-1878: Use circumstance sub type (#3428)

* PI-1878: Use circumstance sub type
ministryofjustice · Mar 5, 2024 · 4172713 · 4172713
1 parent e48d010
commit 4172713
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
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
@@ -121,14 +121,17 @@ object PersonGenerator {
                 IdGenerator.getAndIncrement(),
                 id,
                 ReferenceData(IdGenerator.getAndIncrement(), "E01", "Employment"),
-                ReferenceData(IdGenerator.getAndIncrement(), "FT01", "Full-time employed (30 or more hours per week)"),
+                PersonalCircumstanceSubType(
+                    IdGenerator.getAndIncrement(),
+                    "Full-time employed (30 or more hours per week"
+                ),
                 LocalDate.now()
             ),
             PersonalCircumstance(
                 IdGenerator.getAndIncrement(),
                 id,
                 ReferenceData(IdGenerator.getAndIncrement(), "A02", "Accommodation"),
-                ReferenceData(IdGenerator.getAndIncrement(), "FM01", "Friends/Family (settled)"),
+                PersonalCircumstanceSubType(IdGenerator.getAndIncrement(), "Friends/Family (settled)"),
                 LocalDate.now()
             )
         ),

diff --git a/.../uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/PersonalCircumstance.kt b/.../uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/PersonalCircumstance.kt
@@ -28,7 +28,7 @@ class PersonalCircumstance(
     @ManyToOne
     @Fetch(FetchMode.JOIN)
     @JoinColumn(name = "circumstance_sub_type_id")
-    val subType: ReferenceData,
+    val subType: PersonalCircumstanceSubType,
 
     val startDate: LocalDate,
 
@@ -39,3 +39,14 @@ class PersonalCircumstance(
 
     )
 
+@Immutable
+@Entity
+@Table(name = "r_circumstance_sub_type")
+class PersonalCircumstanceSubType(
+    @Id
+    @Column(name = "circumstance_sub_type_id")
+    val id: Long,
+
+    @Column(name = "code_description")
+    val description: String,
+)