From 818c03fdd1efae72f3c81dbf15796a19d7954403 Mon Sep 17 00:00:00 2001 From: Anthony Britton <105213050+anthony-britton-moj@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:57:53 +0000 Subject: [PATCH] PI-1746 (#2943) --- .../deploy/database/access.yml | 1 + .../hmpps/data/generator/ReferenceDataGenerator.kt | 3 ++- .../hmpps/integrations/delius/court/entity/Court.kt | 10 ++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/assessment-summary-and-delius/deploy/database/access.yml b/projects/assessment-summary-and-delius/deploy/database/access.yml index 436e2bcbf5..cbc26bb0df 100644 --- a/projects/assessment-summary-and-delius/deploy/database/access.yml +++ b/projects/assessment-summary-and-delius/deploy/database/access.yml @@ -3,6 +3,7 @@ database: username_key: /assessment-summary-and-delius/db-username password_key: /assessment-summary-and-delius/db-password tables: + - audited_interaction - contact - deregistration - domain_event diff --git a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt index d45b285cd4..54eb84dff9 100644 --- a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt +++ b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt @@ -32,7 +32,8 @@ object ReferenceDataGenerator { fun generateDataset(code: String, id: Long = IdGenerator.getAndIncrement()) = Dataset(code, id) - fun generateCourt(code: String, id: Long = IdGenerator.getAndIncrement()) = Court(code, id) + fun generateCourt(code: String, selectable: Boolean = true, id: Long = IdGenerator.getAndIncrement()) = + Court(code, selectable, id) fun generateOffence(code: String, id: Long = IdGenerator.getAndIncrement()) = Offence(code, id) diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Court.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Court.kt index 9a37819d13..5c32629dfa 100644 --- a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Court.kt +++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Court.kt @@ -1,9 +1,11 @@ package uk.gov.justice.digital.hmpps.integrations.delius.court.entity import jakarta.persistence.Column +import jakarta.persistence.Convert import jakarta.persistence.Entity import jakarta.persistence.Id import org.hibernate.annotations.Immutable +import org.hibernate.type.YesNoConverter import org.springframework.data.jpa.repository.JpaRepository import uk.gov.justice.digital.hmpps.exception.NotFoundException @@ -12,14 +14,18 @@ import uk.gov.justice.digital.hmpps.exception.NotFoundException class Court( @Column(columnDefinition = "char(6)") val code: String, + + @Convert(converter = YesNoConverter::class) + val selectable: Boolean, + @Id @Column(name = "court_id") val id: Long ) interface CourtRepository : JpaRepository { - fun findByCode(code: String): Court? + fun findByCodeAndSelectableTrue(code: String): Court? } fun CourtRepository.getByCode(code: String) = - findByCode(code) ?: throw NotFoundException("Court", "code", code) + findByCodeAndSelectableTrue(code) ?: throw NotFoundException("Court", "code", code)