fix: prevent adding array to int calculating total value (#492)

* fix: prevent adding array to int calculating total value * test: add * style: improve var name * amount means quantity i think * implement feedback
myparcelnl · Jul 23, 2024 · ebc2ff8 · ebc2ff8
1 parent 00bdf7e
commit ebc2ff8
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 1 deletion.
diff --git a/src/Rule/Consignment/MinimumItemValueRule.php b/src/Rule/Consignment/MinimumItemValueRule.php
@@ -20,7 +20,13 @@ public function validate($validationSubject): void
         $totalValue = 0;
 
         foreach ($validationSubject->items as $item) {
-            $totalValue += $item->getItemValue();
+            $itemValue = $item->getItemValue();
+
+            if (! isset($itemValue['amount'])) {
+                continue;
+            }
+
+            $totalValue += (int) $itemValue['amount'];
         }
 
         if ($totalValue < 100) {

diff --git a/test/Rule/MinimumItemValueRuleTest.php b/test/Rule/MinimumItemValueRuleTest.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Sdk\Test\Rule;
+
+use MyParcelNL\Sdk\src\Model\Consignment\PostNLConsignment;
+use MyParcelNL\Sdk\src\Model\MyParcelCustomsItem;
+use MyParcelNL\Sdk\src\Rule\Consignment\MinimumItemValueRule;
+use MyParcelNL\Sdk\Test\Bootstrap\TestCase;
+
+class MinimumItemValueRuleTest extends TestCase
+{
+    /**
+     * @return array
+     */
+    public function provideMinimumItemValueData(): array
+    {
+        return [
+            [
+                [
+                    'items' => [
+                        [
+                            'value' => 50,
+                        ],
+                        [
+                            'value' => 50,
+                        ],
+                    ],
+                ],
+                'expected'=>true,
+            ],
+            [
+                [
+                    'items' => [
+                        [
+                            'value' => 5000,
+                        ],
+                        [
+                            'value' => 9995,
+                        ],
+                    ],
+                ],
+                'expected'=>true,
+            ],
+            [
+                [
+                    'items' => [
+                        [
+                            'value' => 50,
+                        ],
+                    ],
+                ],
+                'expected'=>false,
+            ],
+            [
+                [
+                    'items' => [],
+                ],
+                'expected'=>true,
+            ],
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @param bool $expected
+     *
+     * @dataProvider provideMinimumItemValueData
+     */
+    public function testMinimumItemValueRule(array $data, bool $expected): void
+    {
+        $rule = new MinimumItemValueRule();
+        $consignment = new PostNLConsignment();
+
+        foreach ($data['items'] as $item) {
+            $consignment->addItem(
+                (new MyParcelCustomsItem())
+                    ->setItemValue($item['value'])
+                    ->setAmount(1)
+                    ->setWeight(1)
+                    ->setClassification(123456)
+                    ->setCountry('NL')
+                    ->setDescription('test')
+            );
+        }
+
+        $rule->validate($consignment);
+
+        self::assertEquals($expected, 0 === count($rule->getErrors()));
+    }
+}