Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hia 662 #371

Merged
merged 5 commits into from
Feb 12, 2024
Merged

Hia 662 #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
450e7df
[HIA-662]
AlexHerbertMadeTech Feb 9, 2024
146cffb
[HIA-662]
AlexHerbertMadeTech Feb 9, 2024
c30ff9f
[HIA-662]
AlexHerbertMadeTech Feb 12, 2024
db4d8dd
[HIA-662]
AlexHerbertMadeTech Feb 12, 2024
baff5ed
[HIA-662]
AlexHerbertMadeTech Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions ...ov/justice/digital/hmpps/hmppsintegrationapi/models/prisoneroffendersearch/POSPrisoner.kt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@ data class POSPrisoner(
val pncNumber: String? = null,
val croNumber: String? = null,
) {
fun toPerson(): Person = Person(
firstName = this.firstName,
lastName = this.lastName,
middleName = this.middleNames,
dateOfBirth = this.dateOfBirth,
gender = this.gender,
ethnicity = this.ethnicity,
aliases = this.aliases.map { it.toAlias() },
identifiers = Identifiers(
nomisNumber = this.prisonerNumber,
croNumber = this.croNumber,
),
pncId = this.pncNumber,
hmppsId = this.pncNumber,
)
fun toPerson(): Person =
Person(
firstName = this.firstName,
lastName = this.lastName,
middleName = this.middleNames,
dateOfBirth = this.dateOfBirth,
gender = this.gender,
ethnicity = this.ethnicity,
aliases = this.aliases.map { it.toAlias() },
identifiers =
Identifiers(
nomisNumber = this.prisonerNumber,
croNumber = this.croNumber,
),
pncId = this.pncNumber,
)
}
36 changes: 19 additions & 17 deletions .../gov/justice/digital/hmpps/hmppsintegrationapi/models/probationoffendersearch/Offender.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,23 @@ data class Offender(
val contactDetails: ContactDetailsWithEmailAndPhone? = null,
val otherIds: OtherIds = OtherIds(),
) {
fun toPerson(): Person = Person(
firstName = this.firstName,
lastName = this.surname,
middleName = this.middleNames.joinToString(" ").ifEmpty { "" },
dateOfBirth = this.dateOfBirth,
gender = this.gender,
ethnicity = this.offenderProfile.ethnicity,
aliases = this.offenderAliases.map { it.toAlias() },
identifiers = Identifiers(
nomisNumber = otherIds.nomsNumber,
croNumber = otherIds.croNumber,
deliusCrn = otherIds.crn,
),
pncId = otherIds.pncNumber,
hmppsId = otherIds.pncNumber,
contactDetails = this.contactDetails?.toContactdetails(),
)
fun toPerson(): Person =
Person(
firstName = this.firstName,
lastName = this.surname,
middleName = this.middleNames.joinToString(" ").ifEmpty { "" },
dateOfBirth = this.dateOfBirth,
gender = this.gender,
ethnicity = this.offenderProfile.ethnicity,
aliases = this.offenderAliases.map { it.toAlias() },
identifiers =
Identifiers(
nomisNumber = otherIds.nomsNumber,
croNumber = otherIds.croNumber,
deliusCrn = otherIds.crn,
),
pncId = otherIds.pncNumber,
hmppsId = otherIds.crn,
contactDetails = this.contactDetails?.toContactdetails(),
)
}
32 changes: 17 additions & 15 deletions ...v/justice/digital/hmpps/hmppsintegrationapi/models/prisoneroffendersearch/PrisonerTest.kt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,27 @@ import io.kotest.matchers.shouldBe
import io.kotest.matchers.types.shouldBeTypeOf
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Alias
import java.time.LocalDate

class PrisonerTest : DescribeSpec(
{
describe("#toPerson") {
it("maps one-to-one attributes to person attributes") {
val prisoner = POSPrisoner(
firstName = "First Name",
lastName = "Last Name",
middleNames = "Middle Name",
dateOfBirth = LocalDate.parse("2023-03-01"),
gender = "Gender",
ethnicity = "Ethnicity",
prisonerNumber = "prisonerNumber",
pncNumber = "pncNumber",
croNumber = "croNumber",
aliases = listOf(
POSPrisonerAlias(firstName = "Alias First Name", lastName = "Alias Last Name"),
),
)
val prisoner =
POSPrisoner(
firstName = "First Name",
lastName = "Last Name",
middleNames = "Middle Name",
dateOfBirth = LocalDate.parse("2023-03-01"),
gender = "Gender",
ethnicity = "Ethnicity",
prisonerNumber = "prisonerNumber",
pncNumber = "pncNumber",
croNumber = "croNumber",
aliases =
listOf(
POSPrisonerAlias(firstName = "Alias First Name", lastName = "Alias Last Name"),
),
)

val person = prisoner.toPerson()

Expand All @@ -38,7 +41,6 @@ class PrisonerTest : DescribeSpec(
person.identifiers.croNumber.shouldBe(prisoner.croNumber)
person.identifiers.deliusCrn.shouldBeNull()
person.pncId.shouldBe(prisoner.pncNumber)
person.hmppsId.shouldBe(prisoner.pncNumber)
}
}
},
Expand Down
50 changes: 27 additions & 23 deletions .../justice/digital/hmpps/hmppsintegrationapi/models/probationoffendersearch/OffenderTest.kt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,26 @@ class OffenderTest : DescribeSpec(
{
describe("#toPerson") {
it("maps one-to-one attributes to person attributes") {
val offender = Offender(
firstName = "First Name",
surname = "Surname",
middleNames = listOf("Middle Name"),
dateOfBirth = LocalDate.parse("2023-03-01"),
gender = "Gender",
offenderProfile = OffenderProfile(ethnicity = "Ethnicity"),
offenderAliases = listOf(
OffenderAlias(firstName = "Alias First Name", surname = "Alias Surname"),
),
otherIds = OtherIds(
pncNumber = "pncNumber",
nomsNumber = "nomsNumber",
croNumber = "croNumber",
crn = "crn",
),
)
val offender =
Offender(
firstName = "First Name",
surname = "Surname",
middleNames = listOf("Middle Name"),
dateOfBirth = LocalDate.parse("2023-03-01"),
gender = "Gender",
offenderProfile = OffenderProfile(ethnicity = "Ethnicity"),
offenderAliases =
listOf(
OffenderAlias(firstName = "Alias First Name", surname = "Alias Surname"),
),
otherIds =
OtherIds(
pncNumber = "pncNumber",
nomsNumber = "nomsNumber",
croNumber = "croNumber",
crn = "crn",
),
)

val person = offender.toPerson()

Expand All @@ -42,15 +45,16 @@ class OffenderTest : DescribeSpec(
person.identifiers.croNumber.shouldBe(offender.otherIds.croNumber)
person.identifiers.deliusCrn.shouldBe(offender.otherIds.crn)
person.pncId.shouldBe(offender.otherIds.pncNumber)
person.hmppsId.shouldBe(offender.otherIds.pncNumber)
person.hmppsId.shouldBe(offender.otherIds.crn)
}

it("returns null when no middle names") {
val prisoner = Offender(
firstName = "First Name",
surname = "Surname",
middleNames = listOf(),
)
val prisoner =
Offender(
firstName = "First Name",
surname = "Surname",
middleNames = listOf(),
)

val person = prisoner.toPerson()

Expand Down
Loading