PI-2788 (#4619)

* PI-2788
ministryofjustice · Feb 4, 2025 · a02cfc7 · a02cfc7
1 parent 13bef85
commit a02cfc7
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git a/...remises-and-oasys/src/dev/resources/simulations/__files/layer-3-assessment-not-found.json b/...remises-and-oasys/src/dev/resources/simulations/__files/layer-3-assessment-not-found.json
@@ -8,7 +8,7 @@
   "limitedAccessOffender": false,
   "timeline": [
     {
-      "assessmentPk": 9641348,
+      "assessmentPk": 9641349,
       "assessmentType": "LAYER1",
       "initiationDate": "2022-07-27T12:10:58",
       "status": "OPEN"

diff --git a/...proved-premises-and-oasys/src/dev/resources/simulations/__files/timeline-assessments.json b/...proved-premises-and-oasys/src/dev/resources/simulations/__files/timeline-assessments.json
@@ -44,14 +44,14 @@
       "completedDate": "2022-07-21T15:43:12"
     },
     {
-      "assessmentPk": 9639348,
+      "assessmentPk": 9641348,
       "assessmentType": "LAYER3",
       "initiationDate": "2022-07-21T15:43:58",
       "status": "COMPLETE",
       "completedDate": "2022-07-27T12:09:41"
     },
     {
-      "assessmentPk": 9641348,
+      "assessmentPk": 9639349,
       "assessmentType": "LAYER3",
       "initiationDate": "2022-07-27T12:10:58",
       "status": "OPEN"

diff --git a/...d-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-heatlh-details.json b/...d-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-heatlh-details.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/health/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/health/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...ed-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-needs-details.json b/...ed-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-needs-details.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/needs/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/needs/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-offence-details.json b/...-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-offence-details.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/offence/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/offence/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...s-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-assessment-details.json b/...s-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-assessment-details.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/riskass/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/riskass/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-management-plan-details.json b/...-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-management-plan-details.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/rmp/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/rmp/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...es-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-to-the-individual.json b/...es-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-to-the-individual.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/riskind/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/riskind/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...ved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh-summary.json b/...ved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh-summary.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/roshsum/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/roshsum/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...ts/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh.json b/...ts/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh.json
@@ -3,7 +3,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/eor/oasys/ap/rosh/D006296/ALLOW/9641348/OPEN",
+        "url": "/eor/oasys/ap/rosh/D006296/ALLOW/9641348/COMPLETE",
         "headers": {
           "Authorization": {
             "matches": "^Bearer (.*)$"

diff --git a/...d-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentTimelineTest.kt b/...d-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentTimelineTest.kt
@@ -30,7 +30,7 @@ internal class AssessmentTimelineTest {
             .andReturn().response.contentAsJson<OasysTimelineAssessment>()
 
         assertThat(oasysTimelineAssessment.initiationDate)
-            .isEqualTo(ZonedDateTime.parse("2022-07-27T12:10:58+01:00").withZoneSameInstant(EuropeLondon))
+            .isEqualTo(ZonedDateTime.parse("2022-07-21T15:43:58+01:00").withZoneSameInstant(EuropeLondon))
     }
 
     @Test

diff --git a/...-and-oasys/src/main/kotlin/uk/gov/justice/digital/hmpps/service/OasysAssessmentService.kt b/...-and-oasys/src/main/kotlin/uk/gov/justice/digital/hmpps/service/OasysAssessmentService.kt
@@ -22,7 +22,7 @@ class OasysAssessmentService(private var oasysClient: OasysClient) {
             val ordsAssessmentTimeline = oasysClient.getAssessmentTimeline(crn)
             val assessments =
                 ordsAssessmentTimeline.timeline.sortedByDescending { it.initiationDate }.stream().filter {
-                    it.assessmentType == "LAYER3"
+                    it.assessmentType == "LAYER3" && (it.status == "COMPLETE" || it.status == "LOCKED_INCOMPLETE")
                 }
             return assessments.findFirst().orElseThrow {
                 NotFoundException("Latest layer 3 assessment not found for crn=$crn")