Skip to content

Commit 163d39c

Browse files
committed
Update Sentence model
Updated sentence model to have a system source as well as renaming the dataSource field to be service source
1 parent a68ae30 commit 163d39c

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
33
import java.time.LocalDate
44

55
data class Sentence(
6-
val dataSource: UpstreamApi,
6+
val serviceSource: UpstreamApi,
7+
val systemSource: SystemSource,
78
val dateOfSentencing: LocalDate? = null,
89
val description: String? = null,
910
val isActive: Boolean? = null,

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.ndelius
22

33
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Offence
44
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Sentence
5+
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SystemSource
56
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApi
67
import java.time.LocalDate
78
import java.time.format.DateTimeFormatter
@@ -21,7 +22,8 @@ data class NDeliusSupervision(
2122

2223
fun toSentence(): Sentence {
2324
return Sentence(
24-
dataSource = UpstreamApi.NDELIUS,
25+
serviceSource = UpstreamApi.NDELIUS,
26+
systemSource = SystemSource.PROBATION_SYSTEMS,
2527
dateOfSentencing = if (!this.sentence.date.isNullOrEmpty()) LocalDate.parse(this.sentence.date) else null,
2628
description = this.sentence.description,
2729
fineAmount = null,

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.nomis
22

33
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Sentence
44
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SentenceLength
5+
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SystemSource
56
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApi
67
import java.time.LocalDate
78

@@ -13,7 +14,8 @@ data class NomisSentence(
1314
val terms: List<NomisTerm> = listOf(NomisTerm()),
1415
) {
1516
fun toSentence(): Sentence = Sentence(
16-
dataSource = UpstreamApi.NOMIS,
17+
serviceSource = UpstreamApi.NOMIS,
18+
systemSource = SystemSource.PRISON_SYSTEMS,
1719
dateOfSentencing = this.sentenceDate,
1820
description = this.sentenceTypeDescription,
1921
fineAmount = this.fineAmount,

0 commit comments

Comments
 (0)