add reservation status

(cherry picked from commit 51c40ff)
alfio-event · Mar 17, 2024 · fac167a · fac167a
1 parent 7702f55
commit fac167a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/main/java/alfio/controller/api/v1/admin/ReservationApiV1Controller.java b/src/main/java/alfio/controller/api/v1/admin/ReservationApiV1Controller.java
@@ -118,7 +118,7 @@ public ResponseEntity<ReservationDetail> retrieveDetail(@PathVariable("purchaseC
             );
         }
         return ResponseEntity.ok(
-            new ReservationDetail(reservationId, new ReservationUser(null, reservation.getFirstName(), reservation.getLastName(), reservation.getEmail(), null), attendeesByCategories, subscriptionOwners)
+            new ReservationDetail(reservationId, reservation.getStatus(), new ReservationUser(null, reservation.getFirstName(), reservation.getLastName(), reservation.getEmail(), null), attendeesByCategories, subscriptionOwners)
         );
     }
 

diff --git a/src/main/java/alfio/model/api/v1/admin/ReservationDetail.java b/src/main/java/alfio/model/api/v1/admin/ReservationDetail.java
@@ -16,21 +16,25 @@
  */
 package alfio.model.api.v1.admin;
 
+import alfio.model.TicketReservation;
 import alfio.model.api.v1.admin.subscription.Owner;
 
 import java.util.List;
 
 public class ReservationDetail {
     private final String id;
+    private final TicketReservation.TicketReservationStatus status;
     private final ReservationUser user;
     private final List<AttendeesByCategory> tickets;
     private final List<Owner> subscriptionOwners;
 
     public ReservationDetail(String id,
+                             TicketReservation.TicketReservationStatus status,
                              ReservationUser user,
                              List<AttendeesByCategory> tickets,
                              List<Owner> subscriptionOwners) {
         this.id = id;
+        this.status = status;
         this.user = user;
         this.tickets = tickets;
         this.subscriptionOwners = subscriptionOwners;
@@ -40,6 +44,10 @@ public String getId() {
         return id;
     }
 
+    public TicketReservation.TicketReservationStatus getStatus() {
+        return status;
+    }
+
     public ReservationUser getUser() {
         return user;
     }

diff --git a/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java b/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java
@@ -204,18 +204,24 @@ void createSingleTicketAndVerifyWithAPI() {
         var reservationId = body.getId();
         assertNotNull(reservationId);
         assertFalse(reservationId.isBlank());
+        var detailResponse = controller.retrieveDetail(PurchaseContext.PurchaseContextType.event, event.getPublicIdentifier(), reservationId, principal);
+        assertNotNull(detailResponse.getBody());
+        var detailBody = detailResponse.getBody();
+        assertEquals(reservationId, detailBody.getId());
+        assertEquals(TicketReservation.TicketReservationStatus.PENDING, detailBody.getStatus());
         var confirmationRequest = new ReservationConfirmationRequest(
             new TransactionDetails("TRID", new BigDecimal("100.00"), LocalDateTime.now(clockProvider.getClock()), "notes", PaymentProxy.ON_SITE),
             new Notification(true, true)
         );
         var confirmationResponse = controller.confirmReservation(reservationId, confirmationRequest, principal);
         assertTrue(confirmationResponse.getStatusCode().is2xxSuccessful());
-        var detailResponse = controller.retrieveDetail(PurchaseContext.PurchaseContextType.event, event.getPublicIdentifier(), reservationId, principal);
+        detailResponse = controller.retrieveDetail(PurchaseContext.PurchaseContextType.event, event.getPublicIdentifier(), reservationId, principal);
         assertNotNull(detailResponse);
         assertTrue(detailResponse.getStatusCode().is2xxSuccessful());
         assertNotNull(detailResponse.getBody());
-        var detailBody = detailResponse.getBody();
+        detailBody = detailResponse.getBody();
         assertEquals(reservationId, detailBody.getId());
+        assertEquals(TicketReservation.TicketReservationStatus.COMPLETE, detailBody.getStatus());
         assertNotNull(detailBody.getUser());
         var reservationUser = detailBody.getUser();
         assertEquals("Test", reservationUser.getFirstName());