Merge pull request #384 from ministryofjustice/HIA-666

Golden record for assessments

Author: chiaramapellimt

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

@@ -45,7 +45,22 @@ internal class RiskCategoriesControllerTest(
           Response(
             data = RiskCategory(
               offenderNo = "A1234AA",
-              assessments = listOf(RiskAssessment(classificationCode = "C")),
+              assessments = listOf(
+                RiskAssessment(
+                  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",
             ),
           ),
         )
@@ -79,10 +94,20 @@ internal class RiskCategoriesControllerTest(
             "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(),
         )
       }

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(),