Merge pull request #28 from dnetix/improve-dispersion-handling

Improve dispersion handling

Author: dnetix

src/Entities/Payment.php

@@ -22,7 +22,7 @@ class Payment extends Entity
     protected ?Discount $discount = null;
     protected ?Instrument $instrument = null;
     public bool $subscribe = false;
-    protected string $agreement = '';
+    protected ?int $agreement = null;
     protected string $agreementType = '';
 
     public function __construct(array $data = [])
@@ -57,7 +57,7 @@ public function amount(): ?Amount
         return $this->amount;
     }
 
-    public function agreement(): string
+    public function agreement(): ?int
     {
         return $this->agreement;
     }
@@ -135,18 +135,18 @@ public function itemsToArray(): array
     public function toArray(): array
     {
         return self::arrayFilter([
+            'agreement' => $this->agreement(),
+            'agreementType' => $this->agreementType(),
             'reference' => $this->reference(),
             'description' => $this->description(),
             'amount' => $this->amount() ? $this->amount()->toArray() : null,
-            'allowPartial' => $this->allowPartial,
             'shipping' => $this->shipping() ? $this->shipping()->toArray() : null,
             'items' => $this->itemsToArray(),
             'recurring' => $this->recurring() ? $this->recurring()->toArray() : null,
             'discount' => $this->discount() ? $this->discount()->toArray() : null,
-            'subscribe' => $this->subscribe(),
             'fields' => $this->fieldsToArray(),
-            'agreement' => $this->agreement(),
-            'agreementType' => $this->agreementType(),
+            'subscribe' => $this->subscribe() ?: null,
+            'allowPartial' => $this->allowPartial ?: null,
         ]);
     }
 }

tests/Entities/PaymentEntityTest.php

@@ -46,8 +46,7 @@ public function testItAddsAField()
                     'name' => 'Testing2',
                 ],
             ],
-            'allowPartial' => false,
-            'subscribe' => false,
+            'allowPartial' => true,
         ];
         $payment = new Payment($data);
         $this->assertEquals(1, count($payment->fields()));
@@ -166,8 +165,7 @@ public function testItParsesTheDataCorrectly()
                 'base' => '10',
                 'percent' => 0,
             ],
-            'allowPartial' => false,
-            'subscribe' => false,
+            'subscribe' => true,
         ];
         $payment = new Payment($data);
 
@@ -284,8 +282,6 @@ public function testItParsesCorrectlyADispersion()
                             'currency' => 'COP',
                             'total' => 207890,
                         ],
-                        'allowPartial' => false,
-                        'subscribe' => false,
                     ],
                     [
                         'reference' => 'TEST_3',
@@ -301,12 +297,8 @@ public function testItParsesCorrectlyADispersion()
                             'currency' => 'COP',
                             'total' => 35700,
                         ],
-                        'allowPartial' => false,
-                        'subscribe' => false,
                     ],
                 ],
-                'allowPartial' => false,
-                'subscribe' => false,
             ],
             'expiration' => date('c', strtotime('+1 day')),
             'returnUrl' => 'https://dnetix.co/ping/rtest',

tests/Messages/CollectRequestTest.php

@@ -25,8 +25,6 @@ public function testItParsesCorrectlyACollectWithCredit()
                     'currency' => 'COP',
                     'total' => 143000,
                 ],
-                'allowPartial' => false,
-                'subscribe' => false,
             ],
             'instrument' => [
                 'token' => [

tests/Messages/RedirectRequestTest.php

@@ -169,4 +169,13 @@ public function testItParsesCorrectlyASubscriptionRequest()
         $this->assertEquals($additional['expiration'], $request->expiration());
         $this->assertEquals($additional['cancelUrl'], $request->cancelUrl());
     }
+
+    public function testItHandlesADispersionRequest()
+    {
+        $data = json_decode('{"payment": {"amount": {"taxes": [{"base": 1885200,"kind": "valueAddedTax","amount": 47130},{"base": 0,"kind": "airportTax","amount": 603100}],"total": 3809000,"currency": "COP"},"reference": "800166551","subscribe": false,"dispersion": [{"amount": {"taxes": [{"base": 0,"kind": "valueAddedTax","amount": 47130},{"base": 0,"kind": "airportTax","amount": 603100}],"total": 2535430,"currency": "COP"},"agreement": 30,"reference": "800166551","subscribe": false,"description": "Pago en micrositio","allowPartial": false,"agreementType": "AIRLINE"},{"amount": {"taxes": [{"base": 0,"kind": "valueAddedTax","amount": 0}],"total": 1273570,"currency": "COP"},"reference": "800166551","subscribe": false,"description": "Pago en micrositio","agreement": null,"agreementType": "MERCHANT"}],"description": "Pago en micrositio","allowPartial": false},"ipAddress": "186.84.220.137","returnUrl": "https://sites.placetopay.com/colreservas/payments/c9b7f796dbc707a555a73a0aa14388be878ed69482513150e3ae6d6307e05d44/992939eb60","userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.1 Mobile/15E148 Safari/604.1","expiration": "2021-07-19T17:05:23-05:00"}', true);
+        $request = new RedirectRequest($data);
+
+        $this->assertSame(30, $request->payment()->dispersion()[0]->agreement());
+        $this->assertNull($request->payment()->dispersion()[1]->agreement());
+    }
 }

tests/Validators/PaymentValidatorTest.php

@@ -17,7 +17,6 @@ public function testItPassesWhenAllOk()
                 'total' => 1000,
             ],
             'allowPartial' => true,
-            'subscribe' => false,
         ];
         $payment = new Payment($data);
         $this->assertEquals($data['reference'], $payment->reference());
@@ -65,7 +64,6 @@ public function testItReceivesAllTheEntities()
                 ],
             ],
             'allowPartial' => true,
-            'subscribe' => false,
         ];
 
         $payment = new Payment($data);
@@ -88,7 +86,6 @@ public function testItPassesWhenDescriptionOk()
                 'total' => 1000,
             ],
             'allowPartial' => true,
-            'subscribe' => false,
         ];
         $payment = new Payment($data);
         $this->assertEquals($data['reference'], $payment->reference());