Merge pull request #59 from WeareJH/flag-manager

Fix for pagination calculation error
WeareJH · Oct 28, 2022 · b9a4233 · b9a4233
2 parents b1bc6a1 + 9eb3ac3
commit b9a4233
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Source/Webapi.php b/src/Source/Webapi.php
@@ -44,7 +44,7 @@ public function __construct(
         ?FilterDecoratorInterface $dataRequestFilterDecorator = null
     ) {
         $this->idField = $idField;
-        $this->sourceId = $sourceId;
+        $this->sourceId = sprintf('%s_%s', $sourceId, date('Y_m_d H:i:s'));
         $this->pagingManager = $pagingManager;
         $this->countRequestFactory = $countRequestFactory;
         $this->countResponseHandler = $countResponseHandler;
@@ -71,7 +71,7 @@ public function count(): int
     public function traverse(callable $onSuccess, callable $onError, Report $report): void
     {
         try {
-            $totalNumberOfItems = $this->count();
+            $totalNumberOfItems = $this->countAll();
             $pagesAmount = ceil($totalNumberOfItems / $this->dataRequestPageSize);
 
             for (
@@ -98,6 +98,12 @@ public function getSourceId(): string
         return $this->sourceId;
     }
 
+    private function countAll(): int
+    {
+        $response = $this->httpClient->sendRequest($this->countRequestFactory->create());
+        return $this->countResponseHandler->handle($response);
+    }
+
     private function getPageToStartFrom(): int
     {
         return $this->pagingManager->getValue() === null ? 1 : (int) $this->pagingManager->getValue();