Bank List Provider change

CommerceWeavers · Oct 30, 2024 · 2a21040 · 2a21040
1 parent c9d0e6d
commit 2a21040
Show file tree

Hide file tree

Showing 15 changed files with 400 additions and 21 deletions.
diff --git a/config/config/sylius_fixtures.php b/config/config/sylius_fixtures.php
@@ -4,6 +4,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use CommerceWeavers\SyliusTpayPlugin\Tpay\PayGroup;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\PaymentType;
 use Symfony\Config\SyliusFixturesConfig;
 

diff --git a/config/services/context_provider.php b/config/services/context_provider.php
@@ -12,7 +12,7 @@
 
     $services->set(BankListContextProvider::class)
         ->args([
-            service('commerce_weavers_sylius_tpay.tpay.provider.tpay_api_bank_list'),
+            service('commerce_weavers_sylius_tpay.tpay.provider.validated_tpay_api_bank_list'),
         ])
         ->tag('sylius.ui.template_event.context_provider')
     ;

diff --git a/config/services/form.php b/config/services/form.php
@@ -5,7 +5,6 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use CommerceWeavers\SyliusTpayPlugin\Form\DataTransformer\CardTypeDataTransformer;
-use CommerceWeavers\SyliusTpayPlugin\Form\DataTransformer\VisaMobilePhoneDataTransformer;
 use CommerceWeavers\SyliusTpayPlugin\Form\EventListener\DecryptGatewayConfigListener;
 use CommerceWeavers\SyliusTpayPlugin\Form\EventListener\EncryptGatewayConfigListener;
 use CommerceWeavers\SyliusTpayPlugin\Form\EventListener\PreventSavingEmptyPasswordFieldsListener;
@@ -17,7 +16,7 @@
 use CommerceWeavers\SyliusTpayPlugin\Form\Type\TpayPaymentDetailsType;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\TpayGatewayFactory;
 
-return function(ContainerConfigurator $container): void {
+return static function(ContainerConfigurator $container): void {
     $services = $container->services();
 
     $services->set(CompleteTypeExtension::class)

diff --git a/config/services/tpay.php b/config/services/tpay.php
@@ -19,8 +19,9 @@
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateRedirectBasedPaymentPayloadFactoryInterface;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateVisaMobilePaymentPayloadFactory;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateVisaMobilePaymentPayloadFactoryInterface;
-use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\TpayApiBankListProvider;
-use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\TpayApiBankListProviderInterface;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\AvailableTpayChannelListProvider;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\AvailableTpayChannelListProviderInterface;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\ValidTpayChannelListProvider;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Resolver\CachedTpayTransactionChannelResolver;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Resolver\TpayTransactionChannelResolver;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Security\Notification\Factory\BasicPaymentFactory;
@@ -149,18 +150,27 @@
         ->alias(SignatureVerifierInterface::class, 'commerce_weavers_sylius_tpay.tpay.security.notification.verifier.signature')
     ;
 
-    $services->set('commerce_weavers_sylius_tpay.tpay.provider.tpay_api_bank_list', TpayApiBankListProvider::class)
+    $services->set('commerce_weavers_sylius_tpay.tpay.provider.available_tpay_api_bank_list', AvailableTpayChannelListProvider::class)
         ->args([
             service('commerce_weavers_sylius_tpay.tpay.resolver.tpay_transaction_channel_resolver'),
         ])
-        ->alias(TpayApiBankListProviderInterface::class, 'commerce_weavers_sylius_tpay.tpay.provider.tpay_api_bank_list')
+        ->alias(AvailableTpayChannelListProviderInterface::class, 'commerce_weavers_sylius_tpay.tpay.provider.available_tpay_api_bank_list')
+    ;
+
+    $services->set('commerce_weavers_sylius_tpay.tpay.provider.validated_tpay_api_bank_list', ValidTpayChannelListProvider::class)
+        ->args([
+            service('commerce_weavers_sylius_tpay.tpay.provider.available_tpay_api_bank_list'),
+            service('sylius.repository.gateway_config'),
+            service('payum.dynamic_gateways.cypher')
+        ])
+        ->alias(AvailableTpayChannelListProviderInterface::class, 'commerce_weavers_sylius_tpay.tpay.provider.validated_tpay_api_bank_list')
     ;
 
     $services->set('commerce_weavers_sylius_tpay.tpay.resolver.tpay_transaction_channel_resolver', TpayTransactionChannelResolver::class)
         ->args([
             service('payum'),
         ])
-        ->alias(TpayApiBankListProviderInterface::class, 'commerce_weavers_sylius_tpay.tpay.resolver.tpay_transaction_channel_resolver')
+        ->alias(AvailableTpayChannelListProviderInterface::class, 'commerce_weavers_sylius_tpay.tpay.resolver.tpay_transaction_channel_resolver')
     ;
 
     $services->set('commerce_weavers_sylius_tpay.tpay.resolver.cached_tpay_transaction_channel_resolver', CachedTpayTransactionChannelResolver::class)

diff --git a/src/ContextProvider/BankListContextProvider.php b/src/ContextProvider/BankListContextProvider.php
@@ -4,20 +4,22 @@
 
 namespace CommerceWeavers\SyliusTpayPlugin\ContextProvider;
 
-use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\TpayApiBankListProviderInterface;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\ValidTpayChannelListProviderInterface;
 use Sylius\Bundle\UiBundle\ContextProvider\ContextProviderInterface;
 use Sylius\Bundle\UiBundle\Registry\TemplateBlock;
 use Sylius\Component\Core\Model\OrderInterface;
 
 final class BankListContextProvider implements ContextProviderInterface
 {
     public function __construct(
-        private readonly TpayApiBankListProviderInterface $bankListProvider,
+        private readonly ValidTpayChannelListProviderInterface $validatedTpayApiBankListProvider,
     ) {
     }
 
     public function provide(array $templateContext, TemplateBlock $templateBlock): array
     {
+        // TODO this is runned few many times when on checkout/complete/choice-item
+        // propably there it should not be runned totaly but on summary step only
         if (isset($templateContext['order'])) {
             /** @var OrderInterface $order */
             $order = $templateContext['order'];
@@ -27,7 +29,7 @@ public function provide(array $templateContext, TemplateBlock $templateBlock): a
             }
         }
 
-        $templateContext['banks'] = $this->bankListProvider->provide();
+        $templateContext['banks'] = $this->validatedTpayApiBankListProvider->provide();
 
         return $templateContext;
     }

diff --git a/src/Form/Type/TpayPaymentDetailsType.php b/src/Form/Type/TpayPaymentDetailsType.php
@@ -5,6 +5,7 @@
 namespace CommerceWeavers\SyliusTpayPlugin\Form\Type;
 
 use CommerceWeavers\SyliusTpayPlugin\Validator\Constraint\EncodedGooglePayToken;
+use CommerceWeavers\SyliusTpayPlugin\Validator\Constraint\ValidTpayApiChannel;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TelType;
@@ -70,9 +71,14 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             )
             ->add(
                 'tpay_channel_id',
+
                 HiddenType::class,
                 [
                     'property_path' => '[tpay_channel_id]',
+                    'validation_groups' => ['sylius_checkout_complete'],
+                    'constraints' => [
+                        new ValidTpayApiChannel(groups: ['sylius_checkout_complete']),
+                    ],
                 ],
             )
             ->add(

diff --git a/...Tpay/Provider/TpayApiBankListProvider.php → ...ider/AvailableTpayChannelListProvider.php b/...Tpay/Provider/TpayApiBankListProvider.php → ...ider/AvailableTpayChannelListProvider.php
@@ -6,7 +6,7 @@
 
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Resolver\TpayTransactionChannelResolverInterface;
 
-final class TpayApiBankListProvider implements TpayApiBankListProviderInterface
+final class AvailableTpayChannelListProvider implements AvailableTpayChannelListProviderInterface
 {
     public function __construct(
         private readonly TpayTransactionChannelResolverInterface $channelResolver,
@@ -30,11 +30,7 @@ public function provide(): array
          * }
          */
         return array_filter($result, static function (array $channel) {
-            return
-                ($channel['instantRedirection'] ?? false) === true &&
-                ($channel['onlinePayment'] ?? false) === true &&
-                ($channel['available'] ?? false) === true
-            ;
+            return ($channel['available'] ?? false) === true;
         });
     }
 }
diff --git a/...ider/TpayApiBankListProviderInterface.php → ...lableTpayChannelListProviderInterface.php b/...ider/TpayApiBankListProviderInterface.php → ...lableTpayChannelListProviderInterface.php
@@ -4,7 +4,7 @@
 
 namespace CommerceWeavers\SyliusTpayPlugin\Tpay\Provider;
 
-interface TpayApiBankListProviderInterface
+interface AvailableTpayChannelListProviderInterface
 {
     /** @return array{
      *     id: string,

diff --git a/src/Tpay/Provider/ValidTpayChannelListProvider.php b/src/Tpay/Provider/ValidTpayChannelListProvider.php
@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Tpay\Provider;
+
+use CommerceWeavers\SyliusTpayPlugin\Payum\Exception\UnableToGetBankListException;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\PayGroup;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\PaymentType;
+use Payum\Core\Model\GatewayConfigInterface;
+use Payum\Core\Security\CypherInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Webmozart\Assert\Assert;
+
+final class ValidTpayChannelListProvider implements ValidTpayChannelListProviderInterface
+{
+    public function __construct(
+        private readonly AvailableTpayChannelListProviderInterface $availableTpayApiBankListProvider,
+        private readonly RepositoryInterface $gatewayRepository,
+        private readonly CypherInterface $cypher,
+    ) {
+    }
+
+    public function provide(): array
+    {
+        $availableChannels = $this->availableTpayApiBankListProvider->provide();
+
+        /** @var GatewayConfigInterface[] $tpayGatewayConfigs */
+        $tpayGatewayConfigs = $this->gatewayRepository->findBy(['gatewayName' => 'tpay']);
+
+        Assert::notEmpty($tpayGatewayConfigs, 'There is no gateway config of Tpay type available');
+
+        if (count($tpayGatewayConfigs) === 1 &&
+            $tpayGatewayConfigs[0]->getConfig()['type'] === PaymentType::PAY_BY_LINK
+        ) {
+            return $availableChannels;
+        }
+
+        $paymentMethodsToRemoveByGroupId = [];
+        $hasPblPaymentAvailable = false;
+        foreach ($tpayGatewayConfigs as $tpayGatewayConfig) {
+            // cached doctrine values are encrypted hence need for decrypt
+            $tpayGatewayConfig->decrypt($this->cypher);
+            $config = $tpayGatewayConfig->getConfig();
+
+            if (!array_key_exists('type', $config)) {
+                continue;
+            }
+
+            if ($hasPblPaymentAvailable === false && $config['type'] === PaymentType::PAY_BY_LINK) {
+                $hasPblPaymentAvailable = true;
+            }
+
+            match ($config['type']) {
+                PaymentType::VISA_MOBILE => $paymentMethodsToRemoveByGroupId[] = PayGroup::VISA_MOBILE,
+                PaymentType::APPLE_PAY => $paymentMethodsToRemoveByGroupId[] = PayGroup::APPLE_PAY,
+                PaymentType::GOOGLE_PAY => $paymentMethodsToRemoveByGroupId[] = PayGroup::GOOGLE_PAY,
+                PaymentType::BLIK => $paymentMethodsToRemoveByGroupId[] = PayGroup::BLIK,
+                default => null,
+            };
+        }
+
+        if (!$hasPblPaymentAvailable) {
+            throw new UnableToGetBankListException(
+                'Bank list cannot be retrieved if there is no payment method with PayByLink type configured'
+            );
+        }
+
+        foreach ($availableChannels as $availableChannel) {
+            $channelId = (int) $availableChannel['id'];
+            if (in_array($channelId, $paymentMethodsToRemoveByGroupId, true)) {
+                unset($availableChannels[$channelId]);
+            }
+        }
+
+        return $availableChannels;
+    }
+}
diff --git a/src/Tpay/Provider/ValidTpayChannelListProviderInterface.php b/src/Tpay/Provider/ValidTpayChannelListProviderInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Tpay\Provider;
+
+interface ValidTpayChannelListProviderInterface
+{
+    public function provide(): array;
+}
diff --git a/src/Validator/Constraint/ValidTpayApiChannel.php b/src/Validator/Constraint/ValidTpayApiChannel.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Validator\Constraint;
+
+use Symfony\Component\Validator\Constraint;
+
+final class ValidTpayApiChannel extends Constraint
+{
+    public string $message = 'commerce_weavers_sylius_tpay.shop.pay.tpay_channel.not_valid';
+
+    public const NOT_VALID_CHANNEL_ERROR = '632f97f3-c302-409b-a321-ec078194302d';
+
+    public function getTargets(): string
+    {
+        return self::PROPERTY_CONSTRAINT;
+    }
+}
diff --git a/src/Validator/Constraint/ValidTpayApiChannelValidator.php b/src/Validator/Constraint/ValidTpayApiChannelValidator.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Validator\Constraint;
+
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\ValidTpayChannelListProviderInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+final class ValidTpayApiChannelValidator extends ConstraintValidator
+{
+    public function __construct(
+        private readonly ValidTpayChannelListProviderInterface $validatedTpayApiBankListProvider,
+    ) {
+    }
+
+    public function validate($value, Constraint $constraint): void
+    {
+        $validChannels = $this->validatedTpayApiBankListProvider->provide();
+
+        if (array_key_exists($value, $validChannels)) {
+            return;
+        }
+
+        $this->context->buildViolation($constraint->message)
+            ->setCode($constraint::NOT_VALID_CHANNEL_ERROR)
+            ->addViolation()
+        ;
+    }
+}
diff --git a/tests/Unit/ContextProvider/BankListContextProviderTest.php b/tests/Unit/ContextProvider/BankListContextProviderTest.php
@@ -5,7 +5,7 @@
 namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\ContextProvider;
 
 use CommerceWeavers\SyliusTpayPlugin\ContextProvider\BankListContextProvider;
-use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\TpayApiBankListProviderInterface;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\AvailableTpayChannelListProviderInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -17,10 +17,10 @@ class BankListContextProviderTest extends TestCase
 {
     use ProphecyTrait;
 
-    private TpayApiBankListProviderInterface|ObjectProphecy $bankListProvider;
+    private AvailableTpayChannelListProviderInterface|ObjectProphecy $bankListProvider;
     protected function setUp(): void
     {
-        $this->bankListProvider = $this->prophesize(TpayApiBankListProviderInterface::class);
+        $this->bankListProvider = $this->prophesize(AvailableTpayChannelListProviderInterface::class);
     }
 
     public function test_it_does_not_support_some_template_event_and_pay_by_link_template_name(): void