From f1847af4640ae61ba5818a565967d25d6a391b8f Mon Sep 17 00:00:00 2001 From: Peter Wilson <40563223+peter-bcl@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:09:45 +0000 Subject: [PATCH] BR-63 update of model to use status instead of type BR-63 update of model to use status instead of type --- .../digital/hmpps/breachnoticeapi/entity/AddressEntity.kt | 2 +- .../justice/digital/hmpps/breachnoticeapi/model/Address.kt | 2 +- .../hmpps/breachnoticeapi/service/BreachNoticeService.kt | 6 +++--- src/main/resources/db/migration/V1_4__address_status.sql | 1 + .../breachnoticeapi/integration/BreachNoticeCrudTests.kt | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/db/migration/V1_4__address_status.sql 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 index d1f1d27..8926258 100644 --- 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 index 658fcde..f17e336 100644 --- 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 index da1ad4e..ffd5e3e 100644 --- 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 @@ -204,7 +204,7 @@ class BreachNoticeService( private fun AddressEntity.toModel() = Address( addressId = addressId, - type = type, + status = status, buildingName = buildingName, addressNumber = addressNumber, streetName = streetName, @@ -216,7 +216,7 @@ class BreachNoticeService( private fun Address.toEntity(existingEntity: AddressEntity? = null) = existingEntity?.copy( addressId = addressId, - type = type, + status = status, buildingName = buildingName, addressNumber = addressNumber, streetName = streetName, @@ -226,7 +226,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 new file mode 100644 index 0000000..8399e5b --- /dev/null +++ b/src/main/resources/db/migration/V1_4__address_status.sql @@ -0,0 +1 @@ +ALTER TABLE public.address RENAME COLUMN type to status; \ No newline at end of file diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/integration/BreachNoticeCrudTests.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/integration/BreachNoticeCrudTests.kt index 37dd393..4f6a6a0 100644 --- a/src/test/kotlin/uk/gov/justice/digital/hmpps/breachnoticeapi/integration/BreachNoticeCrudTests.kt +++ b/src/test/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,