#287 - clean ticket data before saving it

(cherry picked from commit c390e91)
alfio-event · Nov 5, 2018 · 54656cb · 54656cb
1 parent fa9171e
commit 54656cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/alfio/model/modification/AdminReservationModification.java b/src/main/java/alfio/model/modification/AdminReservationModification.java
@@ -32,6 +32,7 @@
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static java.util.stream.Collectors.toList;
+import static org.apache.commons.lang3.StringUtils.trimToEmpty;
 
 @Getter
 public class AdminReservationModification implements Serializable {
@@ -78,9 +79,9 @@ public CustomerData(@JsonProperty("firstName") String firstName,
                             @JsonProperty("customerReference") String customerReference,
                             @JsonProperty("vatNr") String vatNr,
                             @JsonProperty("vatCountryCode") String vatCountryCode) {
-            this.firstName = firstName;
-            this.lastName = lastName;
-            this.emailAddress = emailAddress;
+            this.firstName = trimToEmpty(firstName);
+            this.lastName = trimToEmpty(lastName);
+            this.emailAddress = trimToEmpty(emailAddress);
             this.billingAddress = billingAddress;
             this.userLanguage = userLanguage;
             this.customerReference = customerReference;
@@ -153,9 +154,9 @@ public Attendee(@JsonProperty("ticketId") Integer ticketId,
                         @JsonProperty("reference") String reference,
                         @JsonProperty("additionalInfo") Map<String, List<String>> additionalInfo) {
             this.ticketId = ticketId;
-            this.firstName = firstName;
-            this.lastName = lastName;
-            this.emailAddress = emailAddress;
+            this.firstName = trimToEmpty(firstName);
+            this.lastName = trimToEmpty(lastName);
+            this.emailAddress = trimToEmpty(emailAddress);
             this.language = language;
             this.reassignmentForbidden = Optional.ofNullable(reassignmentForbidden).orElse(false);
             this.reference = reference;

diff --git a/src/main/webapp/resources/js/admin/feature/reservation/create/reservation-create.html b/src/main/webapp/resources/js/admin/feature/reservation/create/reservation-create.html
@@ -133,7 +133,7 @@ <h5><strong>Row specification</strong></h5>
                         <div class="col-xs-12 col-md-4">
                             <div class="form-group">
                                 <label for="attendee-{{$index}}-emailAddress">E-Mail</label>
-                                <input type="text" class="form-control" id="attendee-{{$index}}-emailAddress" required name="attendee-{{$index}}-emailAddress" ng-model="attendee.emailAddress">
+                                <input type="email" class="form-control" id="attendee-{{$index}}-emailAddress" required name="attendee-{{$index}}-emailAddress" ng-model="attendee.emailAddress">
                             </div>
                         </div>
                         <div class="col-xs-12">