manage page count, fix extractor to use api pagination

JoMessina · JoMessina · commit afc78d585c00 · 2024-01-23T16:34:14.000+01:00
diff --git a/src/CustomerExtractor.php b/src/CustomerExtractor.php
@@ -6,7 +6,6 @@
 
 use Kiboko\Component\Bucket\AcceptanceResultBucket;
 use Kiboko\Component\Bucket\RejectionResultBucket;
-use Kiboko\Component\Flow\Magento2\Filter\FilterInterface;
 use Kiboko\Contract\Bucket\ResultBucketInterface;
 use Kiboko\Contract\Pipeline\ExtractorInterface;
 use Psr\Http\Client\NetworkExceptionInterface;
@@ -53,6 +52,7 @@ public function extract(): iterable
                 $response = $this->client->customerCustomerRepositoryV1GetListGet(
                     queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
                 );
+                $pageCount = (int) ceil($response->getTotalCount() / $this->pageSize);
 
                 if (!$response instanceof \Kiboko\Magento\V2_1\Model\CustomerDataCustomerSearchResultsInterface
                     && !$response instanceof \Kiboko\Magento\V2_2\Model\CustomerDataCustomerSearchResultsInterface
@@ -63,15 +63,14 @@ public function extract(): iterable
                 }
 
                 yield $this->processResponse($response);
-            }
-
 
-            while ($currentPage++ < $pageCount) {
-                $response = $this->client->customerCustomerRepositoryV1GetListGet(
-                    queryParameters: iterator_to_array($this->walkFilterVariants($currentPage)),
-                );
+                while ($currentPage++ < $pageCount) {
+                    $response = $this->client->customerCustomerRepositoryV1GetListGet(
+                        queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
+                    );
 
-                yield $this->processResponse($response);
+                    yield $this->processResponse($response);
+                }
             }
         } catch (NetworkExceptionInterface $exception) {
             $this->logger->alert(
diff --git a/src/Filter/ArrayFilter.php b/src/Filter/ArrayFilter.php
@@ -11,18 +11,19 @@ public function __construct(
         public string $conditionType,
         public array $value,
         private readonly int $threshold = 200
-    ) {}
+    ) {
+    }
 
     /**
      * @return \Traversable<int, {field: string, value: string, conditionType: string}>
      */
     public function getIterator(): \Traversable
     {
-        $length = count($this->value);
+        $length = \count($this->value);
         for ($offset = 0; $offset < $length; $offset += $this->threshold) {
             yield [
                 'field' => $this->field,
-                'value' => implode(',', array_slice($this->value, $offset, $this->threshold, false)),
+                'value' => implode(',', \array_slice($this->value, $offset, $this->threshold, false)),
                 'conditionType' => $this->conditionType,
             ];
         }
diff --git a/src/Filter/ScalarFilter.php b/src/Filter/ScalarFilter.php
@@ -9,8 +9,9 @@ final class ScalarFilter implements FilterInterface, \IteratorAggregate
     public function __construct(
         public string $field,
         public string $conditionType,
-        public bool|int|float|string|\DateTimeInterface $value,
-    ) {}
+        public bool|\DateTimeInterface|float|int|string $value,
+    ) {
+    }
 
     public function getIterator(): \Traversable
     {
diff --git a/src/FilterGroup.php b/src/FilterGroup.php
@@ -32,7 +32,7 @@ public function withFilters(FilterInterface ...$filter): self
      */
     public function walkFilters(array $parameters, int $groupIndex = 0): \Traversable
     {
-        if (count($this->filters) < 1) {
+        if (\count($this->filters) < 1) {
             return;
         }
 
@@ -48,33 +48,33 @@ private function buildFilters(array $parameters, int $groupIndex, int $filterInd
                     sprintf('searchCriteria[filterGroups][%s][filters][%s][field]', $groupIndex, $filterIndex) => $current['field'],
                     sprintf('searchCriteria[filterGroups][%s][filters][%s][value]', $groupIndex, $filterIndex) => $current['value'],
                     sprintf('searchCriteria[filterGroups][%s][filters][%s][conditionType]', $groupIndex, $filterIndex) => $current['conditionType'],
-                ]
+                ],
             ];
 
-            if (count($next) >= 1) {
+            if (\count($next) >= 1) {
                 yield from $this->buildFilters($childParameters, $groupIndex, $filterIndex + 1, ...$next);
             } else {
                 yield $childParameters;
             }
         }
     }
 
-    public function greaterThan(string $field, int|float|string|\DateTimeInterface $value): self
+    public function greaterThan(string $field, \DateTimeInterface|float|int|string $value): self
     {
         return $this->withFilter(new ScalarFilter($field, 'gt', $value));
     }
 
-    public function lowerThan(string $field, int|float|string|\DateTimeInterface $value): self
+    public function lowerThan(string $field, \DateTimeInterface|float|int|string $value): self
     {
         return $this->withFilter(new ScalarFilter($field, 'lt', $value));
     }
 
-    public function greaterThanOrEqual(string $field, int|float|string|\DateTimeInterface $value): self
+    public function greaterThanOrEqual(string $field, \DateTimeInterface|float|int|string $value): self
     {
         return $this->withFilter(new ScalarFilter($field, 'gteq', $value));
     }
 
-    public function lowerThanOrEqual(string $field, int|float|string|\DateTimeInterface $value): self
+    public function lowerThanOrEqual(string $field, \DateTimeInterface|float|int|string $value): self
     {
         return $this->withFilter(new ScalarFilter($field, 'lteq', $value));
     }
diff --git a/src/InvoiceExtractor.php b/src/InvoiceExtractor.php
@@ -22,7 +22,7 @@ public function __construct(
 
     private function walkFilterVariants(int $currentPage = 1): \Traversable
     {
-        yield from  [
+        yield from [
             ...$this->queryParameters->walkVariants([]),
             ...[
                 'searchCriteria[currentPage]' => $currentPage,
@@ -52,6 +52,7 @@ public function extract(): iterable
                 $response = $this->client->salesInvoiceRepositoryV1GetListGet(
                     queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
                 );
+                $pageCount = (int) ceil($response->getTotalCount() / $this->pageSize);
 
                 if (!$response instanceof \Kiboko\Magento\V2_1\Model\SalesDataInvoiceSearchResultInterface
                     && !$response instanceof \Kiboko\Magento\V2_2\Model\SalesDataInvoiceSearchResultInterface
@@ -62,15 +63,14 @@ public function extract(): iterable
                 }
 
                 yield $this->processResponse($response);
-            }
-
 
-            while ($currentPage++ < $pageCount) {
-                $response = $this->client->salesInvoiceRepositoryV1GetListGet(
-                    queryParameters: iterator_to_array($this->walkFilterVariants($currentPage)),
-                );
+                while ($currentPage++ < $pageCount) {
+                    $response = $this->client->salesInvoiceRepositoryV1GetListGet(
+                        queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
+                    );
 
-                yield $this->processResponse($response);
+                    yield $this->processResponse($response);
+                }
             }
         } catch (NetworkExceptionInterface $exception) {
             $this->logger->alert(
diff --git a/src/OrderExtractor.php b/src/OrderExtractor.php
@@ -52,6 +52,7 @@ public function extract(): iterable
                 $response = $this->client->salesOrderRepositoryV1GetListGet(
                     queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
                 );
+                $pageCount = (int) ceil($response->getTotalCount() / $this->pageSize);
 
                 if (!$response instanceof \Kiboko\Magento\V2_1\Model\SalesDataOrderSearchResultInterface
                     && !$response instanceof \Kiboko\Magento\V2_2\Model\SalesDataOrderSearchResultInterface
@@ -62,15 +63,14 @@ public function extract(): iterable
                 }
 
                 yield $this->processResponse($response);
-            }
-
 
-            while ($currentPage++ < $pageCount) {
-                $response = $this->client->salesOrderRepositoryV1GetListGet(
-                    queryParameters: iterator_to_array($this->walkFilterVariants($currentPage)),
-                );
+                while ($currentPage++ < $pageCount) {
+                    $response = $this->client->salesOrderRepositoryV1GetListGet(
+                        queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
+                    );
 
-                yield $this->processResponse($response);
+                    yield $this->processResponse($response);
+                }
             }
         } catch (NetworkExceptionInterface $exception) {
             $this->logger->alert(
diff --git a/src/ProductExtractor.php b/src/ProductExtractor.php
@@ -52,6 +52,7 @@ public function extract(): iterable
                 $response = $this->client->catalogProductRepositoryV1GetListGet(
                     queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
                 );
+                $pageCount = (int) ceil($response->getTotalCount() / $this->pageSize);
 
                 if (!$response instanceof \Kiboko\Magento\V2_1\Model\CatalogDataProductSearchResultsInterface
                     && !$response instanceof \Kiboko\Magento\V2_2\Model\CatalogDataProductSearchResultsInterface
@@ -62,15 +63,14 @@ public function extract(): iterable
                 }
 
                 yield $this->processResponse($response);
-            }
-
 
-            while ($currentPage++ < $pageCount) {
-                $response = $this->client->catalogProductRepositoryV1GetListGet(
-                    queryParameters: iterator_to_array($this->walkFilterVariants($currentPage)),
-                );
+                while ($currentPage++ < $pageCount) {
+                    $response = $this->client->catalogProductRepositoryV1GetListGet(
+                        queryParameters: $this->applyPagination(iterator_to_array($parameters), $currentPage, $this->pageSize),
+                    );
 
-                yield $this->processResponse($response);
+                    yield $this->processResponse($response);
+                }
             }
         } catch (NetworkExceptionInterface $exception) {
             $this->logger->alert(
diff --git a/src/QueryParameters.php b/src/QueryParameters.php
@@ -30,7 +30,7 @@ public function withGroups(FilterGroup ...$group): self
      */
     public function walkVariants(array $parameters): \Traversable
     {
-        if (count($this->groups) < 1) {
+        if (\count($this->groups) < 1) {
             return;
         }
 
@@ -40,7 +40,7 @@ public function walkVariants(array $parameters): \Traversable
     private function buildFilters(array $parameters, int $groupIndex, FilterGroup $first, FilterGroup ...$next): \Traversable
     {
         foreach ($first->walkFilters($parameters, $groupIndex) as $current) {
-            if (count($next) >= 1) {
+            if (\count($next) >= 1) {
                 yield from $this->buildFilters($current, $groupIndex + 1, ...$next);
             } else {
                 yield $current;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function withFilters(FilterInterface ...$filter): self`
`32`	`32`	`*/`
`33`	`33`	`public function walkFilters(array $parameters, int $groupIndex = 0): \Traversable`
`34`	`34`	`{`
`35`		`- if (count($this->filters) < 1) {`
	`35`	`+ if (\count($this->filters) < 1) {`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
`@@ -48,33 +48,33 @@ private function buildFilters(array $parameters, int $groupIndex, int $filterInd`
`48`	`48`	`sprintf('searchCriteria[filterGroups][%s][filters][%s][field]', $groupIndex, $filterIndex) => $current['field'],`
`49`	`49`	`sprintf('searchCriteria[filterGroups][%s][filters][%s][value]', $groupIndex, $filterIndex) => $current['value'],`
`50`	`50`	`sprintf('searchCriteria[filterGroups][%s][filters][%s][conditionType]', $groupIndex, $filterIndex) => $current['conditionType'],`
`51`		`- ]`
	`51`	`+ ],`
`52`	`52`	`];`
`53`	`53`
`54`		`- if (count($next) >= 1) {`
	`54`	`+ if (\count($next) >= 1) {`
`55`	`55`	`yield from $this->buildFilters($childParameters, $groupIndex, $filterIndex + 1, ...$next);`
`56`	`56`	`} else {`
`57`	`57`	`yield $childParameters;`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function greaterThan(string $field, int\|float\|string\|\DateTimeInterface $value): self`
	`62`	`+ public function greaterThan(string $field, \DateTimeInterface\|float\|int\|string $value): self`
`63`	`63`	`{`
`64`	`64`	`return $this->withFilter(new ScalarFilter($field, 'gt', $value));`
`65`	`65`	`}`
`66`	`66`
`67`		`- public function lowerThan(string $field, int\|float\|string\|\DateTimeInterface $value): self`
	`67`	`+ public function lowerThan(string $field, \DateTimeInterface\|float\|int\|string $value): self`
`68`	`68`	`{`
`69`	`69`	`return $this->withFilter(new ScalarFilter($field, 'lt', $value));`
`70`	`70`	`}`
`71`	`71`
`72`		`- public function greaterThanOrEqual(string $field, int\|float\|string\|\DateTimeInterface $value): self`
	`72`	`+ public function greaterThanOrEqual(string $field, \DateTimeInterface\|float\|int\|string $value): self`
`73`	`73`	`{`
`74`	`74`	`return $this->withFilter(new ScalarFilter($field, 'gteq', $value));`
`75`	`75`	`}`
`76`	`76`
`77`		`- public function lowerThanOrEqual(string $field, int\|float\|string\|\DateTimeInterface $value): self`
	`77`	`+ public function lowerThanOrEqual(string $field, \DateTimeInterface\|float\|int\|string $value): self`
`78`	`78`	`{`
`79`	`79`	`return $this->withFilter(new ScalarFilter($field, 'lteq', $value));`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function withGroups(FilterGroup ...$group): self`
`30`	`30`	`*/`
`31`	`31`	`public function walkVariants(array $parameters): \Traversable`
`32`	`32`	`{`
`33`		`- if (count($this->groups) < 1) {`
	`33`	`+ if (\count($this->groups) < 1) {`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
`@@ -40,7 +40,7 @@ public function walkVariants(array $parameters): \Traversable`
`40`	`40`	`private function buildFilters(array $parameters, int $groupIndex, FilterGroup $first, FilterGroup ...$next): \Traversable`
`41`	`41`	`{`
`42`	`42`	`foreach ($first->walkFilters($parameters, $groupIndex) as $current) {`
`43`		`- if (count($next) >= 1) {`
	`43`	`+ if (\count($next) >= 1) {`
`44`	`44`	`yield from $this->buildFilters($current, $groupIndex + 1, ...$next);`
`45`	`45`	`} else {`
`46`	`46`	`yield $current;`