#468 handle correctly when vies is down

alfio-event · Jun 20, 2018 · 12396b8 · 12396b8
1 parent 15774c9
commit 12396b8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/alfio/controller/api/ReservationApiController.java b/src/main/java/alfio/controller/api/ReservationApiController.java
@@ -134,11 +134,17 @@ public ResponseEntity<VatDetail> validateEUVat(@PathVariable("eventName") String
                                                    HttpServletRequest request) {
 
         String country = paymentForm.getVatCountryCode();
-        Optional<Triple<Event, TicketReservation, VatDetail>> vatDetail = eventRepository.findOptionalByShortName(eventName)
-            .flatMap(e -> ticketReservationRepository.findOptionalReservationById(reservationId).map(r -> Pair.of(e, r)))
-            .filter(e -> EnumSet.of(INCLUDED, NOT_INCLUDED).contains(e.getKey().getVatStatus()))
-            .filter(e -> vatChecker.isVatCheckingEnabledFor(e.getKey().getOrganizationId()))
-            .flatMap(e -> vatChecker.checkVat(paymentForm.getVatNr(), country, e.getKey().getOrganizationId()).map(vd -> Triple.of(e.getLeft(), e.getRight(), vd)));
+        Optional<Triple<Event, TicketReservation, VatDetail>> vatDetail;
+        try {
+             vatDetail = eventRepository.findOptionalByShortName(eventName)
+                .flatMap(e -> ticketReservationRepository.findOptionalReservationById(reservationId).map(r -> Pair.of(e, r)))
+                .filter(e -> EnumSet.of(INCLUDED, NOT_INCLUDED).contains(e.getKey().getVatStatus()))
+                .filter(e -> vatChecker.isVatCheckingEnabledFor(e.getKey().getOrganizationId()))
+                .flatMap(e -> vatChecker.checkVat(paymentForm.getVatNr(), country, e.getKey().getOrganizationId()).map(vd -> Triple.of(e.getLeft(), e.getRight(), vd)));
+        } catch (IllegalStateException e) {
+            return new ResponseEntity<>(HttpStatus.SERVICE_UNAVAILABLE);
+        }
+
 
         vatDetail
             .filter(t -> t.getRight().isValid())

diff --git a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
@@ -327,6 +327,7 @@
                     <div class="col-xs-10 text-right">
                         <span id="validation-result" class="text-danger" data-validation-error-msg="{{#i18n}}reservation-page.vat-validation-error [{{vatTranslation}}]{{/i18n}}"
                               data-generic-error-msg="{{#i18n}}reservation-page.vat-error [{{vatTranslation}}]{{/i18n}}"
+                              data-vies-down="{{#i18n}}error.vatVIESDown{{/i18n}}"
                               data-validation-required-msg="{{#i18n}}reservation-page.vat-validation-required [{{vatTranslation}}]{{/i18n}}"></span>
                     </div>
                 </div>

diff --git a/src/main/webapp/resources/js/event/reservation-page.js b/src/main/webapp/resources/js/event/reservation-page.js
@@ -412,6 +412,8 @@
                         vatInput.parent('div').addClass('has-error');
                         if(xhr.status === 400) {
                             resultContainer.html(resultContainer.attr('data-validation-error-msg'));
+                        } else if (xhr.status === 503) {
+                            resultContainer.html(resultContainer.attr('data-vies-down'));
                         } else {
                             resultContainer.html(resultContainer.attr('data-generic-error-msg'));
                         }