diff --git a/projects/approved-premises-and-oasys/src/dev/resources/simulations/__files/layer-3-assessment-not-found.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/__files/layer-3-assessment-not-found.json index 274ffa5118..dc494536e1 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/__files/layer-3-assessment-not-found.json +++ b/projects/approved-premises-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/__files/timeline-assessments.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/__files/timeline-assessments.json index 7327afd5f5..7b5623e2e9 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/__files/timeline-assessments.json +++ b/projects/approved-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-heatlh-details.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-heatlh-details.json index 7dba94e411..4018a4f063 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-heatlh-details.json +++ b/projects/approved-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-needs-details.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-needs-details.json index aa952a5839..bb1ee59da7 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-needs-details.json +++ b/projects/approved-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-offence-details.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-offence-details.json index b2bc6fe9de..7351361036 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-offence-details.json +++ b/projects/approved-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-assessment-details.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-assessment-details.json index d151d592a3..02c4448e2e 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-assessment-details.json +++ b/projects/approved-premises-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-management-plan-details.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-management-plan-details.json index b8351435a8..867355245c 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-management-plan-details.json +++ b/projects/approved-premises-and-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-to-the-individual.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-to-the-individual.json index 687b2b982b..ddfedf1376 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-risk-to-the-individual.json +++ b/projects/approved-premises-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh-summary.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh-summary.json index 870a364f19..0b9a40b0c1 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh-summary.json +++ b/projects/approved-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/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh.json b/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh.json index 8575c85bc3..0e9018ede1 100644 --- a/projects/approved-premises-and-oasys/src/dev/resources/simulations/mappings/get-oasys-rosh.json +++ b/projects/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/projects/approved-premises-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentTimelineTest.kt b/projects/approved-premises-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentTimelineTest.kt index 7c8ad4dd13..992c69e007 100644 --- a/projects/approved-premises-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentTimelineTest.kt +++ b/projects/approved-premises-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentTimelineTest.kt @@ -30,7 +30,7 @@ internal class AssessmentTimelineTest { .andReturn().response.contentAsJson() 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/projects/approved-premises-and-oasys/src/main/kotlin/uk/gov/justice/digital/hmpps/service/OasysAssessmentService.kt b/projects/approved-premises-and-oasys/src/main/kotlin/uk/gov/justice/digital/hmpps/service/OasysAssessmentService.kt index d9a22cd807..da023eb38c 100644 --- a/projects/approved-premises-and-oasys/src/main/kotlin/uk/gov/justice/digital/hmpps/service/OasysAssessmentService.kt +++ b/projects/approved-premises-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")