fix: null response will throw an error in requestAll

innobraingmbh · May 24, 2024 · f7f3b7b · f7f3b7b
1 parent 54a8fc8
commit f7f3b7b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 ## main
 
+## v0.5.2
+- The request all method will now check the response for extract ability of the response
+
 ## v0.5.1
 - Added missing address fake builder country iso code type setter
 

diff --git a/src/Services/OnOfficeService.php b/src/Services/OnOfficeService.php
@@ -139,8 +139,11 @@ public function requestAll(
                 $countAbsolute = $response->json($countPath, 0);
                 $maxPage = ceil($countAbsolute / $pageSize);
             }
+            $responseResult = $response->json($resultPath);
 
-            $data->push(...$response->json($resultPath));
+            if (is_array($responseResult)) {
+                $data->push(...$responseResult);
+            }
 
             $offset += $pageSize;
             $currentPage = $offset / $pageSize;

diff --git a/tests/Services/OnOfficeServiceTest.php b/tests/Services/OnOfficeServiceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
@@ -70,6 +71,40 @@
             );
         });
     })->with([300, 301, 400, 401, 500, 501]);
+
+    it('can handle null in result path', function () {
+        Http::preventStrayRequests();
+        Http::fake([
+            '*' => Http::response([
+                'status' => [
+                    'code' => 200,
+                ],
+                'response' => [
+                    'results' => [
+                        [
+                            'data' => [
+                                'meta' => [
+                                    'cntabsolute' => 0,
+                                ],
+                            ],
+                        ],
+                    ],
+                ]
+            ]),
+        ]);
+
+        $onOfficeService = app(OnOfficeService::class);
+
+        $response = $onOfficeService->requestAll(function () {
+            return app(OnOfficeService::class)->requestApi(
+                OnOfficeAction::Get,
+                OnOfficeResourceType::Estate,
+            );
+        });
+
+        expect($response)->toBeInstanceOf(Collection::class)
+            ->toBeEmpty();
+    });
 });
 
 describe('requestAllChunked', function () {