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

PI-2383 - add arrival and departure date to contact record #4146

Merged
merged 6 commits into from
Aug 7, 2024
Merged

PI-2383 - add arrival and departure date to contact record #4146

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
963d4df
PI-2383 - add arrival and departure date to contact record
achimber-moj Aug 7, 2024
d35d450
Formatting changes
probation-integration-bot[bot] Aug 7, 2024
c8c70ca
Update projects/approved-premises-and-delius/src/main/kotlin/uk/gov/j…
achimber-moj Aug 7, 2024
d37bbb5
Formatting changes
probation-integration-bot[bot] Aug 7, 2024
f26f460
PI-2383 - add arrival and departure date to contact record
achimber-moj Aug 7, 2024
005a5b2
PI-2383 - add arrival and departure date to contact record
achimber-moj Aug 7, 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
8 changes: 7 additions & 1 deletion ...c/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationInactiveTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,13 @@ internal class MessagingIntegrationInactiveTest {
assertThat(contact.description, equalTo("Approved Premises Booking for Hope House"))
assertThat(
contact.notes,
equalTo("To view details of the Approved Premises booking, click here: https://approved-premises-dev.hmpps.service.justice.gov.uk/applications/484b8b5e-6c3b-4400-b200-425bbe410713")
equalTo(
"""
Current: 30/01/2023 to 30/04/2023
achimber-moj marked this conversation as resolved.
Show resolved Hide resolved

To view details of the Approved Premises booking, click here: https://approved-premises-dev.hmpps.service.justice.gov.uk/applications/484b8b5e-6c3b-4400-b200-425bbe410713
""".trimIndent()
)
)
assertThat(contact.locationId, equalTo(OfficeLocationGenerator.DEFAULT.id))
assertThat(contact.eventId, equalTo(PersonGenerator.INACTIVE_EVENT.id))
Expand Down
8 changes: 7 additions & 1 deletion ...elius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,13 @@ internal class MessagingIntegrationTest {
assertThat(contact.description, equalTo("Approved Premises Booking for Hope House"))
assertThat(
contact.notes,
equalTo("To view details of the Approved Premises booking, click here: https://approved-premises-dev.hmpps.service.justice.gov.uk/applications/484b8b5e-6c3b-4400-b200-425bbe410713")
equalTo(
"""
Current: 30/01/2023 to 30/04/2023

To view details of the Approved Premises booking, click here: https://approved-premises-dev.hmpps.service.justice.gov.uk/applications/484b8b5e-6c3b-4400-b200-425bbe410713
""".trimIndent()
)
)
assertThat(contact.locationId, equalTo(OfficeLocationGenerator.DEFAULT.id))
assertThat(contact.eventId, equalTo(PersonGenerator.EVENT.id))
Expand Down
10 changes: 9 additions & 1 deletion ...emises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,15 @@ class ReferralService(
ContactDetails(
date = details.bookingMadeAt,
type = ContactTypeCode.BOOKING_MADE,
notes = "To view details of the Approved Premises booking, click here: ${details.applicationUrl}",
notes = listOfNotNull(
"Current: ${DeliusDateFormatter.format(details.arrivalOn)} to ${
DeliusDateFormatter.format(
details.departureOn
)
}",
"To view details of the Approved Premises booking, click here: ${details.applicationUrl}"
)
.joinToString(System.lineSeparator() + System.lineSeparator()),
achimber-moj marked this conversation as resolved.
Show resolved Hide resolved
description = "Approved Premises Booking for ${details.premises.name}",
locationCode = ap.locationCode()
),
Expand Down
Loading