Verify IPN with order from shop

CS-5639
sequra · Jul 5, 2024 · 5ce6d48 · 5ce6d48
1 parent c2e1ba6
commit 5ce6d48
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 10 deletions.
diff --git a/src/BusinessLogic/Webhook/Handler/WebhookHandler.php b/src/BusinessLogic/Webhook/Handler/WebhookHandler.php
@@ -11,6 +11,7 @@
 use SeQura\Core\BusinessLogic\Domain\Webhook\Models\Webhook;
 use SeQura\Core\BusinessLogic\SeQuraAPI\Order\OrderProxy;
 use SeQura\Core\BusinessLogic\Domain\Order\ProxyContracts\OrderProxyInterface;
+use SeQura\Core\BusinessLogic\Webhook\Services\ShopOrderService;
 use SeQura\Core\BusinessLogic\Webhook\Tasks\OrderUpdateTask;
 use SeQura\Core\Infrastructure\Http\Exceptions\HttpRequestException;
 use SeQura\Core\Infrastructure\ORM\Exceptions\QueryFilterInvalidParamException;
@@ -70,19 +71,19 @@ protected function acknowledgeOrder(string $orderReference, string $state): void
         * @var OrderProxy $orderProxy
         */
         $orderProxy = ServiceRegister::getService(OrderProxyInterface::class);
-        $order = $this->getSeQuraOrderByOrderReference($orderReference);
+        $shopOrder = $this->getCreateOrderRequest($orderReference);
 
         $request = new CreateOrderRequest(
             OrderRequestStatusMapping::mapOrderRequestStatus($state),
-            $order->getMerchant(),
-            $order->getUnshippedCart(),
-            $order->getDeliveryMethod(),
-            $order->getCustomer(),
-            $order->getPlatform(),
-            $order->getDeliveryAddress(),
-            $order->getInvoiceAddress(),
-            $order->getGui(),
-            $order->getMerchantReference()
+            $shopOrder->getMerchant(),
+            $shopOrder->getCart(),
+            $shopOrder->getDeliveryMethod(),
+            $shopOrder->getCustomer(),
+            $shopOrder->getPlatform(),
+            $shopOrder->getDeliveryAddress(),
+            $shopOrder->getInvoiceAddress(),
+            $shopOrder->getGui(),
+            $shopOrder->getMerchantReference()
         );
 
         $orderProxy->acknowledgeOrder($orderReference, $request);
@@ -112,4 +113,19 @@ protected function getSeQuraOrderByOrderReference(string $orderRef): ?SeQuraOrde
 
         return $order;
     }
+
+    /**
+     * Retrieves create order request.
+     *
+     * @param string $orderReference
+     *
+     * @return CreateOrderRequest
+     */
+    protected function getCreateOrderRequest(string $orderReference): CreateOrderRequest
+    {
+        /** @var ShopOrderService $service */
+        $service = ServiceRegister::getService(ShopOrderService::class);
+
+        return $service->getCreateOrderRequest($orderReference);
+    }
 }
diff --git a/src/BusinessLogic/Webhook/Services/ShopOrderService.php b/src/BusinessLogic/Webhook/Services/ShopOrderService.php
@@ -2,6 +2,7 @@
 
 namespace SeQura\Core\BusinessLogic\Webhook\Services;
 
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\CreateOrderRequest;
 use SeQura\Core\BusinessLogic\Domain\Webhook\Models\Webhook;
 
 /**
@@ -49,4 +50,13 @@ public function getStatisticsOrderIds(int $page, int $limit = 5000): array;
      * @return string
      */
     public function getOrderUrl(string $merchantReference): string;
+
+    /**
+     * Retrieves create order request from shop.
+     *
+     * @param string $orderReference
+     *
+     * @return CreateOrderRequest
+     */
+    public function getCreateOrderRequest(string $orderReference): CreateOrderRequest;
 }
diff --git a/tests/BusinessLogic/WebhookAPI/MockComponents/MockShopErrorOrderService.php b/tests/BusinessLogic/WebhookAPI/MockComponents/MockShopErrorOrderService.php
@@ -2,9 +2,23 @@
 
 namespace SeQura\Core\Tests\BusinessLogic\WebhookAPI\MockComponents;
 
+use SeQura\Core\BusinessLogic\Domain\Order\Builders\CreateOrderRequestBuilder;
+use SeQura\Core\BusinessLogic\Domain\Order\Exceptions\InvalidCartItemsException;
+use SeQura\Core\BusinessLogic\Domain\Order\Exceptions\InvalidGuiLayoutValueException;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Address;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Cart;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\CreateOrderRequest;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Customer;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\DeliveryMethod;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Gui;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Item\ProductItem;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Merchant;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\MerchantReference;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Platform;
 use SeQura\Core\BusinessLogic\Domain\Webhook\Models\Webhook;
 use SeQura\Core\BusinessLogic\Webhook\Services\ShopOrderService;
 use SeQura\Core\Infrastructure\Http\Exceptions\HttpRequestException;
+use SeQura\Core\Tests\Infrastructure\Common\TestServiceRegister;
 
 class MockShopErrorOrderService implements ShopOrderService
 {
@@ -47,4 +61,53 @@ public function getOrderUrl(string $merchantReference): string
     {
         return  '';
     }
+
+    /**
+     * @throws InvalidCartItemsException
+     * @throws InvalidGuiLayoutValueException
+     */
+    public function getCreateOrderRequest(string $orderReference): CreateOrderRequest
+    {
+        $merchant = new Merchant('testMerchantId');
+        $merchantReference = new MerchantReference('test123');
+        $cart = new Cart('testCurrency', false, [
+            new ProductItem('testItemReference','testName', 5,2, 10, false)
+        ], $orderReference);
+
+        $deliveryMethod = new DeliveryMethod('testDeliveryMethodName');
+        $deliveryAddress = new Address(
+            'testDeliveryAddressCompany',
+            'testDeliveryAddressLine1',
+            'testDeliveryAddressLine2',
+            'testDeliveryAddressPostalCode',
+            'testDeliveryAddressCity',
+            'ES'
+        );
+
+        $invoiceAddress = new Address(
+            'testInvoiceAddressCompany',
+            'testInvoiceAddressLine1',
+            'testInvoiceAddressLine2',
+            'testInvoiceAddressPostalCode',
+            'testInvoiceAddressCity',
+            'ES'
+        );
+
+        $customer = new Customer('[email protected]','testCode','testIpNum','testAgent');
+        $platform = new Platform('testName','testVersion','testUName','testDbName','testDbVersion');
+        $gui = new Gui(Gui::ALLOWED_VALUES['desktop']);
+
+        return new CreateOrderRequest(
+            'testState',
+            $merchant,
+            $cart,
+            $deliveryMethod,
+            $customer,
+            $platform,
+            $deliveryAddress,
+            $invoiceAddress,
+            $gui,
+            $merchantReference
+        );
+    }
 }
diff --git a/tests/BusinessLogic/WebhookAPI/MockComponents/MockShopOrderService.php b/tests/BusinessLogic/WebhookAPI/MockComponents/MockShopOrderService.php
@@ -2,8 +2,22 @@
 
 namespace SeQura\Core\Tests\BusinessLogic\WebhookAPI\MockComponents;
 
+use SeQura\Core\BusinessLogic\Domain\Order\Builders\CreateOrderRequestBuilder;
+use SeQura\Core\BusinessLogic\Domain\Order\Exceptions\InvalidCartItemsException;
+use SeQura\Core\BusinessLogic\Domain\Order\Exceptions\InvalidGuiLayoutValueException;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Address;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Cart;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\CreateOrderRequest;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Customer;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\DeliveryMethod;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Gui;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Item\ProductItem;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Merchant;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\MerchantReference;
+use SeQura\Core\BusinessLogic\Domain\Order\Models\OrderRequest\Platform;
 use SeQura\Core\BusinessLogic\Domain\Webhook\Models\Webhook;
 use SeQura\Core\BusinessLogic\Webhook\Services\ShopOrderService;
+use SeQura\Core\Tests\Infrastructure\Common\TestServiceRegister;
 
 /**
  * Class MockShopOrderService
@@ -49,4 +63,53 @@ public function getOrderUrl(string $merchantReference): string
     {
         return 'https.test.url/' . $merchantReference;
     }
+
+    /**
+     * @throws InvalidCartItemsException
+     * @throws InvalidGuiLayoutValueException
+     */
+    public function getCreateOrderRequest(string $orderReference): CreateOrderRequest
+    {
+        $merchant = new Merchant('testMerchantId');
+        $merchantReference = new MerchantReference('test123');
+        $cart = new Cart('testCurrency', false, [
+            new ProductItem('testItemReference','testName', 5,2, 10, false)
+        ], $orderReference);
+
+        $deliveryMethod = new DeliveryMethod('testDeliveryMethodName');
+        $deliveryAddress = new Address(
+            'testDeliveryAddressCompany',
+            'testDeliveryAddressLine1',
+            'testDeliveryAddressLine2',
+            'testDeliveryAddressPostalCode',
+            'testDeliveryAddressCity',
+            'ES'
+        );
+
+        $invoiceAddress = new Address(
+            'testInvoiceAddressCompany',
+            'testInvoiceAddressLine1',
+            'testInvoiceAddressLine2',
+            'testInvoiceAddressPostalCode',
+            'testInvoiceAddressCity',
+            'ES'
+        );
+
+        $customer = new Customer('[email protected]','testCode','testIpNum','testAgent');
+        $platform = new Platform('testName','testVersion','testUName','testDbName','testDbVersion');
+        $gui = new Gui(Gui::ALLOWED_VALUES['desktop']);
+
+        return new CreateOrderRequest(
+            'testState',
+            $merchant,
+            $cart,
+            $deliveryMethod,
+            $customer,
+            $platform,
+            $deliveryAddress,
+            $invoiceAddress,
+            $gui,
+            $merchantReference
+        );
+    }
 }