PI-2517 - use correct api spec file for cvl

Author: achimber-moj

Dockerfile.prism

@@ -8,7 +8,7 @@ RUN mkdir /prismMocks
 ADD https://manage-adjudications-api-dev.hmpps.service.justice.gov.uk/v3/api-docs /tmp/adjudications.json
 ADD https://assess-risks-and-needs-dev.hmpps.service.justice.gov.uk/v3/api-docs /prismMocks/assess-risks-and-needs.json
 ADD https://dev.offender-case-notes.service.justice.gov.uk/v3/api-docs /tmp/case-notes.json
-ADD https://create-and-vary-a-licence-api-dev.hmpps.service.justice.gov.uk/v3/api-docs /prismMocks/create-and-vary-a-licence.json
+ADD https://create-and-vary-a-licence-api-dev.hmpps.service.justice.gov.uk/v3/api-docs/public /prismMocks/create-and-vary-a-licence.json
 ADD https://dev.moic.service.justice.gov.uk/v3/api-docs.json /prismMocks/manage-pom-case-api.json
 ADD https://ministryofjustice.github.io/hmpps-probation-integration-services/tech-docs/projects/external-api-and-delius/api-docs.json /prismMocks/ndelius.json
 ADD https://prison-api-dev.prison.service.justice.gov.uk/v3/api-docs /tmp/prison-api.json
@@ -33,6 +33,4 @@ RUN sed -i 's/\*\/\*/application\/json/g' /prismMocks/assess-risks-and-needs.jso
 RUN sed -i 's/\*\/\*/application\/json/g' /prismMocks/case-notes.json
 RUN sed -i 's/\*\/\*/application\/json/g' /prismMocks/prisoner-offender-search.json
 
-COPY src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/prismMocks/create-and-vary-licence.json /prismMocks/create-and-vary-a-licence.json
-
 ENTRYPOINT sh -c 'port=4010; for file in $(ls /prismMocks/*.json | sort); do node dist/index.js mock -p $port -h 0.0.0.0 $file & port=$((port + 1)); done; wait'

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/CreateAndVaryLicenceGateway.kt

@@ -33,7 +33,7 @@ class CreateAndVaryLicenceGateway(
 
     return when (result) {
       is WebClientWrapperResponse.Success -> {
-        val sortedLicences = result.data.sortedByDescending { it.dateCreated }
+        val sortedLicences = result.data.sortedByDescending { it.createdDateTime }
         Response(data = sortedLicences.map { it.toLicence() })
       }
 

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/createAndVaryLicence/CvlLicenceSummary.kt

@@ -3,20 +3,22 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.createAndVaryLic
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Licence
 
 data class CvlLicenceSummary(
-  val licenceId: String,
-  val nomisId: String? = null,
-  val licenceStatus: String? = null,
+  val id: String,
+  val prisonNumber: String? = null,
+  val statusCode: String? = null,
   val licenceType: String? = null,
-  val dateCreated: String? = null,
-  val approvedDate: String? = null,
+  val createdDateTime: String? = null,
+  val approvedDateTime: String? = null,
+  val updatedDateTime: String? = null,
 ) {
   fun toLicence(): Licence =
     Licence(
-      id = this.licenceId,
-      offenderNumber = this.nomisId,
-      status = this.licenceStatus,
+      id = this.id,
+      offenderNumber = this.prisonNumber,
+      status = this.statusCode,
       typeCode = this.licenceType,
-      createdDate = this.dateCreated,
-      approvedDate = this.approvedDate,
+      createdDate = this.createdDateTime,
+      approvedDate = this.approvedDateTime,
+      updatedDate = this.updatedDateTime,
     )
 }

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/createAndVaryLicence/LicenceTest.kt

@@ -8,13 +8,13 @@ class LicenceTest : DescribeSpec(
       it("maps one-to-one attributes to integration API attributes") {
         val cvlLcence =
           CvlLicenceSummary(
-            licenceId = "MockId",
-            nomisId = "1140484",
+            id = "MockId",
+            prisonNumber = "1140484",
           )
 
         val integrationApiLicence = cvlLcence.toLicence()
 
-        integrationApiLicence.offenderNumber.shouldBe(cvlLcence.nomisId)
+        integrationApiLicence.offenderNumber.shouldBe(cvlLcence.prisonNumber)
       }
     }
   },

src/test/resources/expected-responses/person-licence-conditions

@@ -1,6 +1,6 @@
 {
  "data": {
-   "hmppsId": "G2996UX",
+   "hmppsId": "ABC123",
    "offenderNumber": "A1234AA",
    "licences": [
      {