PI-1586 added explicit save to old before new for constraint (#2444)

ministryofjustice · Oct 24, 2023 · 47cd02e · 47cd02e
1 parent 4485596
commit 47cd02e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/services/PrisonManagerService.kt b/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/services/PrisonManagerService.kt
@@ -35,7 +35,10 @@ class PrisonManagerService(
         val staff = getStaff(probationArea, team, allocation.manager, allocationDate)
         val currentPom = prisonManagerRepository.findActiveManagerAtDate(personId, allocationDate)
         val newPom = currentPom.changeTo(personId, allocationDate, probationArea, team, staff)
-        prisonManagerRepository.save(newPom)
+        newPom?.let { new ->
+            currentPom?.let { old -> prisonManagerRepository.saveAndFlush(old) }
+            prisonManagerRepository.save(new)
+        }
     }
 
     private fun getStaff(
@@ -84,6 +87,6 @@ class PrisonManagerService(
         }
         newPom
     } else {
-        this
+        null
     }
 }