Reorder migrations

ministryofjustice · Jan 22, 2025 · 87572f4 · 87572f4
1 parent 9d1ffb9
commit 87572f4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...ustice/digital/hmpps/approvedpremisesapi/controller/cas2v2/Cas2v2SubmissionsController.kt b/...ustice/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/...ll/20250122135323__cas2v2_user_entity.sql → ...ll/20250122155323__cas2v2_user_entity.sql b/...ll/20250122135323__cas2v2_user_entity.sql → ...ll/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/...gov/justice/digital/hmpps/approvedpremisesapi/integration/cas2v2/Cas2v2ApplicationTest.kt b/...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,
                   ),