From 87572f4d4a384ceb094533bd71a9a15182a3f238 Mon Sep 17 00:00:00 2001 From: Ross Jones Date: Wed, 22 Jan 2025 17:30:09 +0000 Subject: [PATCH] Reorder migrations --- .../controller/cas2v2/Cas2v2SubmissionsController.kt | 2 -- ...er_entity.sql => 20250122155323__cas2v2_user_entity.sql} | 3 ++- .../integration/cas2v2/Cas2v2ApplicationTest.kt | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) rename src/main/resources/db/migration/all/{20250122135323__cas2v2_user_entity.sql => 20250122155323__cas2v2_user_entity.sql} (97%) diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/controller/cas2v2/Cas2v2SubmissionsController.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/controller/cas2v2/Cas2v2SubmissionsController.kt index 6ead9c9122..e1671a0593 100644 --- a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/controller/cas2v2/Cas2v2SubmissionsController.kt +++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/controller/cas2v2/Cas2v2SubmissionsController.kt @@ -11,8 +11,6 @@ import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.SortDirection import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.SubmitCas2v2Application import uk.gov.justice.digital.hmpps.approvedpremisesapi.jpa.entity.cas2v2.Cas2v2ApplicationEntity import uk.gov.justice.digital.hmpps.approvedpremisesapi.jpa.entity.cas2v2.Cas2v2ApplicationSummaryEntity -import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.ExternalUserService -import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.HttpAuthService import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2.OffenderService import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2v2.Cas2v2ApplicationService import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2v2.Cas2v2UserService diff --git a/src/main/resources/db/migration/all/20250122135323__cas2v2_user_entity.sql b/src/main/resources/db/migration/all/20250122155323__cas2v2_user_entity.sql similarity index 97% rename from src/main/resources/db/migration/all/20250122135323__cas2v2_user_entity.sql rename to src/main/resources/db/migration/all/20250122155323__cas2v2_user_entity.sql index 61aced6e0e..872389736a 100644 --- a/src/main/resources/db/migration/all/20250122135323__cas2v2_user_entity.sql +++ b/src/main/resources/db/migration/all/20250122155323__cas2v2_user_entity.sql @@ -46,7 +46,8 @@ SELECT a.id, a.conditional_release_date, asu.created_at AS status_created_at, a.abandoned_at, - a.application_origin + a.application_origin, + a.bail_hearing_date FROM cas_2_v2_applications a LEFT JOIN (SELECT DISTINCT ON (application_id) su.application_id, su.label, su.status_id, su.created_at FROM cas_2_v2_status_updates su diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas2v2/Cas2v2ApplicationTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas2v2/Cas2v2ApplicationTest.kt index 40db7c445d..4d7016a17c 100644 --- a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas2v2/Cas2v2ApplicationTest.kt +++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas2v2/Cas2v2ApplicationTest.kt @@ -22,7 +22,7 @@ import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.NewApplication import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.PersonStatus import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.ServiceName import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.UpdateApplicationType -import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.UpdateCas2Application +import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.UpdateCas2v2Application import uk.gov.justice.digital.hmpps.approvedpremisesapi.integration.Cas2v2IntegrationTestBase import uk.gov.justice.digital.hmpps.approvedpremisesapi.integration.givens.givenACas2LicenceCaseAdminUser import uk.gov.justice.digital.hmpps.approvedpremisesapi.integration.givens.givenACas2v2Assessor @@ -1856,7 +1856,7 @@ class Cas2v2ApplicationTest : Cas2v2IntegrationTestBase() { .uri("/cas2v2/applications/$applicationId") .header("Authorization", "Bearer $jwt") .bodyValue( - UpdateCas2Application( + UpdateCas2v2Application( data = mapOf("thingId" to 123), type = UpdateApplicationType.CAS2, ), @@ -1906,7 +1906,7 @@ class Cas2v2ApplicationTest : Cas2v2IntegrationTestBase() { .uri("/cas2v2/applications/$applicationId") .header("Authorization", "Bearer $jwt") .bodyValue( - UpdateCas2Application( + UpdateCas2v2Application( data = mapOf("thingId" to 123), type = UpdateApplicationType.CAS2, ),