#333 add UPDATE_TICKET_CATEGORY event for auditing

alfio-event · Sep 20, 2017 · f1aa5ab · f1aa5ab
1 parent 66c32b7
commit f1aa5ab
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/main/java/alfio/manager/EventManager.java b/src/main/java/alfio/manager/EventManager.java
@@ -99,6 +99,7 @@ public class EventManager {
     private final Flyway flyway;
     private final Environment environment;
     private final OrganizationRepository organizationRepository;
+    private final AuditingRepository auditingRepository;
 
 
     public Event getSingleEvent(String eventName, String username) {
@@ -568,6 +569,11 @@ private void updateCategory(TicketCategoryModification tc, boolean freeOfCharge,
         handlePriceChange(event, original, updated);
 
         insertOrUpdateTicketCategoryDescription(tc.getId(), tc, event);
+
+        //
+
+        auditingRepository.insertUpdateTicketInCategoryId(tc.getId());
+
     }
 
     private void handleTicketAllocationStrategyChange(Event event, TicketCategory original, TicketCategoryModification updated) {

diff --git a/src/main/java/alfio/model/Audit.java b/src/main/java/alfio/model/Audit.java
@@ -33,7 +33,7 @@ public enum EntityType {
     }
 
     public enum EventType {
-        RESERVATION_CREATE, RESERVATION_COMPLETE, RESERVATION_OFFLINE_PAYMENT_CONFIRMED, CANCEL_RESERVATION_EXPIRED, CANCEL_RESERVATION, UPDATE_EVENT, CANCEL_TICKET, REFUND, CHECK_IN, REVERT_CHECK_IN, UPDATE_TICKET
+        RESERVATION_CREATE, RESERVATION_COMPLETE, RESERVATION_OFFLINE_PAYMENT_CONFIRMED, CANCEL_RESERVATION_EXPIRED, CANCEL_RESERVATION, UPDATE_EVENT, CANCEL_TICKET, REFUND, CHECK_IN, REVERT_CHECK_IN, UPDATE_TICKET, UPDATE_TICKET_CATEGORY
     }
 
     private final String reservationId;

diff --git a/src/main/java/alfio/repository/AuditingRepository.java b/src/main/java/alfio/repository/AuditingRepository.java
@@ -53,4 +53,10 @@ default int insert(String reservationId, Integer userId, Integer eventId, Audit.
 
     @Query("select * from auditing_user where reservation_id = :reservationId order by event_time asc")
     List<Audit> findAllForReservation(@Bind("reservationId") String reservationId);
+
+
+
+    @Query("insert into auditing(reservation_id, user_id, event_id, event_type, event_time, entity_type, entity_id, modifications) " +
+        " select tickets_reservation_id, null, event_id, 'UPDATE_TICKET_CATEGORY', sysdate, 'TICKET', concat('', id), null from ticket where category_id = :ticketCategoryId and tickets_reservation_id is not null")
+    int insertUpdateTicketInCategoryId(@Bind("ticketCategoryId") int id);
 }
diff --git a/src/test/java/alfio/manager/EventManagerTest.java b/src/test/java/alfio/manager/EventManagerTest.java
@@ -55,7 +55,7 @@ public class EventManagerTest {{
         TicketCategory updated = mock(TicketCategory.class);
         TicketRepository ticketRepository = it.usesMock(TicketRepository.class);
         NamedParameterJdbcTemplate jdbc = it.usesMock(NamedParameterJdbcTemplate.class);
-        EventManager eventManager = new EventManager(null, null, null, null, null, ticketRepository, null, null, jdbc, null, pluginManager, null, null, null, null, null, null, null);
+        EventManager eventManager = new EventManager(null, null, null, null, null, ticketRepository, null, null, jdbc, null, pluginManager, null, null, null, null, null, null, null, null);
         when(original.getId()).thenReturn(20);
         when(updated.getId()).thenReturn(30);
         when(original.getSrcPriceCts()).thenReturn(1000);
@@ -92,7 +92,7 @@ public class EventManagerTest {{
 
     describe("handlePriceChange", it -> {
         TicketRepository ticketRepository = it.usesMock(TicketRepository.class);
-        EventManager eventManager = new EventManager(null, null, null, null, null, ticketRepository, null, null, null, null, pluginManager, null, null, null, null, null, null, null);
+        EventManager eventManager = new EventManager(null, null, null, null, null, ticketRepository, null, null, null, null, pluginManager, null, null, null, null, null, null, null, null);
         TicketCategory original = mock(TicketCategory.class);
         TicketCategory updated = mock(TicketCategory.class);
         Event event = mock(Event.class);
@@ -130,7 +130,7 @@ public class EventManagerTest {{
     describe("handleTokenModification", it -> {
         SpecialPriceRepository specialPriceRepository = it.usesMock(SpecialPriceRepository.class);
         NamedParameterJdbcTemplate jdbc = it.usesMock(NamedParameterJdbcTemplate.class);
-        EventManager eventManager = new EventManager(null, null, null, null, null, null, specialPriceRepository, null, jdbc, null, pluginManager, null, null, null, null, null, null, null);
+        EventManager eventManager = new EventManager(null, null, null, null, null, null, specialPriceRepository, null, jdbc, null, pluginManager, null, null, null, null, null, null, null, null);
         TicketCategory original = mock(TicketCategory.class);
         TicketCategory updated = mock(TicketCategory.class);
 
@@ -194,7 +194,7 @@ public class EventManagerTest {{
         TicketCategoryRepository ticketCategoryRepository = it.usesMock(TicketCategoryRepository.class);
         TicketCategoryDescriptionRepository ticketCategoryDescriptionRepository = it.usesMock(TicketCategoryDescriptionRepository.class);
         EventRepository eventRepository = it.usesMock(EventRepository.class);
-        EventManager eventManager = new EventManager(null, eventRepository, null, ticketCategoryRepository, ticketCategoryDescriptionRepository, null, null, null, null, null, pluginManager, null, null, null, null, null, null, null);
+        EventManager eventManager = new EventManager(null, eventRepository, null, ticketCategoryRepository, ticketCategoryDescriptionRepository, null, null, null, null, null, pluginManager, null, null, null, null, null, null, null, null);
         Event event = mock(Event.class);
         int availableSeats = 20;
         when(eventRepository.countExistingTickets(0)).thenReturn(availableSeats);
@@ -249,7 +249,7 @@ public class EventManagerTest {{
         TicketCategory ticketCategory = it.usesMock(TicketCategory.class);
 
         OrganizationRepository organizationRepository = it.usesMock(OrganizationRepository.class);
-        EventManager eventManager = new EventManager(userManager, eventRepository, eventDescriptionRepository, ticketCategoryRepository, ticketCategoryDescriptionRepository, ticketRepository, specialPriceRepository, null, null, null, pluginManager, null, null, null, null, null, null, organizationRepository);
+        EventManager eventManager = new EventManager(userManager, eventRepository, eventDescriptionRepository, ticketCategoryRepository, ticketCategoryDescriptionRepository, ticketRepository, specialPriceRepository, null, null, null, pluginManager, null, null, null, null, null, null, organizationRepository, null);
         when(event.getId()).thenReturn(eventId);
         when(event.getOrganizationId()).thenReturn(organizationId);
         Organization organization = mock(Organization.class);