Refactor code

inspirum · May 30, 2020 · 890fb66 · 890fb66
1 parent 6dafe1e
commit 890fb66
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 27 deletions.
diff --git a/src/Services/Client.php b/src/Services/Client.php
@@ -55,9 +55,7 @@ public function addPackages(string $shipper, array $packages, string $version =
         unset($response['labels_url']);
         unset($response['status']);
 
-        if (count($response) !== count($packages)) {
-            throw new BadRequestException($response);
-        }
+        $this->validateIndexes($response, $packages);
 
         return $response;
     }
@@ -134,25 +132,14 @@ public function trackPackages(string $shipper, array $carrierIds): array
         unset($response['status']);
 
         // fixes that API return only last package statuses for GLS shipper
-        if (
-            $shipper === Shipper::GLS
-            && count($carrierIds) > 1
-            && count($response) === 1
-            && isset($response[count($carrierIds) - 1])
-        ) {
+        if ($shipper === Shipper::GLS && count($carrierIds) !== count($response)) {
             for ($i = 0; $i < count($carrierIds) - 1; $i++) {
-                $response[$i] = [];
+                $response[$i] = $response[$i] ?? [];
             }
             sort($response);
         }
 
-        if (isset($response[0]) === false) {
-            throw new BadRequestException($response);
-        }
-
-        if (count($response) !== count($carrierIds)) {
-            throw new BadRequestException($response);
-        }
+        $this->validateIndexes($response, $carrierIds);
 
         return $response;
     }
@@ -192,9 +179,7 @@ public function trackPackagesLastStatus(string $shipper, array $carrierIds): arr
 
         unset($response['status']);
 
-        if (count($response) !== count($carrierIds)) {
-            throw new BadRequestException($response);
-        }
+        $this->validateIndexes($response, $carrierIds);
 
         $formatedStatuses = [];
 
@@ -641,9 +626,7 @@ public function orderB2AShipment(string $shipper, array $packages): array
 
         unset($response['status']);
 
-        if (count($response) !== count($packages)) {
-            throw new BadRequestException($response);
-        }
+        $this->validateIndexes($response, $packages);
 
         return $response;
     }
@@ -683,9 +666,7 @@ public function getProofOfDeliveries(string $shipper, array $carrierIds): array
 
         unset($response['status']);
 
-        if (count($response) !== count($carrierIds)) {
-            throw new BadRequestException($response);
-        }
+        $this->validateIndexes($response, $carrierIds);
 
         $formatedLinks = [];
 
@@ -713,6 +694,23 @@ private function validateStatus(array $responseItem, array $response): void
         }
     }
 
+    /**
+     * Validate indexes
+     *
+     * @param array<mixed,mixed> $response
+     * @param array<mixed,mixed> $request
+     *
+     * @return void
+     *
+     * @throws \Inspirum\Balikobot\Exceptions\BadRequestException
+     */
+    private function validateIndexes(array $response, array $request): void
+    {
+        if (array_keys($response) !== range(0, count($request) - 1)) {
+            throw new BadRequestException($response);
+        }
+    }
+
     /**
      * Normalize response items
      *

diff --git a/tests/Unit/Client/Requests/TrackRequestTest.php b/tests/Unit/Client/Requests/TrackRequestTest.php
@@ -145,7 +145,7 @@ public function testThrowsExceptionOnErrorWithMultiplePackages()
         $client->trackPackages('cp', [1, 2, 4]);
     }
 
-    public function testRequestShouldHaveStatusWithMultiplePackages()
+    public function testRequestShouldNotHaveStatusWithMultiplePackages()
     {
         $requester = $this->newRequesterWithMockedRequestMethod(200, [
             0 => [
@@ -183,6 +183,44 @@ public function testRequestShouldHaveStatusWithMultiplePackages()
         $this->assertNotEmpty($status);
     }
 
+    public function testThrowsExceptionOnBadPackageIndexes()
+    {
+        $this->expectException(BadRequestException::class);
+
+        $requester = $this->newRequesterWithMockedRequestMethod(200, [
+            0 => [
+                [
+                    'date'      => '2018-07-02 00:00:00',
+                    'status_id' => 2,
+                    'name'      => 'Dodání zásilky. 10003 Depo Praha 701',
+                ],
+                [
+                    'date'      => '2018-07-02 00:00:00',
+                    'status_id' => 1,
+                    'name'      => 'Doručování zásilky. 10003 Depo Praha 701',
+                ],
+            ],
+            2 => [
+                [
+                    'date'      => '2018-07-02 00:00:00',
+                    'status_id' => 2,
+                    'name'      => 'Dodání zásilky. 10005 Depo Praha 701',
+                ],
+            ],
+            3 => [
+                [
+                    'date'      => '2018-07-02 00:00:00',
+                    'status_id' => 1,
+                    'name'      => 'Doručování zásilky. 10003 Depo Praha 701',
+                ],
+            ],
+        ]);
+
+        $client = new Client($requester);
+
+        $client->trackPackages('cp', [3, 4, 5]);
+    }
+
     public function testThrowsExceptionOnBadStatusCodeWithMultiplePackages()
     {
         $this->expectException(BadRequestException::class);