fix data integrity violation while deleting the reservation

alfio-event · Sep 1, 2015 · 596d706 · 596d706
1 parent dc53089
commit 596d706
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java
@@ -495,8 +495,8 @@ void cleanupExpiredReservations(Date expirationDate) {
         specialPriceRepository.updateStatusForReservation(expiredReservationIds, Status.FREE.toString());
         ticketRepository.resetCategoryIdForUnboundedCategories(expiredReservationIds);
         ticketRepository.freeFromReservation(expiredReservationIds);
-        ticketReservationRepository.remove(expiredReservationIds);
         waitingQueueManager.cleanExpiredReservations(expiredReservationIds);
+        ticketReservationRepository.remove(expiredReservationIds);
     }
 
     void cleanupExpiredOfflineReservations(Date expirationDate) {

diff --git a/src/main/java/alfio/repository/WaitingQueueRepository.java b/src/main/java/alfio/repository/WaitingQueueRepository.java
@@ -47,7 +47,7 @@ public interface WaitingQueueRepository {
     @Query("update waiting_queue set status = :status where ticket_reservation_id = :reservationId")
     int updateStatusByReservationId(@Bind("reservationId") String reservationId, @Bind("status") String status);
 
-    @Query("update waiting_queue set status = 'EXPIRED' where ticket_reservation_id in (:ticketReservationIds)")
+    @Query("update waiting_queue set status = 'EXPIRED', ticket_reservation_id = null where ticket_reservation_id in (:ticketReservationIds)")
     int bulkUpdateExpiredReservations(@Bind("ticketReservationIds") List<String> ticketReservationIds);
 
     @Query("select count(*) from waiting_queue where event_id = :eventId and status = 'WAITING'")