Update handling of occurrences for unapproved auth

Author: anthony-britton-moj

src/main/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/domain/tap/authorisation/TemporaryAbsenceAuthorisation.kt

@@ -338,12 +338,6 @@ class TemporaryAbsenceAuthorisation(
     schedule = json
   }
 
-  fun clearSchedule() = apply {
-    if (!repeat) {
-      schedule = null
-    }
-  }
-
   companion object {
     val PRISON_CODE = TemporaryAbsenceAuthorisation::prisonCode.name
     val PERSON = TemporaryAbsenceAuthorisation::person.name

src/main/kotlin/uk/gov/justice/digital/hmpps/externalmovementsapi/model/location/Location.kt

@@ -13,6 +13,21 @@ data class Location(
   fun isEmpty(): Boolean = description.isNullOrBlank() && address.isNullOrBlank() && postcode.isNullOrBlank()
   override fun toString(): String = listOfNotNull(description?.trim(), address?.trim(), postcode?.trim()).joinToString()
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (javaClass != other?.javaClass) return false
+
+    other as Location
+
+    if (description != other.description) return false
+    if (address != other.address) return false
+    if (postcode != other.postcode) return false
+
+    return true
+  }
+
+  override fun hashCode(): Int = description?.hashCode() ?: ((0 + (address?.hashCode() ?: 0)) + (postcode?.hashCode() ?: 0))
+
   companion object {
     fun empty(): Location = Location(null, null, null, null)
   }

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

@@ -91,7 +91,7 @@ class CreateScheduledAbsence(
 
     val occurrence = request.asOccurrence(authorisation).calculateStatus { occurrenceStatusRepository.getByCode(it) }
     val locations = (authorisation.locations + occurrence.location).mapTo(linkedSetOf()) { it }
-    authorisation.applyLocations(ChangeAuthorisationLocations(locations)).clearSchedule()
+    authorisation.applyLocations(ChangeAuthorisationLocations(locations))
 
     return ReferenceId(tapOccurrenceRepository.save(occurrence).id)
   }

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

@@ -140,12 +140,18 @@ class SyncTapAuthorisation(
     val occurrences = occurrenceRepository.findByAuthorisationId(id)
     (
       occurrences.mapTo(linkedSetOf()) { it.location }.takeIf { it.isNotEmpty() }
-        ?: request.location?.let { linkedSetOf(it) }
+        ?: request.location?.takeIf { it.isNullOrEmpty() }?.let { linkedSetOf(it) }
       )?.also { applyLocations(ChangeAuthorisationLocations(it)) }
     val schedule = request.schedule()?.also { applySchedule(objectMapper.valueToTree(it)) }
     if (schedule != null && !repeat && status.code != AuthorisationStatus.Code.APPROVED.name) {
-      occurrences.singleOrNull()?.also {
-        it.reschedule(RescheduleOccurrence(start.atTime(schedule.startTime), end.atTime(schedule.returnTime)))
+      occurrences.singleOrNull()?.let { occ ->
+        if (occ.status.code == OccurrenceStatus.Code.SCHEDULED.name) {
+          occurrenceRepository.delete(occ)
+          null
+        } else {
+          occ.reschedule(RescheduleOccurrence(start.atTime(schedule.startTime), end.atTime(schedule.returnTime)))
+          occ.calculateStatus { rdPaths.getReferenceData(OccurrenceStatus::class, it) as OccurrenceStatus }
+        }
       } ?: createOccurrence(objectMapper, rdPaths)
     }
   }

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

@@ -76,7 +76,7 @@ class SyncTapOccurrence(
         }
     occurrenceRepository.flush()
     val locations = occurrenceRepository.findByAuthorisationId(authorisation.id).mapTo(linkedSetOf()) { it.location }
-    authorisation.applyLocations(ChangeAuthorisationLocations(locations)).clearSchedule()
+    authorisation.applyLocations(ChangeAuthorisationLocations(locations))
     return SyncResponse(occurrence.id)
   }