Golden record for assessments

Author: chiaramapellimt

Dockerfile.setup-probation-offender-search

@@ -2,7 +2,7 @@ FROM node:current-alpine3.17
 
 RUN apk update && apk add bash curl
 
-RUN curl https://probation-offender-search-dev.hmpps.service.justice.gov.uk/v3/api-docs > probation-offender-search.json && \
+RUN curl https://probation-offender-search-dev.hmpps.service.justice.gov.uk/v3/api-docs > probation-offender-search-1.json && \
     npm install -g @stoplight/prism-cli
 
-CMD prism mock -p 4010 -h 0.0.0.0 /probation-offender-search.json
+CMD prism mock -p 4010 -h 0.0.0.0 /probation-offender-search-1.json

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

@@ -1,5 +1,13 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class RiskAssessment(
-  val classificationCode: String?,
+  val classificationCode: String? = null,
+  val classification: String? = null,
+  val assessmentCode: String? = null,
+  val assessmentDescription: String? = null,
+  val assessmentDate: String? = null,
+  val nextReviewDate: String? = null,
+  val assessmentAgencyId: String? = null,
+  val assessmentStatus: String? = null,
+  val assessmentComment: String? = null,
 )

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

@@ -3,4 +3,6 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 data class RiskCategory(
   val offenderNo: String? = null,
   val assessments: List<RiskAssessment> = emptyList(),
+  val category: String? = null,
+  val categoryCode: String? = null,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/nomis/NomisAssessment.kt

@@ -4,8 +4,24 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.RiskAssessm
 
 data class NomisAssessment(
   val classificationCode: String? = null,
+  val classification: String? = null,
+  val assessmentCode: String? = null,
+  val assessmentDescription: String? = null,
+  val assessmentDate: String? = null,
+  val nextReviewDate: String? = null,
+  val assessmentAgencyId: String? = null,
+  val assessmentStatus: String? = null,
+  val assessmentComment: String? = null,
 ) {
   fun toRiskAssessment() = RiskAssessment(
     classificationCode = this.classificationCode,
+    classification = this.classification,
+    assessmentCode = this.assessmentCode,
+    assessmentDescription = this.assessmentDescription,
+    assessmentDate = this.assessmentDate,
+    nextReviewDate = this.nextReviewDate,
+    assessmentAgencyId = this.assessmentAgencyId,
+    assessmentStatus = this.assessmentStatus,
+    assessmentComment = this.assessmentComment,
   )
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/nomis/NomisInmateDetail.kt

@@ -5,9 +5,13 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.RiskCategor
 data class NomisInmateDetail(
   val offenderNo: String? = null,
   val assessments: List<NomisAssessment> = emptyList(),
+  val category: String? = null,
+  val categoryCode: String? = null,
 ) {
   fun toRiskCategory(): RiskCategory = RiskCategory(
     offenderNo = this.offenderNo,
     assessments = this.assessments.map { it.toRiskAssessment() },
+    category = this.category,
+    categoryCode = this.categoryCode,
   )
 }

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/RiskCategoriesControllerTest.kt

@@ -78,11 +78,21 @@ internal class RiskCategoriesControllerTest(
           "data": {
             "offenderNo": "A1234AA",
             "assessments": [
-            {
-                "classificationCode": "C"
-            }
-          ]
-        }
+                {
+                  "classificationCode": "C",
+                  "classification": null,
+                  "assessmentCode": null,
+                  "assessmentDescription": null,
+                  "assessmentDate": null,
+                  "nextReviewDate": null,
+                  "assessmentAgencyId": null,
+                  "assessmentStatus": null,
+                  "assessmentComment": null
+                }
+              ],
+            "category": null,
+            "categoryCode": null
+          }
         """.removeWhitespaceAndNewlines(),
         )
       }

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/smoke/person/RisksSmokeTest.kt

@@ -70,9 +70,19 @@ class RisksSmokeTest : DescribeSpec(
           "offenderNo": "A1234AA",
           "assessments": [
             {
-              "classificationCode": "C"
+              "classificationCode": "C",
+              "classification": "Cat C",
+              "assessmentCode": "CATEGORY",
+              "assessmentDescription": "Categorisation",
+              "assessmentDate": "2018-02-11",
+              "nextReviewDate": "2018-02-11",
+              "assessmentAgencyId": "MDI",
+              "assessmentStatus": "P",
+              "assessmentComment": "Comment details"
             }
-          ]
+          ],
+          "category": "string",
+          "categoryCode": "string"
         }
       }
         """.removeWhitespaceAndNewlines(),