when validating the payment provider for an event, don't filter out u…

…nconfigured ones (#1101) * when validating the payment provider for an event, don't filter out unconfigured ones, see error 1 in #1100 * refactor: reduce method visibility #1100
alfio-event · Aug 13, 2022 · 30850a6 · 30850a6
1 parent 6b1c40e
commit 30850a6
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/java/alfio/manager/PaymentManager.java b/src/main/java/alfio/manager/PaymentManager.java
@@ -85,7 +85,7 @@ List<Map.Entry<PaymentMethod, Set<PaymentProxy>>> validateSelection(List<Payment
         var paymentContext = new PaymentContext(null, ConfigurationLevel.organization(organizationId));
 
         Map<PaymentMethod, Set<PaymentProxy>> proxiesByMethod = paymentProxies.stream()
-            .flatMap(proxy -> streamActiveProvidersByProxy(proxy, paymentContext))
+            .flatMap(proxy -> streamProvidersByProxyAndCapabilities(proxy, List.of()))
             .map(provider -> Pair.of(provider.getPaymentProxy(), provider.getSupportedPaymentMethods(paymentContext, TransactionRequest.empty())))
             .flatMap(pair -> pair.getValue().stream().map(pm -> Pair.of(pm, pair.getKey()))) // flip
             .collect(Collectors.groupingBy(Pair::getKey, Collectors.mapping(Pair::getValue, Collectors.toSet())));
@@ -95,12 +95,17 @@ List<Map.Entry<PaymentMethod, Set<PaymentProxy>>> validateSelection(List<Payment
             .collect(Collectors.toList());
     }
 
+    private Stream<PaymentProvider> streamProvidersByProxyAndCapabilities(PaymentProxy paymentProxy,
+                                                                  List<Class<? extends Capability>> capabilities) {
+        return paymentProviders.stream()
+            .filter(pp -> pp.getPaymentProxy() == paymentProxy)
+            .filter(filterByCapabilities(capabilities));
+    }
+
     Stream<PaymentProvider> streamActiveProvidersByProxyAndCapabilities(PaymentProxy paymentProxy,
                                                                                 PaymentContext paymentContext,
                                                                                 List<Class<? extends Capability>> capabilities) {
-        return paymentProviders.stream()
-            .filter(pp -> pp.getPaymentProxy() == paymentProxy && pp.isActive(paymentContext))
-            .filter(filterByCapabilities(capabilities));
+        return streamProvidersByProxyAndCapabilities(paymentProxy, capabilities).filter((pp) -> pp.isActive(paymentContext));
     }
 
     private static Predicate<PaymentProvider> filterByCapabilities(List<Class<? extends Capability>> capabilities) {