Add SVEA deployment support to the WIX integration

src/BusinessLogic/BootstrapComponent.php

@@ -19,6 +19,7 @@
 use SeQura\Core\BusinessLogic\CheckoutAPI\Checkout\Controller\CheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\ExpressCheckout\Controller\ExpressCheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\CachedPaymentMethodsController;
+use SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\PaymentMethodsCheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\PromotionalWidgets\PromotionalWidgetsCheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\Solicitation\Controller\SolicitationController;
 use SeQura\Core\BusinessLogic\ConfigurationWebhookAPI\Controller\ConfigurationWebhookController;
@@ -902,6 +903,15 @@ static function () {
             }
         );
 
+        ServiceRegister::registerService(
+            PaymentMethodsCheckoutController::class,
+            static function () {
+                return new PaymentMethodsCheckoutController(
+                    ServiceRegister::getService(OrderService::class)
+                );
+            }
+        );
+
         ServiceRegister::registerService(
             PromotionalWidgetsCheckoutController::class,
             static function () {

src/BusinessLogic/CheckoutAPI/CheckoutAPI.php

@@ -10,6 +10,7 @@
 use SeQura\Core\BusinessLogic\CheckoutAPI\ExpressCheckout\Controller\ExpressCheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\Banners\BannerCheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\CachedPaymentMethodsController;
+use SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\PaymentMethodsCheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\PromotionalWidgets\PromotionalWidgetsCheckoutController;
 use SeQura\Core\BusinessLogic\CheckoutAPI\Solicitation\Controller\SolicitationController;
 
@@ -60,6 +61,19 @@ public function cachedPaymentMethods(string $storeId): object
             ->beforeEachMethodOfService(CachedPaymentMethodsController::class);
     }
 
+    /**
+     * @param string $storeId
+     *
+     * @return object
+     */
+    public function paymentMethods(string $storeId): object
+    {
+        return Aspects
+            ::run(new ErrorHandlingAspect())
+            ->andRun(new StoreContextAspect($storeId))
+            ->beforeEachMethodOfService(PaymentMethodsCheckoutController::class);
+    }
+
     /**
      * @param string $storeId
      *

src/BusinessLogic/CheckoutAPI/PaymentMethods/PaymentMethodsCheckoutController.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods;
+
+use SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\Requests\PaymentMethodsInCategoriesRequest;
+use SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\Responses\PaymentMethodsInCategoriesResponse;
+use SeQura\Core\BusinessLogic\Domain\Order\Exceptions\OrderNotFoundException;
+use SeQura\Core\BusinessLogic\Domain\Order\Service\OrderService;
+use SeQura\Core\Infrastructure\Http\Exceptions\HttpRequestException;
+
+/**
+ * Class PaymentMethodsCheckoutController.
+ *
+ * Storefront endpoint returning the payment methods of an already solicited order. It depends on OrderService
+ * alone, so integrations that solicit orders without configuring the checkout library can use it.
+ *
+ * @package SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods
+ */
+class PaymentMethodsCheckoutController
+{
+    /**
+     * @var OrderService
+     */
+    protected $orderService;
+
+    /**
+     * @param OrderService $orderService
+     */
+    public function __construct(OrderService $orderService)
+    {
+        $this->orderService = $orderService;
+    }
+
+    /**
+     * Returns the payment methods available for a solicited order, grouped in the categories SeQura returns them in.
+     *
+     * @param PaymentMethodsInCategoriesRequest $request
+     *
+     * @return PaymentMethodsInCategoriesResponse
+     *
+     * @throws HttpRequestException
+     * @throws OrderNotFoundException
+     */
+    public function getPaymentMethodsInCategories(
+        PaymentMethodsInCategoriesRequest $request
+    ): PaymentMethodsInCategoriesResponse {
+        return new PaymentMethodsInCategoriesResponse(
+            $this->orderService->getAvailablePaymentMethodsInCategories($request->getOrderRef())
+        );
+    }
+}

src/BusinessLogic/CheckoutAPI/PaymentMethods/Requests/PaymentMethodsInCategoriesRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\Requests;
+
+/**
+ * Class PaymentMethodsInCategoriesRequest.
+ *
+ * @package SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\Requests
+ */
+class PaymentMethodsInCategoriesRequest
+{
+    /**
+     * @var string
+     */
+    protected $orderRef;
+
+    /**
+     * @param string $orderRef Reference of the solicited order.
+     */
+    public function __construct(string $orderRef)
+    {
+        $this->orderRef = $orderRef;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderRef(): string
+    {
+        return $this->orderRef;
+    }
+}

src/BusinessLogic/CheckoutAPI/PaymentMethods/Responses/PaymentMethodsInCategoriesResponse.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\Responses;
+
+use SeQura\Core\BusinessLogic\AdminAPI\Response\Response;
+use SeQura\Core\BusinessLogic\Domain\PaymentMethod\Models\SeQuraPaymentMethod;
+use SeQura\Core\BusinessLogic\Domain\PaymentMethod\Models\SeQuraPaymentMethodCategory;
+
+/**
+ * Class PaymentMethodsInCategoriesResponse.
+ *
+ * @package SeQura\Core\BusinessLogic\CheckoutAPI\PaymentMethods\Responses
+ */
+class PaymentMethodsInCategoriesResponse extends Response
+{
+    /**
+     * @var SeQuraPaymentMethodCategory[]
+     */
+    protected $paymentMethodCategories;
+
+    /**
+     * @param SeQuraPaymentMethodCategory[] $paymentMethodCategories
+     */
+    public function __construct(array $paymentMethodCategories)
+    {
+        $this->paymentMethodCategories = $paymentMethodCategories;
+    }
+
+    /**
+     * @return SeQuraPaymentMethodCategory[]
+     */
+    public function getPaymentMethodCategories(): array
+    {
+        return $this->paymentMethodCategories;
+    }
+
+    /**
+     * Determines whether at least one category offers a payment method. Categories with no method are returned
+     * as well, so the presence of categories does not mean the buyer has anything to choose from.
+     *
+     * @return bool
+     */
+    public function hasAvailablePaymentMethods(): bool
+    {
+        foreach ($this->paymentMethodCategories as $category) {
+            if (!empty($category->getMethods())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function toArray(): array
+    {
+        $categories = [];
+        foreach ($this->paymentMethodCategories as $category) {
+            $categories[] = [
+                'title' => $category->getTitle(),
+                'description' => $category->getDescription(),
+                'icon' => $category->getIcon(),
+                'methods' => array_map(static function (SeQuraPaymentMethod $paymentMethod) {
+                    return $paymentMethod->toArray();
+                }, $category->getMethods()),
+            ];
+        }
+
+        return $categories;
+    }
+}

src/BusinessLogic/Domain/Disconnect/Services/DisconnectService.php

@@ -252,14 +252,16 @@ private function removeAllDeploymentData(string $deploymentId): void
 
         // Removes country configurations connected to the deployment
         $countryConfigurations = $this->countryConfigurationRepository->getCountryConfiguration();
-        $newCountyConfigurations = [];
-        foreach ($countryConfigurations as $countryConfiguration) {
-            if (!\in_array($countryConfiguration->getMerchantId(), $merchantIds, true)) {
-                $newCountyConfigurations[] = $countryConfiguration;
+        if ($countryConfigurations) {
+            $newCountyConfigurations = [];
+            foreach ($countryConfigurations as $countryConfiguration) {
+                if (!\in_array($countryConfiguration->getMerchantId(), $merchantIds, true)) {
+                    $newCountyConfigurations[] = $countryConfiguration;
+                }
             }
-        }
 
-        $this->countryConfigurationRepository->setCountryConfiguration($newCountyConfigurations);
+            $this->countryConfigurationRepository->setCountryConfiguration($newCountyConfigurations);
+        }
 
         // Removes all payment methods connected to the deployment
         foreach ($merchantIds as $merchantId) {

src/BusinessLogic/Domain/Order/Service/OrderService.php

@@ -163,19 +163,22 @@ public function getAvailablePaymentMethods(SeQuraOrder $order): array
     }
 
     /**
-     * Gets available payment methods for solicited order in categories.
+     * Gets available payment methods for solicited order in categories. The merchant the order was solicited for
+     * is taken from the stored order, so callers only need its reference.
      *
      * @param string $orderRef
-     * @param string $merchantId
      *
      * @return SeQuraPaymentMethodCategory[]
      *
      * @throws HttpRequestException
+     * @throws OrderNotFoundException
      */
-    public function getAvailablePaymentMethodsInCategories(string $orderRef, string $merchantId): array
+    public function getAvailablePaymentMethodsInCategories(string $orderRef): array
     {
+        $order = $this->getSeQuraOrder($orderRef);
+
         return $this->proxy->getAvailablePaymentMethodsInCategories(
-            new GetAvailablePaymentMethodsRequest($orderRef, $merchantId)
+            new GetAvailablePaymentMethodsRequest($orderRef, (string)$order->getMerchant()->getId())
         );
     }
 
@@ -319,8 +322,7 @@ public function createOrder(Webhook $webhook): string
         $updatedSeQuraOrder->setPaymentMethod(
             $this->getOrderPaymentMethodInfo(
                 $updatedSeQuraOrder->getReference(),
-                $webhook->getProductCode(),
-                (string)$updatedSeQuraOrder->getMerchant()->getId()
+                $webhook->getProductCode()
             )
         );
 
@@ -477,21 +479,17 @@ public function getSeQuraOrder(string $orderReference): SeQuraOrder
      *
      * @param string $orderReference
      * @param string $paymentMethodId
-     * @param string $merchantId
      *
      * @return PaymentMethod|null
      *
      * @throws HttpRequestException
+     * @throws OrderNotFoundException
      */
     private function getOrderPaymentMethodInfo(
         string $orderReference,
-        string $paymentMethodId,
-        string $merchantId
+        string $paymentMethodId
     ): ?PaymentMethod {
-        $methodCategories = $this->getAvailablePaymentMethodsInCategories(
-            $orderReference,
-            $merchantId
-        );
+        $methodCategories = $this->getAvailablePaymentMethodsInCategories($orderReference);
 
         foreach ($methodCategories as $category) {
             foreach ($category->getMethods() as $method) {