diff --git a/projects/refer-and-monitor-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ContactGenerator.kt b/projects/refer-and-monitor-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ContactGenerator.kt index ed9ea17e9f..6a65f91f2d 100644 --- a/projects/refer-and-monitor-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ContactGenerator.kt +++ b/projects/refer-and-monitor-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ContactGenerator.kt @@ -19,7 +19,7 @@ object ContactGenerator { }.associateBy { it.code } val OUTCOMES = ContactOutcome.Code.entries.map { when (it) { - ContactOutcome.Code.COMPLIED, ContactOutcome.Code.SENT_HOME -> generateOutcome( + ContactOutcome.Code.COMPLIED, ContactOutcome.Code.SENT_HOME, ContactOutcome.Code.APPOINTMENT_KEPT -> generateOutcome( it.value, attendance = true, compliantAcceptable = true @@ -37,7 +37,7 @@ object ContactGenerator { compliantAcceptable = false ) - ContactOutcome.Code.RESCHEDULED_SERVICE_REQUEST, ContactOutcome.Code.RESCHEDULED_POP_REQUEST -> generateOutcome( + ContactOutcome.Code.RESCHEDULED_SERVICE_REQUEST -> generateOutcome( it.value, attendance = false, compliantAcceptable = true diff --git a/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/contact/entity/Contact.kt b/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/contact/entity/Contact.kt index 32cade035c..d311b21b15 100644 --- a/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/contact/entity/Contact.kt +++ b/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/contact/entity/Contact.kt @@ -231,11 +231,11 @@ class ContactOutcome( val id: Long ) { enum class Code(val value: String) { + APPOINTMENT_KEPT("APPK"), COMPLIED("ATTC"), FAILED_TO_COMPLY("AFTC"), FAILED_TO_ATTEND("AFTA"), RESCHEDULED_SERVICE_REQUEST("RSSR"), - RESCHEDULED_POP_REQUEST("RSOF"), SENT_HOME("ATSS"), WITHDRAWN("APPW") } diff --git a/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentService.kt b/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentService.kt index 3f71944ef9..5e8bb51a18 100644 --- a/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentService.kt +++ b/projects/refer-and-monitor-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentService.kt @@ -280,7 +280,7 @@ class AppointmentService( private fun noSession(outcome: Outcome) = when (outcome.noSessionReasonType) { NoSessionReasonType.POP_UNACCEPTABLE -> Code.FAILED_TO_COMPLY - NoSessionReasonType.POP_ACCEPTABLE -> Code.RESCHEDULED_POP_REQUEST + NoSessionReasonType.POP_ACCEPTABLE -> Code.APPOINTMENT_KEPT NoSessionReasonType.LOGISTICS -> Code.SENT_HOME else -> throw IllegalArgumentException("Outcome Scenario Not Mapped: $outcome") }