Skip to content

Commit 0a62b91

Browse files
HMAI-282 - Update Personal Relationships API schema (#702)
* Use new api-docs * Fixed contact detailed model and test * Renamed relationship fields * Fix visit restriction integration test * Commit changes made by code formatters * Fix unit tests --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 6272a60 commit 0a62b91

File tree

10 files changed

+1729
-463
lines changed

10 files changed

+1729
-463
lines changed

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

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

33
data class DetailedContact(
44
val contactId: Long,
5-
val title: String?,
5+
val titleCode: String?,
66
val titleDescription: String?,
77
val firstName: String,
88
val lastName: String,
@@ -16,7 +16,7 @@ data class DetailedContact(
1616
val addresses: List<ContactAddress>,
1717
val phoneNumbers: List<ContactPhoneNumber>,
1818
val emailAddresses: List<ContactEmailAddress>,
19-
val gender: String,
19+
val genderCode: String,
2020
val genderDescription: String,
2121
)
2222

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ data class LinkedPrisoner(
1717
)
1818

1919
data class LinkedPrisonerRelationship(
20-
@JsonProperty("relationshipType")
21-
override val relationshipType: String?,
20+
@JsonProperty("relationshipTypeCode")
21+
override val relationshipTypeCode: String?,
2222
@JsonProperty("relationshipTypeDescription")
2323
override val relationshipTypeDescription: String?,
24-
@JsonProperty("relationshipToPrisoner")
25-
override val relationshipToPrisoner: String?,
24+
@JsonProperty("relationshipToPrisonerCode")
25+
override val relationshipToPrisonerCode: String?,
2626
@JsonProperty("relationshipToPrisonerDescription")
2727
override val relationshipToPrisonerDescription: String?,
2828
@JsonProperty("prisonerContactId")

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.DetailedCon
77

88
data class PRDetailedContact(
99
val id: Long,
10-
val title: String?,
10+
val titleCode: String?,
1111
val titleDescription: String?,
1212
val lastName: String,
1313
val firstName: String,
@@ -21,13 +21,13 @@ data class PRDetailedContact(
2121
val addresses: List<Address>,
2222
val phoneNumbers: List<PhoneNumber>,
2323
val emailAddresses: List<EmailAddress>,
24-
val gender: String,
24+
val genderCode: String,
2525
val genderDescription: String,
2626
) {
2727
fun toDetailedContact(): DetailedContact =
2828
DetailedContact(
2929
contactId = this.id,
30-
title = this.title,
30+
titleCode = this.titleCode,
3131
titleDescription = this.titleDescription,
3232
firstName = this.firstName,
3333
lastName = this.lastName,
@@ -41,7 +41,7 @@ data class PRDetailedContact(
4141
addresses = this.addresses.map { it.toContactAddress() },
4242
phoneNumbers = this.phoneNumbers.map { it.toContactPhoneNumber() },
4343
emailAddresses = this.emailAddresses.map { it.toContactEmailAddress() },
44-
gender = this.gender,
44+
genderCode = this.genderCode,
4545
genderDescription = this.genderDescription,
4646
)
4747
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.personalRelationships.interfaces
22

33
interface IRelationship {
4-
val relationshipType: String?
4+
val relationshipTypeCode: String?
55
val relationshipTypeDescription: String?
6-
val relationshipToPrisoner: String?
6+
val relationshipToPrisonerCode: String?
77
val relationshipToPrisonerDescription: String?
88
}

0 commit comments

Comments
 (0)