Updated sentence for EPF

Author: popey2700

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

@@ -19,13 +19,7 @@ data class Name(
 )
 
 data class CaseSentence(
-  val date: String? = null,
-  val sentencingCourt: SentencingCourt? = null,
-  val releaseDate: String? = null,
-)
-
-data class SentencingCourt(
-  val name: String? = null,
+  val expectedReleaseDate: String? = null,
 )
 
 data class ResponsibleProvider(

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

@@ -4,7 +4,6 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.CaseDetail
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.CaseSentence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Name
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ResponsibleProvider
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SentencingCourt
 
 data class EPFCaseDetail(
   val nomsId: String? = null,
@@ -25,34 +24,11 @@ data class EPFCaseDetail(
       gender = this.gender,
       sentence =
         CaseSentence(
-          date = this.sentence?.date,
-          sentencingCourt = SentencingCourt(this.sentence?.sentencingCourt?.name),
-          releaseDate = this.sentence?.releaseDate,
+          expectedReleaseDate = sentence?.expectedReleaseDate,
         ),
       responsibleProvider = ResponsibleProvider(code = this.responsibleProvider?.code, name = this.responsibleProvider?.name),
       ogrsScore = this.ogrsScore,
       age = this.age,
       ageAtRelease = this.ageAtRelease,
     )
 }
-
-data class Name(
-  val forename: String? = null,
-  val middleName: String? = null,
-  val surname: String? = null,
-)
-
-data class CaseSentence(
-  val date: String? = null,
-  val sentencingCourt: SentencingCourt? = null,
-  val releaseDate: String? = null,
-)
-
-data class SentencingCourt(
-  val name: String? = null,
-)
-
-data class ResponsibleProvider(
-  val code: String? = null,
-  val name: String? = null,
-)

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/probationintegrationEPF/fixtures/GetEPFPersonDetailsResponse.json

@@ -8,11 +8,7 @@
   "dateOfBirth":"2000-03-01",
   "gender": null,
   "sentence": {
-    "date": "2021-03-03",
-    "sentencingCourt": {
-      "name": "Fakecourt"
-    },
-    "releaseDate": "2021-10-10"
+    "expectedReleaseDate": "2021-10-10"
   },
   "responsibleProvider": {
     "code": "999000ABC",
@@ -21,4 +17,4 @@
   "ogrsScore": 123,
   "age": 23,
   "ageAtRelease": 24
-}
+}

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/helpers/CaseDetailsHelper.kt

@@ -4,7 +4,6 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.CaseDetail
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.CaseSentence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Name
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ResponsibleProvider
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SentencingCourt
 
 fun generateCaseDetail(): CaseDetail {
   return CaseDetail(
@@ -17,7 +16,7 @@ fun generateCaseDetail(): CaseDetail {
       ),
     dateOfBirth = "2000-03-01",
     gender = null,
-    sentence = CaseSentence(date = "2021-03-03", sentencingCourt = SentencingCourt("Fakecourt"), releaseDate = "2021-10-10"),
+    sentence = CaseSentence(expectedReleaseDate = "2021-10-10"),
     responsibleProvider =
       ResponsibleProvider(
         code = "999000ABC",