avoid doing query for ENABLE_ITALY_E_INVOICING

alfio-event · Aug 20, 2019 · 4d38016 · 4d38016
1 parent 71480f9
commit 4d38016
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java
@@ -201,7 +201,7 @@ public ResponseEntity<EventWithAdditionalInfo> getEvent(@PathVariable("eventName
                 var formattedEndTime = Formatters.getFormattedDate(event, event.getEnd(), "common.event.time-format", messageSource);
 
                 //invoicing information
-                boolean canGenerateReceiptOrInvoiceToCustomer = configurationManager.canGenerateReceiptOrInvoiceToCustomer(event);
+                boolean canGenerateReceiptOrInvoiceToCustomer = configurationManager.canGenerateReceiptOrInvoiceToCustomer(configurationsValues);
                 boolean euVatCheckingEnabled = EuVatChecker.reverseChargeEnabled(configurationsValues);
                 boolean invoiceAllowed = configurationManager.hasAllConfigurationsForInvoice(configurationsValues) || euVatCheckingEnabled;
                 boolean onlyInvoice = invoiceAllowed && configurationManager.isInvoiceOnly(configurationsValues);

diff --git a/src/main/java/alfio/manager/system/ConfigurationManager.java b/src/main/java/alfio/manager/system/ConfigurationManager.java
@@ -457,6 +457,10 @@ public boolean canGenerateReceiptOrInvoiceToCustomer(EventAndOrganizationId even
         return !isItalianEInvoicingEnabled(event);
     }
 
+    public boolean canGenerateReceiptOrInvoiceToCustomer(Map<ConfigurationKeys, MaybeConfiguration> configurationValues) {
+        return !isItalianEInvoicingEnabled(configurationValues);
+    }
+
     public boolean isInvoiceOnly(EventAndOrganizationId event) {
         var res = getFor(Set.of(GENERATE_ONLY_INVOICE, ENABLE_ITALY_E_INVOICING), ConfigurationLevel.event(event));
         return isInvoiceOnly(res);
@@ -472,7 +476,13 @@ public boolean isInvoiceOnly(Map<ConfigurationKeys, MaybeConfiguration> configur
     }
 
     public boolean isItalianEInvoicingEnabled(EventAndOrganizationId event) {
-        return getFor(ENABLE_ITALY_E_INVOICING, ConfigurationLevel.event(event)).getValueAsBooleanOrDefault(false);
+        var res = getFor(List.of(ENABLE_ITALY_E_INVOICING), ConfigurationLevel.event(event));
+        return isItalianEInvoicingEnabled(res);
+    }
+
+    public boolean isItalianEInvoicingEnabled(Map<ConfigurationKeys, MaybeConfiguration> configurationValues) {
+        Validate.isTrue(configurationValues.containsKey(ENABLE_ITALY_E_INVOICING));
+        return configurationValues.get(ENABLE_ITALY_E_INVOICING).getValueAsBooleanOrDefault(false);
     }
 
     //