Bugfix: Check if the shipping address isset #841

mollie · Jan 6, 2025 · ec8d37b · ec8d37b
1 parent edfeaba
commit ec8d37b
Show file tree

Hide file tree

Showing 2 changed files with 118 additions and 12 deletions.
diff --git a/Service/Order/TransactionPart/LimitStreetLength.php b/Service/Order/TransactionPart/LimitStreetLength.php
@@ -19,18 +19,8 @@ class LimitStreetLength implements TransactionPartInterface
 
     public function process(OrderInterface $order, $apiMethod, array $transaction): array
     {
-        if ($apiMethod == Orders::CHECKOUT_TYPE) {
-            $transaction['billingAddress']['streetAndNumber'] = $this->limitStreetLength($transaction['billingAddress']['streetAndNumber']);
-            $transaction['shippingAddress']['streetAndNumber'] = $this->limitStreetLength($transaction['shippingAddress']['streetAndNumber']);
-        }
-
-        if ($apiMethod == Payments::CHECKOUT_TYPE) {
-            $transaction['billingAddress']['streetAndNumber'] = $this->limitStreetLength($transaction['billingAddress']['streetAndNumber']);
-        }
-
-        if ($apiMethod == Payments::CHECKOUT_TYPE && array_key_exists('shippingAddress', $transaction)) {
-            $transaction['shippingAddress']['streetAndNumber'] = $this->limitStreetLength($transaction['shippingAddress']['streetAndNumber']);
-        }
+        $transaction = $this->limitAddress('billingAddress', $transaction);
+        $transaction = $this->limitAddress('shippingAddress', $transaction);
 
         if ($this->streetTruncated) {
             $transaction['metadata']['street_truncated'] = true;
@@ -48,4 +38,14 @@ private function limitStreetLength(string $street): string
         $this->streetTruncated = true;
         return mb_substr($street, 0, 100);
     }
+
+    private function limitAddress(string $type, array $transaction): array
+    {
+        if (array_key_exists($type, $transaction)) {
+            $limited = $this->limitStreetLength($transaction[$type]['streetAndNumber']);
+            $transaction[$type]['streetAndNumber'] = $limited;
+        }
+
+        return $transaction;
+    }
 }
diff --git a/Test/Integration/Service/Order/TransactionPart/LimitStreetLengthTest.php b/Test/Integration/Service/Order/TransactionPart/LimitStreetLengthTest.php
@@ -0,0 +1,106 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Mollie\Payment\Test\Integration\Service\Order\TransactionPart;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Mollie\Payment\Model\Client\Orders;
+use Mollie\Payment\Service\Order\TransactionPart\LimitStreetLength;
+use Mollie\Payment\Test\Integration\IntegrationTestCase;
+
+class LimitStreetLengthTest extends IntegrationTestCase
+{
+    public function testLimitsTheAddressForOrdersApi(): void
+    {
+        /** @var LimitStreetLength $instance */
+        $instance = $this->objectManager->create(LimitStreetLength::class);
+
+        $transaction = [
+            'billingAddress' => [
+                'streetAndNumber' => 'a super long steet name that exceeds the maximum of 100 characters and should be truncated when its too long',
+            ],
+            'shippingAddress' => [
+                'streetAndNumber' => 'a super long steet name that exceeds the maximum of 100 characters and should be truncated when its too long',
+            ],
+        ];
+
+        $result = $instance->process(
+            $this->objectManager->create(OrderInterface::class),
+            Orders::CHECKOUT_TYPE,
+            $transaction
+        );
+
+        $this->assertEquals(
+            'a super long steet name that exceeds the maximum of 100 characters and should be truncated when its ',
+            $result['billingAddress']['streetAndNumber']
+        );
+
+        $this->assertEquals(
+            'a super long steet name that exceeds the maximum of 100 characters and should be truncated when its ',
+            $result['shippingAddress']['streetAndNumber']
+        );
+
+        $this->assertArrayHasKey('metadata', $result);
+        $this->assertArrayHasKey('street_truncated', $result['metadata']);
+        $this->assertTrue($result['metadata']['street_truncated']);
+    }
+
+    public function testHandlesVirtualProducts(): void
+    {
+        /** @var LimitStreetLength $instance */
+        $instance = $this->objectManager->create(LimitStreetLength::class);
+
+        $transaction = [
+            'billingAddress' => [
+                'streetAndNumber' => 'a super long steet name that exceeds the maximum of 100 characters and should be truncated when its too long',
+            ],
+            // Omit the shipping address as that's not relevant for virtual products
+        ];
+
+        $result = $instance->process(
+            $this->objectManager->create(OrderInterface::class),
+            Orders::CHECKOUT_TYPE,
+            $transaction
+        );
+
+        $this->assertEquals(
+            'a super long steet name that exceeds the maximum of 100 characters and should be truncated when its ',
+            $result['billingAddress']['streetAndNumber']
+        );
+
+        $this->assertArrayHasKey('metadata', $result);
+        $this->assertArrayHasKey('street_truncated', $result['metadata']);
+        $this->assertTrue($result['metadata']['street_truncated']);
+    }
+
+    public function testDoesNotMarkAsTruncatedWhenNotTruncated(): void
+    {
+        /** @var LimitStreetLength $instance */
+        $instance = $this->objectManager->create(LimitStreetLength::class);
+
+        $transaction = [
+            'metadata' => [],
+            'billingAddress' => [
+                'streetAndNumber' => 'a short street name',
+            ],
+        ];
+
+        $result = $instance->process(
+            $this->objectManager->create(OrderInterface::class),
+            Orders::CHECKOUT_TYPE,
+            $transaction
+        );
+
+        $this->assertEquals(
+            'a short street name',
+            $result['billingAddress']['streetAndNumber']
+        );
+
+        $this->assertArrayNotHasKey('street_truncated', $result['metadata']);
+    }
+}