Skip to content

Commit 37e4c32

Browse files
committed
fix #412 - add TicketReservations (reservations)
1 parent 9898b8d commit 37e4c32

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/main/java/alfio/manager/AdminReservationManager.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,8 @@ private void removeTicketsFromReservation(TicketReservation reservation, Event e
578578
.addValue("eventId", event.getId())
579579
.addValue("newUuid", UUID.randomUUID().toString())
580580
).toArray(MapSqlParameterSource[]::new);
581+
List<String> reservationIds = ticketRepository.findReservationIds(ticketIds);
582+
List<String> ticketUUIDs = ticketRepository.findUUIDs(ticketIds);
581583
jdbc.batchUpdate(ticketRepository.batchReleaseTickets(), args);
582584
if(!removeReservation) {
583585
//#407 update invoice/receipt model only if the reservation is still "PENDING", otherwise we could lead to accountancy problems
@@ -586,9 +588,9 @@ private void removeTicketsFromReservation(TicketReservation reservation, Event e
586588
auditingRepository.insert(reservationId, userId, event.getId(), eventType, date, RESERVATION, reservationId);
587589
updateInvoiceReceiptModel(event, reservation.getUserLanguage(), reservationId);
588590
}
589-
extensionManager.handleTicketCancelledForEvent(event, ticketRepository.findUUIDs(ticketIds));
591+
extensionManager.handleTicketCancelledForEvent(event, ticketUUIDs);
590592
} else {
591-
extensionManager.handleReservationsCancelledForEvent(event, ticketRepository.findReservationIds(ticketIds));
593+
extensionManager.handleReservationsCancelledForEvent(event, reservationIds);
592594
}
593595
}
594596

src/main/java/alfio/manager/ExtensionManager.java

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import alfio.model.*;
2222
import alfio.model.extension.InvoiceGeneration;
2323
import alfio.repository.EventRepository;
24+
import alfio.repository.TicketReservationRepository;
2425
import lombok.AllArgsConstructor;
2526
import org.springframework.stereotype.Component;
2627

@@ -32,6 +33,7 @@ public class ExtensionManager {
3233

3334
private final ExtensionService extensionService;
3435
private final EventRepository eventRepository;
36+
private final TicketReservationRepository ticketReservationRepository;
3537

3638
public enum ExtensionEvent {
3739
RESERVATION_CONFIRMED,
@@ -129,6 +131,7 @@ private void handleReservationRemoval(Event event, Collection<String> reservatio
129131

130132
Map<String, Object> payload = new HashMap<>();
131133
payload.put("reservationIds", reservationIds);
134+
payload.put("reservations", ticketReservationRepository.findByIds(reservationIds));
132135

133136
syncCall(extensionEvent, event, organizationId, payload, Boolean.class);
134137
}

src/main/java/alfio/repository/TicketReservationRepository.java

+3
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,7 @@ int updateBillingData(@Bind("vatStatus") PriceContainer.VatStatus vatStatus,
174174

175175
@Query("select id, event_id_fk from tickets_reservation where id in (:ids)")
176176
List<ReservationIdAndEventId> getReservationIdAndEventId(@Bind("ids") Collection<String> ids);
177+
178+
@Query("select * from tickets_reservation where id in (:ids)")
179+
List<TicketReservation> findByIds(@Bind("ids") Collection<String> ids);
177180
}

0 commit comments

Comments
 (0)