Remove $eid parameter from PackageCollection constructor

inspirum · Mar 16, 2020 · c4fbb65 · c4fbb65
1 parent 54e08e4
commit c4fbb65
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 56 deletions.
diff --git a/src/Model/Aggregates/PackageCollection.php b/src/Model/Aggregates/PackageCollection.php
@@ -28,23 +28,14 @@ class PackageCollection implements ArrayAccess, Countable, IteratorAggregate
      */
     private $shipper;
 
-    /**
-     * EID
-     *
-     * @var string
-     */
-    private $eid;
-
     /**
      * PackageCollection constructor
      *
-     * @param string      $shipper
-     * @param string|null $eid
+     * @param string $shipper
      */
-    public function __construct(string $shipper, string $eid = null)
+    public function __construct(string $shipper)
     {
         $this->shipper = $shipper;
-        $this->eid     = $eid ?: $this->newEID();
     }
 
     /**
@@ -61,7 +52,7 @@ public function add(Package $package): void
 
         // set collection EID
         if ($package->hasEID() === false) {
-            $package->setEID($this->eid);
+            $package->setEID($this->newEID());
         }
 
         // add package to collection

diff --git a/tests/Unit/Balikobot/AddPackagesTest.php b/tests/Unit/Balikobot/AddPackagesTest.php
@@ -28,10 +28,10 @@ public function testMakeRequest()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('ppl', '0001');
+        $packages = new PackageCollection('ppl');
 
-        $packages->add(new Package(['vs' => '0001', 'rec_name' => 'Name']));
-        $packages->add(new Package(['vs' => '0002', 'price' => 2000]));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'rec_name' => 'Name']));
+        $packages->add(new Package(['vs' => '0002', 'eid' => '0001', 'price' => 2000]));
 
         $service->addPackages($packages);
 
@@ -78,7 +78,7 @@ public function testResponseData()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('cp', '0001');
+        $packages = new PackageCollection('cp');
 
         $packages->add(new Package(['eid' => '0001']));
         $packages->add(new Package(['eid' => '0002']));
@@ -117,15 +117,15 @@ public function testResponseDataWithoudEID()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('cp', '0003');
+        $packages = new PackageCollection('cp');
 
         $packages->add(new Package(['test' => '1']));
         $packages->add(new Package(['test' => '2']));
 
         $orderedPackages = $service->addPackages($packages);
 
-        $this->assertEquals('0003', $orderedPackages[0]->getBatchId());
-        $this->assertEquals('0003', $orderedPackages[1]->getBatchId());
+        $this->assertNotEmpty($orderedPackages[0]->getBatchId());
+        $this->assertNotEmpty($orderedPackages[1]->getBatchId());
     }
 
     public function testMakeV1RequestForUPSShipper()
@@ -142,9 +142,9 @@ public function testMakeV1RequestForUPSShipper()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('ups', '0001');
+        $packages = new PackageCollection('ups');
 
-        $packages->add(new Package(['vs' => '0001', 'pieces_count' => 2, 'rec_name' => 'Name']));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'pieces_count' => 2, 'rec_name' => 'Name']));
 
         $service->addPackages($packages);
 
@@ -186,10 +186,10 @@ public function testMakeV2RequestForUPSShipper()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('ups', '0001');
+        $packages = new PackageCollection('ups');
 
-        $packages->add(new Package(['vs' => '0001', 'order_number' => 1, 'rec_name' => 'Name']));
-        $packages->add(new Package(['vs' => '0001', 'order_number' => 2, 'rec_name' => 'Name2']));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'order_number' => 1, 'rec_name' => 'Name']));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'order_number' => 2, 'rec_name' => 'Name2']));
 
         $service->addPackages($packages);
 
@@ -237,10 +237,10 @@ public function testMakeV2RequestForDHLShipper()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('dhl', '0001');
+        $packages = new PackageCollection('dhl');
 
-        $packages->add(new Package(['vs' => '0001', 'order_number' => 1, 'rec_name' => 'Name']));
-        $packages->add(new Package(['vs' => '0001', 'order_number' => 2, 'rec_name' => 'Name2']));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'order_number' => 1, 'rec_name' => 'Name']));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'order_number' => 2, 'rec_name' => 'Name2']));
 
         $service->addPackages($packages);
 
@@ -288,10 +288,10 @@ public function testMakeV2RequestForTNTShipper()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('tnt', '0001');
+        $packages = new PackageCollection('tnt');
 
-        $packages->add(new Package(['vs' => '0001', 'order_number' => 1, 'rec_name' => 'Name']));
-        $packages->add(new Package(['vs' => '0001', 'order_number' => 2, 'rec_name' => 'Name2']));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'order_number' => 1, 'rec_name' => 'Name']));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'order_number' => 2, 'rec_name' => 'Name2']));
 
         $service->addPackages($packages);
 

diff --git a/tests/Unit/Balikobot/CheckPackagesTest.php b/tests/Unit/Balikobot/CheckPackagesTest.php
@@ -16,10 +16,10 @@ public function testMakeRequest()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('ppl', '0001');
+        $packages = new PackageCollection('ppl');
 
-        $packages->add(new Package(['vs' => '0001', 'rec_name' => 'Name']));
-        $packages->add(new Package(['vs' => '0002', 'price' => 2000]));
+        $packages->add(new Package(['vs' => '0001', 'eid' => '0001', 'rec_name' => 'Name']));
+        $packages->add(new Package(['vs' => '0002', 'eid' => '0001', 'price' => 2000]));
 
         $service->checkPackages($packages);
 

diff --git a/tests/Unit/Balikobot/OrderB2AShipmentTest.php b/tests/Unit/Balikobot/OrderB2AShipmentTest.php
@@ -30,10 +30,10 @@ public function testMakeRequest()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('geis', '0001');
+        $packages = new PackageCollection('geis');
 
-        $packages->add(new Package(['service_type' => '10', 'mu_type' => 'EP', 'pickup_date' => '2019-07-12']));
-        $packages->add(new Package(['service_type' => '10', 'mu_type' => 'UV', 'pickup_date' => '2019-07-12']));
+        $packages->add(new Package(['eid' => '0001', 'mu_type' => 'EP', 'pickup_date' => '2019-07-12']));
+        $packages->add(new Package(['eid' => '0001', 'mu_type' => 'UV', 'pickup_date' => '2019-07-12']));
 
         $service->orderB2AShipment($packages);
 
@@ -43,16 +43,14 @@ public function testMakeRequest()
                 'https://api.balikobot.cz/geis/b2a',
                 [
                     0 => [
-                        'eid'          => '0001',
-                        'service_type' => '10',
-                        'mu_type'      => 'EP',
-                        'pickup_date'  => '2019-07-12',
+                        'eid'         => '0001',
+                        'mu_type'     => 'EP',
+                        'pickup_date' => '2019-07-12',
                     ],
                     1 => [
-                        'eid'          => '0001',
-                        'service_type' => '10',
-                        'mu_type'      => 'UV',
-                        'pickup_date'  => '2019-07-12',
+                        'eid'         => '0001',
+                        'mu_type'     => 'UV',
+                        'pickup_date' => '2019-07-12',
                     ],
                 ],
             ]
@@ -83,7 +81,7 @@ public function testResponseData()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('geis', '0001');
+        $packages = new PackageCollection('geis');
 
         $packages->add(new Package(['eid' => '0001']));
         $packages->add(new Package(['eid' => '0002']));
@@ -115,7 +113,7 @@ public function testResponseDataWithoutCarrierId()
 
         $service = new Balikobot($requester);
 
-        $packages = new PackageCollection('ppl', '0001');
+        $packages = new PackageCollection('ppl');
 
         $packages->add(new Package(['eid' => '0001']));
         $packages->add(new Package(['eid' => '0002']));

diff --git a/tests/Unit/PackageCollectionTest.php b/tests/Unit/PackageCollectionTest.php
@@ -34,27 +34,26 @@ public function testCreateUniqueEid()
         $this->assertTrue($packages2->offsetGet(0)->getEid() !== $packages3->offsetGet(0)->getEid());
     }
 
-    public function testAddedPackagesHasCollectionEid()
+    public function testAddedPackagesHasUniqueEid()
     {
-        $packages = new PackageCollection('cp', '0001');
+        $packages = new PackageCollection('cp');
 
         $packages->add(new Package(['test' => 1]));
         $packages->add(new Package(['test' => 2]));
 
-        /* @var \Inspirum\Balikobot\Model\Values\Package[] $packages */
-        foreach ($packages as $package) {
-            $this->assertEquals('0001', $package->getEID());
-        }
+        $this->assertNotEmpty($packages->offsetGet(0)->getEID());
+        $this->assertNotEmpty($packages->offsetGet(1)->getEID());
+        $this->assertTrue($packages->offsetGet(0)->getEID() !== $packages->offsetGet(1)->getEID());
 
         $this->assertEquals('cp', $packages->getShipper());
         $this->assertEquals(2, $packages->count());
     }
 
     public function testAddedPackagesAreClones()
     {
-        $packages = new PackageCollection('cp', '0001');
+        $packages = new PackageCollection('cp');
 
-        $package = new Package(['test' => 1]);
+        $package = new Package(['test' => 1, 'eid' => '0001']);
 
         $packages->add($package);
 
@@ -79,10 +78,10 @@ public function testAddedPackagesAreClones()
 
     public function testSupportCustomEIDForPackage()
     {
-        $packages = new PackageCollection('cp', '0001');
+        $packages = new PackageCollection('cp');
 
         $packages->add(new Package(['test' => 1, 'eid' => '0002']));
-        $packages->add(new Package(['test' => 2]));
+        $packages->add(new Package(['test' => 2, 'eid' => '0001']));
 
         $this->assertEquals(
             [