PI-1917 handle incorrect date format (#3252)

ministryofjustice · Feb 16, 2024 · 28333ec · 28333ec
1 parent 49b59ed
commit 28333ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/...-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-N123456.json b/...-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-N123456.json
@@ -25,12 +25,12 @@
       "currentConcernsHostel": null,
       "reviewNum": null,
       "currentConcernsEscape": null,
-      "initialSpDate": null,
+      "initialSpDate": "12/02/2024",
       "currentConcernsVulnerablity": null,
       "currentConcernsBreachOfTrust": null,
       "currentConcernsRiskOfSelfHarm": null,
       "currentConcernsRiskOfSuicide": null,
-      "reviewSpDate": null,
+      "reviewSpDate": "2024-08-12",
       "riskPrisonersCustody": null,
       "riskStaffCustody": null,
       "riskStaffCommunity": null,

diff --git a/...ary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/...ary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
@@ -84,6 +84,8 @@ internal class IntegrationTest {
         assertThat(assessment?.assessedBy, equalTo("John Smith"))
         assertThat(assessment?.date, equalTo(LocalDate.parse("2023-12-07")))
         assertThat(assessment?.totalScore, equalTo(76))
+        assertThat(assessment?.initialSentencePlanDate, equalTo(LocalDate.of(2024, 2, 12)))
+        assertThat(assessment?.sentencePlanReviewDate, equalTo(LocalDate.of(2024, 8, 12)))
     }
 
     @Test

diff --git a/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/oasys/OrdsClient.kt b/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/oasys/OrdsClient.kt
@@ -1,6 +1,7 @@
 package uk.gov.justice.digital.hmpps.integrations.oasys
 
 import com.fasterxml.jackson.annotation.JsonAlias
+import com.fasterxml.jackson.annotation.JsonFormat
 import org.springframework.web.service.annotation.GetExchange
 import java.net.URI
 import java.time.LocalDate
@@ -16,7 +17,9 @@ data class AssessmentSummary(
     val dateCompleted: LocalDate,
     val initiationDate: LocalDate,
     val assessmentStatus: String,
+    @JsonFormat(pattern = "[yyyy-MM-dd][dd/MM/yyyy]") // temporary until oasys bug fixed, should not be used for responses
     val initialSpDate: LocalDate? = null,
+    @JsonFormat(pattern = "[yyyy-MM-dd][dd/MM/yyyy]") // temporary until oasys bug fixed, should not be used for responses
     val reviewSpDate: LocalDate? = null,
     val reviewNum: String? = null,
     val currentConcernsBreachOfTrust: String? = null,