feat: add better handling for page sizes in stubs

src/Dtos/OnOfficeResponse.php

@@ -21,4 +21,9 @@ public function isEmpty(): bool
     {
         return $this->pages->isEmpty();
     }
+
+    public function count(): int
+    {
+        return $this->pages->count();
+    }
 }

src/Query/Builder.php

@@ -12,6 +12,7 @@
 use Illuminate\Support\Traits\Conditionable;
 use Innobrain\OnOfficeAdapter\Dtos\OnOfficeRequest;
 use Innobrain\OnOfficeAdapter\Dtos\OnOfficeResponse;
+use Innobrain\OnOfficeAdapter\Dtos\OnOfficeResponsePage;
 use Innobrain\OnOfficeAdapter\Exceptions\OnOfficeException;
 use Innobrain\OnOfficeAdapter\Exceptions\StrayRequestException;
 use Innobrain\OnOfficeAdapter\Query\Concerns\BuilderInterface;
@@ -86,6 +87,16 @@ class Builder implements BuilderInterface
      */
     protected BaseRepository $repository;
 
+    /**
+     * The last request that was made. Needed for the stubbing.
+     */
+    private ?OnOfficeRequest $requestCache = null;
+
+    /**
+     * The last stub response.
+     */
+    private ?OnOfficeResponse $responseCache = null;
+
     public function __construct() {}
 
     protected function getOnOfficeService(): OnOfficeService
@@ -157,7 +168,21 @@ protected function requestAll(OnOfficeRequest $request): Collection
             data_set($request->parameters, OnOfficeService::LISTOFFSET, $offset);
 
             return $this->requestApi($request);
-        }, pageSize: $this->pageSize, offset: $this->offset, limit: $this->limit);
+        }, pageSize: $this->pageSize, offset: $this->offset, limit: $this->limit, pageOverwrite: $this->getPageOverwrite());
+    }
+
+    /**
+     * To have a more flexible way to overwrite the page sizes
+     * in stub responses.
+     * We need to determine the page size by
+     * counting the number of pages in the stub response.
+     */
+    private function getPageOverwrite(): ?int
+    {
+        /** @var ?OnOfficeResponse $stub */
+        $stub = ($this->stubCallables ?? collect())->first();
+
+        return $stub?->count();
     }
 
     /**
@@ -173,28 +198,28 @@ protected function requestAllChunked(OnOfficeRequest $request, callable $callbac
             data_set($request->parameters, OnOfficeService::LISTOFFSET, $offset);
 
             return $this->requestApi($request);
-        }, $callback, pageSize: $this->pageSize, offset: $this->offset, limit: $this->limit);
+        }, $callback, pageSize: $this->pageSize, offset: $this->offset, limit: $this->limit, pageOverwrite: $this->getPageOverwrite());
     }
 
     /**
      * @throws JsonException
      */
     protected function getStubCallable(OnOfficeRequest $request): ?Response
     {
-        $response = ($this->stubCallables ?? collect())->first();
+        // if the request is different from the last one, reset the response cache
+        if ($this->requestCache !== $request) {
+            $this->requestCache = $request;
+            $this->responseCache = ($this->stubCallables ?? collect())->shift();
+        }
 
-        ($this->stubCallables ?? collect())->shift();
+        /** @var ?OnOfficeResponsePage $response */
+        $response = $this->responseCache?->shift();
 
         if (is_null($response)) {
             return null;
         }
 
-        /** @var OnOfficeResponse $response */
-        if ($response->isEmpty()) {
-            return null;
-        }
-
-        $response = $response->shift()->toResponse();
+        $response = $response->toResponse();
 
         $response = new Psr7Response(200, [], json_encode($response, JSON_THROW_ON_ERROR));
 

src/Services/OnOfficeService.php

@@ -125,16 +125,17 @@ public function requestAll(
         int $pageSize = 500,
         int $offset = 0,
         int $limit = -1,
+        ?int $pageOverwrite = null,
     ): Collection {
-        $maxPage = 0;
+        $maxPage = $pageOverwrite ?? 0;
         $data = new Collection;
         do {
             try {
                 $response = $request($pageSize, $offset);
             } catch (OnOfficeException $exception) {
                 Log::error("{$exception->getMessage()} - {$exception->getCode()}");
 
-                if ($maxPage === 0) {
+                if ($maxPage === 0 || $pageOverwrite !== null) {
                     throw $exception;
                 }
 
@@ -190,16 +191,17 @@ public function requestAllChunked(
         int $pageSize = 500,
         int $offset = 0,
         int $limit = -1,
+        ?int $pageOverwrite = null,
     ): void {
-        $maxPage = 0;
+        $maxPage = $pageOverwrite ?? 0;
         $elementCount = 0;
         do {
             try {
                 $response = $request($pageSize, $offset);
             } catch (OnOfficeException $exception) {
                 Log::error("{$exception->getMessage()} - {$exception->getCode()}");
 
-                if ($maxPage === 0) {
+                if ($maxPage === 0 || $pageOverwrite !== null) {
                     throw $exception;
                 }
 

tests/Dtos/OnOfficeResponseTest.php

@@ -23,5 +23,6 @@
     $response = new OnOfficeResponse(collect([$page]));
 
     expect($response->shift())->toBeInstanceOf(OnOfficeResponsePage::class)
+        ->and($response->count())->toBe(0)
         ->and($response->isEmpty())->toBeTrue();
 });

tests/Repositories/BaseRepositoryTest.php

@@ -8,6 +8,7 @@
 use Innobrain\OnOfficeAdapter\Dtos\OnOfficeResponse;
 use Innobrain\OnOfficeAdapter\Enums\OnOfficeAction;
 use Innobrain\OnOfficeAdapter\Enums\OnOfficeResourceType;
+use Innobrain\OnOfficeAdapter\Facades\Testing\RecordFactories\BaseFactory;
 use Innobrain\OnOfficeAdapter\Repositories\BaseRepository;
 
 describe('stray requests', function () {
@@ -143,6 +144,102 @@
 
         expect($m->getValue($builder)->toArray())->toHaveCount(20);
     });
+
+    it('can fake a response with more than one page', function () {
+        $builder = new BaseRepository;
+
+        $builder->fake([
+            $builder->response([
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+            ]),
+        ]);
+
+        $result = $builder->query()->call(new OnOfficeRequest(
+            OnOfficeAction::Read,
+            OnOfficeResourceType::Estate,
+        ));
+
+        expect($result->count())->toBe(2);
+    });
+
+    it('can fake a response with more than one page and another response', function () {
+        $builder = new BaseRepository;
+
+        $builder->fake([
+            $builder->response([
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+            ]),
+            $builder->response([
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+            ]),
+        ]);
+
+        $result = $builder->query()->call(new OnOfficeRequest(
+            OnOfficeAction::Read,
+            OnOfficeResourceType::Estate,
+        ));
+
+        expect($result->count())->toBe(2);
+
+        $result = $builder->query()->call(new OnOfficeRequest(
+            OnOfficeAction::Read,
+            OnOfficeResourceType::Estate,
+        ));
+
+        expect($result->count())->toBe(1);
+    });
+
+    it('can fake a response with more than one page and another response on each page', function () {
+        $builder = new BaseRepository;
+
+        $builder->fake([
+            $builder->response([
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+            ]),
+            $builder->response([
+                $builder->page(recordFactories: [
+                    BaseFactory::make(),
+                ]),
+            ]),
+        ]);
+
+        $result = [];
+        $builder->query()->chunked(new OnOfficeRequest(
+            OnOfficeAction::Read,
+            OnOfficeResourceType::Estate,
+        ), function (array $records) use (&$result) {
+            $result[] = count($records);
+        });
+
+        expect($result[0])->toBe(1)
+            ->and($result[1])->toBe(1);
+
+        $builder->query()->chunked(new OnOfficeRequest(
+            OnOfficeAction::Read,
+            OnOfficeResourceType::Estate,
+        ), function (array $records) use (&$result) {
+            $result[] = count($records);
+        });
+
+        expect($result[2])->toBe(1);
+    });
 });
 
 describe('assert', function () {