Merge branch 'main' into feature/BR-59

ministryofjustice · Mar 7, 2025 · 639a5ba · 639a5ba
2 parents 32c39ee + f1847af
commit 639a5ba
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/entity/AddressEntity.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/entity/AddressEntity.kt
@@ -19,7 +19,7 @@ data class AddressEntity(
   @Id
   val id: UUID = UUID.randomUUID(),
   val addressId: Long,
-  val type: String? = null,
+  val status: String? = null,
   val buildingName: String? = null,
   val addressNumber: String? = null,
   val streetName: String? = null,

diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/model/Address.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/model/Address.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Address(
   val addressId: Long,
-  val type: String? = null,
+  val status: String? = null,
   val buildingName: String? = null,
   @JsonProperty("buildingNumber")
   val addressNumber: String? = null,

diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/service/BreachNoticeService.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/service/BreachNoticeService.kt
@@ -214,7 +214,7 @@ class BreachNoticeService(
 
   private fun AddressEntity.toModel() = Address(
     addressId = addressId,
-    type = type,
+    status = status,
     buildingName = buildingName,
     addressNumber = addressNumber,
     streetName = streetName,
@@ -226,7 +226,7 @@ class BreachNoticeService(
 
   private fun Address.toEntity(existingEntity: AddressEntity? = null) = existingEntity?.copy(
     addressId = addressId,
-    type = type,
+    status = status,
     buildingName = buildingName,
     addressNumber = addressNumber,
     streetName = streetName,
@@ -236,7 +236,7 @@ class BreachNoticeService(
     postcode = postcode,
   ) ?: AddressEntity(
     addressId = addressId,
-    type = type,
+    status = status,
     buildingName = buildingName,
     addressNumber = addressNumber,
     streetName = streetName,

diff --git a/src/main/resources/db/migration/V1_4__address_status.sql b/src/main/resources/db/migration/V1_4__address_status.sql
@@ -0,0 +1 @@
+ALTER TABLE public.address RENAME COLUMN type to status;
diff --git a/.../kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/integration/BreachNoticeCrudTests.kt b/.../kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/integration/BreachNoticeCrudTests.kt
@@ -61,7 +61,7 @@ class BreachNoticeCrudTests : IntegrationTestBase() {
       completedDate = LocalDateTime.now(),
       offenderAddress = Address(
         addressId = 25,
-        type = "ENDO",
+        status = "ENDO",
         buildingName = "MOO",
       ),
       replyAddress = null,
@@ -129,7 +129,7 @@ class BreachNoticeCrudTests : IntegrationTestBase() {
           completedDate = LocalDateTime.now(),
           offenderAddress = Address(
             addressId = 25,
-            type = "ENDO",
+            status = "ENDO",
             buildingName = "MOO",
           ),
           replyAddress = null,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE public.address RENAME COLUMN type to status;