#135 save diff for ticket update, fix reservation-page issue when the reservation is free

Author: syjer

build.gradle

@@ -165,6 +165,7 @@ dependencies {
     compile 'com.atlassian.commonmark:commonmark:0.9.0'
     compile 'com.ryantenney.passkit4j:passkit4j:2.0.1'
     compile 'com.github.ben-manes.caffeine:caffeine:2.5.2'
+    compile 'de.danielbechler:java-object-diff:0.95-RC5'
 
     testCompile "org.springframework:spring-test:$springVersion"
     testCompile "com.insightfullogic:lambda-behave:0.3"

src/main/java/alfio/manager/TicketReservationManager.java

@@ -41,7 +41,12 @@
 import alfio.repository.*;
 import alfio.repository.user.OrganizationRepository;
 import alfio.util.*;
+import de.danielbechler.diff.ObjectDifferBuilder;
+import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.Visit;
+import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.tuple.Pair;
@@ -56,6 +61,7 @@
 import org.springframework.transaction.support.TransactionTemplate;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.time.Clock;
 import java.time.ZoneId;
@@ -922,6 +928,9 @@ public void updateTicketOwner(Ticket ticket,
                                   PartialTicketTextGenerator ownerChangeTextBuilder,
                                   Optional<UserDetails> userDetails) {
 
+        Ticket preUpdateTicket = ticketRepository.findByUUID(ticket.getUuid());
+        Map<String, String> preUpdateTicketFields = ticketFieldRepository.findAllByTicketId(ticket.getId()).stream().collect(Collectors.toMap(TicketFieldValue::getName, TicketFieldValue::getValue));
+
         String newEmail = updateTicketOwner.getEmail().trim();
         CustomerName customerName = new CustomerName(updateTicketOwner.getFullName(), updateTicketOwner.getFirstName(), updateTicketOwner.getLastName(), event);
         ticketRepository.updateTicketOwner(ticket.getUuid(), newEmail, customerName.getFullName(), customerName.getFirstName(), customerName.getLastName());
@@ -958,6 +967,52 @@ public void updateTicketOwner(Ticket ticket,
             ticketReservationRepository.updateAssignee(reservation.getId(), username);
         }
         pluginManager.handleTicketAssignment(newTicket);
+
+
+
+        Ticket postUpdateTicket = ticketRepository.findByUUID(ticket.getUuid());
+        Map<String, String> postUpdateTicketFields = ticketFieldRepository.findAllByTicketId(ticket.getId()).stream().collect(Collectors.toMap(TicketFieldValue::getName, TicketFieldValue::getValue));
+
+        DiffNode diffTicket = ObjectDifferBuilder.buildDefault().compare(postUpdateTicket, preUpdateTicket);
+        DiffNode diffTicketFields = ObjectDifferBuilder.buildDefault().compare(postUpdateTicketFields, preUpdateTicketFields);
+        FieldChangesSaver diffTicketVisitor = new FieldChangesSaver(preUpdateTicket, postUpdateTicket);
+        FieldChangesSaver diffTicketFieldsVisitor = new FieldChangesSaver(preUpdateTicketFields, postUpdateTicketFields);
+        diffTicket.visit(diffTicketVisitor);
+        diffTicketFields.visit(diffTicketFieldsVisitor);
+
+        List<Map<String, Object>> changes = new ArrayList<>(diffTicketVisitor.changes);
+        changes.addAll(diffTicketFieldsVisitor.changes);
+
+        auditingRepository.insert(ticket.getTicketsReservationId(), null, Audit.EventType.UPDATE_TICKET, new Date(), Audit.EntityType.TICKET, Integer.toString(ticket.getId()), Json.toJson(changes));
+    }
+
+
+    private static class FieldChangesSaver implements DiffNode.Visitor {
+
+        private final Object preBase;
+        private final Object postBase;
+
+        private final List<Map<String, Object>> changes = new ArrayList<>();
+
+
+        FieldChangesSaver(Object preBase, Object postBase) {
+            this.preBase = preBase;
+            this.postBase = postBase;
+        }
+
+        @Override
+        public void node(DiffNode node, Visit visit) {
+            if(node.hasChanges() && node.getState() != DiffNode.State.UNTOUCHED && !node.isRootNode()) {
+                Object baseValue = node.canonicalGet(preBase);
+                Object workingValue = node.canonicalGet(postBase);
+                HashMap<String, Object> change = new HashMap<>();
+                change.put("propertyName", node.getPath().toString());
+                change.put("state", node.getState());
+                change.put("oldValue", baseValue);
+                change.put("newValue", workingValue);
+                changes.add(change);
+            }
+        }
     }
 
     private boolean isAdmin(Optional<UserDetails> userDetails) {

src/main/resources/alfio/db/HSQLDB/V19_1.11.8__AUDITING.sql

@@ -23,4 +23,6 @@ create table auditing (
     entity_type varchar(64),
     entity_id varchar(512),
     modifications clob
-);
+);
+
+create index "auditing_reservation_id_idx" on auditing(reservation_id);

src/main/resources/alfio/db/MYSQL/V19_1.11.8__AUDITING.sql

@@ -23,4 +23,6 @@ create table auditing (
     entity_type varchar(64),
     entity_id varchar(512),
     modifications mediumtext
-) ENGINE=InnoDB CHARACTER SET=utf8 COLLATE utf8_bin;;
+) ENGINE=InnoDB CHARACTER SET=utf8 COLLATE utf8_bin;
+
+create index auditing_reservation_id_idx on auditing(reservation_id);

src/main/resources/alfio/db/PGSQL/V19_1.11.8__AUDITING.sql

@@ -23,4 +23,6 @@ create table auditing (
     entity_type varchar(64),
     entity_id varchar(512),
     modifications text
-);
+);
+
+create index "auditing_reservation_id_idx" on auditing(reservation_id);

src/main/webapp/WEB-INF/templates/event/reservation-page.ms

@@ -160,7 +160,7 @@
         {{#field-has-error}}[email]<span class="help-block text-danger">{{#i18n}}{{#field-error}}email{{/field-error}}{{/i18n}}</span>{{/field-has-error}}
     </div>
 
-    {{^orderSummary.free}}
+
 
     <div class="page-header">
         <h2>{{#i18n}}reservation-page.attendees{{/i18n}}</h2>
@@ -193,6 +193,9 @@
     </div>
     <div class="clearfix"></div>
 
+
+    {{^orderSummary.free}}
+
     <div class="page-header wMarginTop">
         <h2>{{#i18n}}reservation-page.payment{{/i18n}}</h2>
     </div>