Update single auth occurrence handling

Author: anthony-britton-moj

src/main/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/domain/tap/occurrence/TemporaryAbsenceOccurrence.kt

@@ -365,6 +365,11 @@ class TemporaryAbsenceOccurrence(
     this.dpsOnly = false
   }
 
+  fun makeDpsOnly() = apply {
+    dpsOnly = true
+    legacyId = null
+  }
+
   private fun movementStatus(): OccurrenceStatus.Code? = movements.takeIf { it.isNotEmpty() }
     ?.map { it.direction }?.let {
       if (it.contains(TemporaryAbsenceMovement.Direction.IN)) {

src/main/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/service/TapAuthorisationModifications.kt

@@ -74,7 +74,12 @@ class TapAuthorisationModifications(
           throw ConflictException("Temporary absence authorisation not approved")
         } else {
           authorisation.cancel(action, rdSupplier)
-          authorisation.affectedOccurrences().forEach { it.cancel(CancelOccurrence(), rdSupplier) }
+          authorisation.affectedOccurrences().forEach {
+            if (!authorisation.repeat) {
+              it.makeDpsOnly()
+            }
+            it.cancel(CancelOccurrence(), rdSupplier)
+          }
         }
 
         is ChangeAuthorisationAccompaniment -> {
@@ -125,6 +130,9 @@ class TapAuthorisationModifications(
 
   private fun TemporaryAbsenceAuthorisation.updateOccurrenceStatus() {
     affectedOccurrences().forEach {
+      if (!repeat && status.code != APPROVED.name) {
+        it.makeDpsOnly()
+      }
       it.calculateStatus { statusCode -> occurrenceStatusRepository.getByCode(statusCode) }
     }
   }

src/main/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/sync/internal/SyncTapAuthorisation.kt

@@ -14,6 +14,7 @@ import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.referencedata.Re
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.tap.ReferenceDataPaths
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.tap.authorisation.TemporaryAbsenceAuthorisation
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.tap.authorisation.TemporaryAbsenceAuthorisationRepository
+import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.tap.occurrence.TemporaryAbsenceOccurrence
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.tap.occurrence.TemporaryAbsenceOccurrenceRepository
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.tap.referencedata.AccompaniedBy
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.tap.referencedata.AuthorisationStatus
@@ -41,14 +42,19 @@ import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.authorisa
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.authorisation.DenyAuthorisation
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.authorisation.ExpireAuthorisation
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.authorisation.RecategoriseAuthorisation
+import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.occurrence.ChangeOccurrenceAccompaniment
+import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.occurrence.ChangeOccurrenceComments
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.occurrence.ChangeOccurrenceLocation
+import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.occurrence.ChangeOccurrenceTransport
+import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.occurrence.RecategoriseOccurrence
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.occurrence.RescheduleOccurrence
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.location.Location
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.location.isNullOrEmpty
 import uk.gov.justice.digital.hmpps.externalmovementsapi.service.person.PersonSummaryService
 import uk.gov.justice.digital.hmpps.externalmovementsapi.sync.write.SyncResponse
 import uk.gov.justice.digital.hmpps.externalmovementsapi.sync.write.TapAuthorisation
 import java.time.LocalDate.now
+import java.time.LocalDateTime.of
 import java.util.UUID
 
 @Transactional
@@ -170,9 +176,7 @@ class SyncTapAuthorisation(
           occurrenceRepository.delete(occ)
           null
         } else {
-          occ.reschedule(RescheduleOccurrence(start.atTime(schedule.startTime), end.atTime(schedule.returnTime)))
-          request.location?.also { occ.applyLocation(ChangeOccurrenceLocation(it)) }
-          occ.calculateStatus { rdPaths.getReferenceData(OccurrenceStatus::class, it) as OccurrenceStatus }
+          occ.updateFrom(this, request, rdPaths)
         }
       } ?: createOccurrence(objectMapper, rdPaths)
     }
@@ -187,6 +191,27 @@ class SyncTapAuthorisation(
     }?.also(occurrenceRepository::save)
   }
 
+  private fun TemporaryAbsenceOccurrence.updateFrom(
+    authorisation: TemporaryAbsenceAuthorisation,
+    request: TapAuthorisation,
+    rdPaths: ReferenceDataPaths,
+  ) = apply {
+    authorisationPersonAndPrison(authorisation)
+    applyAbsenceCategorisation(
+      RecategoriseOccurrence(absenceType?.code, absenceSubType?.code, absenceReasonCategory?.code, absenceReason.code),
+      rdPaths::getReferenceData,
+    )
+    reschedule(RescheduleOccurrence(of(request.start, request.startTime), of(request.end, request.endTime)))
+    applyLocation(ChangeOccurrenceLocation(request.location ?: Location.empty()))
+    applyAccompaniment(ChangeOccurrenceAccompaniment(request.accompaniedByCode), rdPaths::getReferenceData)
+    applyTransport(ChangeOccurrenceTransport(request.transportCode), rdPaths::getReferenceData)
+    applyComments(ChangeOccurrenceComments(request.comments))
+    makeDpsOnly()
+    calculateStatus {
+      rdPaths.getReferenceData(OccurrenceStatus::class, it) as OccurrenceStatus
+    }
+  }
+
   private fun TemporaryAbsenceAuthorisation.applyAbsenceCategorisation(
     request: TapAuthorisation,
     rdPaths: ReferenceDataPaths,

src/main/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/sync/migrate/MigrateTapRequest.kt

@@ -1,5 +1,6 @@
 package uk.gov.justice.digital.hmpps.externalmovementsapi.sync.migrate
 
+import com.fasterxml.jackson.annotation.JsonIgnore
 import io.swagger.v3.oas.annotations.media.Schema
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.referencedata.ReferenceDataDomain.Code.ABSENCE_REASON
 import uk.gov.justice.digital.hmpps.externalmovementsapi.domain.referencedata.ReferenceDataDomain.Code.ABSENCE_SUB_TYPE
@@ -28,6 +29,7 @@ data class MigrateTapRequest(
   val temporaryAbsences: List<TapAuthorisation>,
   val unscheduledMovements: List<TapMovement>,
 ) {
+  @JsonIgnore
   fun isEmpty(): Boolean = temporaryAbsences.isEmpty() && unscheduledMovements.isEmpty()
 }
 

src/test/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/integration/sync/SyncTapAuthorisationIntTest.kt

@@ -551,6 +551,7 @@ class SyncTapAuthorisationIntTest(
         start = existing.start.atTime(9, 0),
         end = existing.end.atTime(17, 0),
         location = Location.empty(),
+        comments = existing.comments,
         dpsOnly = true,
       ),
     )

src/test/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/integration/tap/authorisation/CancelTapAuthorisationIntTest.kt

@@ -31,6 +31,7 @@ import uk.gov.justice.digital.hmpps.externalmovementsapi.integration.config.Temp
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.AuditHistory
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.AuditedAction
 import uk.gov.justice.digital.hmpps.externalmovementsapi.model.actions.authorisation.CancelAuthorisation
+import java.time.LocalDate
 import java.time.LocalDateTime
 import java.util.UUID
 
@@ -77,7 +78,7 @@ class CancelTapAuthorisationIntTest(
 
   @Test
   fun `200 ok - authorisation cancelled`() {
-    val auth = givenTemporaryAbsenceAuthorisation(temporaryAbsenceAuthorisation())
+    val auth = givenTemporaryAbsenceAuthorisation(temporaryAbsenceAuthorisation(repeat = true))
     val pastOccurrence = givenTemporaryAbsenceOccurrence(
       temporaryAbsenceOccurrence(
         auth,
@@ -99,8 +100,10 @@ class CancelTapAuthorisationIntTest(
     assertThat(saved.status.code).isEqualTo(AuthorisationStatus.Code.CANCELLED.name)
     val previousAbsence = requireNotNull(findTemporaryAbsenceOccurrence(pastOccurrence.id))
     assertThat(previousAbsence.status.code).isEqualTo(OccurrenceStatus.Code.EXPIRED.name)
+    assertThat(previousAbsence.dpsOnly).isFalse
     val absence = requireNotNull(findTemporaryAbsenceOccurrence(occurrence.id))
     assertThat(absence.status.code).isEqualTo(OccurrenceStatus.Code.CANCELLED.name)
+    assertThat(absence.dpsOnly).isFalse
 
     verifyAudit(
       saved,
@@ -122,6 +125,57 @@ class CancelTapAuthorisationIntTest(
     )
   }
 
+  @Test
+  fun `200 ok - single authorisation cancelled`() {
+    val auth = givenTemporaryAbsenceAuthorisation(
+      temporaryAbsenceAuthorisation(
+        repeat = false,
+        start = LocalDate.now().plusDays(1),
+        end = LocalDate.now().plusDays(1),
+      ),
+    )
+    val occ = givenTemporaryAbsenceOccurrence(
+      temporaryAbsenceOccurrence(
+        auth,
+        start = LocalDateTime.now().plusDays(1),
+        end = LocalDateTime.now().plusDays(1),
+      ),
+    )
+    val request = cancelAuthorisationRequest(reason = "Occurrence is delete by nomis")
+
+    val res = cancelAuthorisation(auth.id, request).successResponse<AuditHistory>().content.single()
+    assertThat(res.domainEvents).containsExactly(TemporaryAbsenceAuthorisationCancelled.EVENT_TYPE)
+    assertThat(res.reason).isEqualTo(request.reason)
+    assertThat(res.changes).containsExactly(
+      AuditedAction.Change("status", "Approved", "Cancelled"),
+    )
+
+    val saved = requireNotNull(findTemporaryAbsenceAuthorisation(auth.id))
+    assertThat(saved.status.code).isEqualTo(AuthorisationStatus.Code.CANCELLED.name)
+    val occurrence = requireNotNull(findTemporaryAbsenceOccurrence(occ.id))
+    assertThat(occurrence.status.code).isEqualTo(OccurrenceStatus.Code.CANCELLED.name)
+    assertThat(occurrence.dpsOnly).isTrue
+
+    verifyAudit(
+      saved,
+      RevisionType.MOD,
+      setOf(
+        TemporaryAbsenceAuthorisation::class.simpleName!!,
+        TemporaryAbsenceOccurrence::class.simpleName!!,
+        HmppsDomainEvent::class.simpleName!!,
+      ),
+      ExternalMovementContext.get().copy(username = DEFAULT_USERNAME, reason = request.reason),
+    )
+
+    verifyEventPublications(
+      saved,
+      setOf(
+        TemporaryAbsenceAuthorisationCancelled(auth.person.identifier, auth.id).publication(auth.id),
+        TemporaryAbsenceCancelled(auth.person.identifier, occurrence.id).publication(occurrence.id) { false },
+      ),
+    )
+  }
+
   private fun cancelAuthorisationRequest(
     reason: String? = "Evidence justifying the approval",
   ) = CancelAuthorisation(reason)