Improved the management of filters

Author: sebprt

src/CustomerExtractor.php

@@ -18,23 +18,20 @@ public function __construct(
         private \Psr\Log\LoggerInterface $logger,
         private \Kiboko\Magento\V2_1\Client|\Kiboko\Magento\V2_2\Client|\Kiboko\Magento\V2_3\Client|\Kiboko\Magento\V2_4\Client $client,
         private int $pageSize = 100,
+        /** @var FilterGroup[] $filters */
+        private array $filters = [],
     ) {
     }
 
-    public function withFilter(string $filter, mixed $value): self
-    {
-        $this->queryParameters[$filter] = $value;
-
-        return $this;
-    }
-
     private function compileQueryParameters(int $currentPage = 1): array
     {
         $parameters = $this->queryParameters;
         $parameters['searchCriteria[currentPage]'] = $currentPage;
         $parameters['searchCriteria[pageSize]'] = $this->pageSize;
 
-        return $parameters;
+        $filters = array_map(fn (FilterGroup $item, int $key) => $item->compileFilters($key), $this->filters, array_keys($this->filters));
+
+        return array_merge($parameters, ...$filters);
     }
 
     public function extract(): iterable

src/FilterGroup.php

@@ -2,6 +2,8 @@
 
 namespace Kiboko\Component\Flow\Magento2;
 
+use phpDocumentor\Reflection\Types\This;
+
 class FilterGroup
 {
     private array $filters = [];
@@ -13,15 +15,24 @@ public function asArray(): array
 
     public function withFilter(string $field, string $operator, mixed $value): self
     {
-        $this->filters = [
-            '[filters][0][field]' => $field,
-            '[filters][0][value]' => $value,
-            '[filters][0][condition_type]' => $operator,
+        $this->filters[] = [
+            'field' => $field,
+            'value' => $value,
+            'condition_type' => $operator,
         ];
 
         return $this;
     }
 
+    public function compileFilters(int $groupIndex = 0): array
+    {
+        return array_merge(...array_map(fn (array $item, int $key) => [
+            sprintf('searchCriteria[filter_groups][%s][filters][%s][field]', $groupIndex, $key) => $item['field'],
+            sprintf('searchCriteria[filter_groups][%s][filters][%s][value]', $groupIndex, $key) => $item['value'],
+            sprintf('searchCriteria[filter_groups][%s][filters][%s][condition_type]', $groupIndex, $key) => $item['condition_type'],
+        ], $this->filters, array_keys($this->filters)));
+    }
+
     public function greaterThan(string $field, mixed $value): self
     {
         return $this->withFilter($field, 'gt', $value);

src/OrderExtractor.php

@@ -18,23 +18,17 @@ public function __construct(
         private \Psr\Log\LoggerInterface $logger,
         private \Kiboko\Magento\V2_1\Client|\Kiboko\Magento\V2_2\Client|\Kiboko\Magento\V2_3\Client|\Kiboko\Magento\V2_4\Client $client,
         private int $pageSize = 100,
+        private array $filters = [],
     ) {
     }
 
-    public function withFilterGroup(FilterGroup $group): self
-    {
-        $this->queryParameters['searchCriteria[filter_groups]'][] = $group->asArray();
-
-        return $this;
-    }
-
     private function compileQueryParameters(int $currentPage = 1): array
     {
         $parameters = $this->queryParameters;
         $parameters['searchCriteria[currentPage]'] = $currentPage;
         $parameters['searchCriteria[pageSize]'] = $this->pageSize;
 
-        return $parameters;
+        return array_merge($parameters, $this->filters);
     }
 
     public function extract(): iterable

src/ProductExtractor.php

@@ -18,23 +18,17 @@ public function __construct(
         private \Psr\Log\LoggerInterface $logger,
         private \Kiboko\Magento\V2_1\Client|\Kiboko\Magento\V2_2\Client|\Kiboko\Magento\V2_3\Client|\Kiboko\Magento\V2_4\Client $client,
         private int $pageSize = 100,
+        private array $filters = [],
     ) {
     }
 
-    public function withFilterGroup(FilterGroup $group): self
-    {
-        $this->queryParameters['searchCriteria[filter_groups]'][] = $group->asArray();
-
-        return $this;
-    }
-
     private function compileQueryParameters(int $currentPage = 1): array
     {
         $parameters = $this->queryParameters;
         $parameters['searchCriteria[currentPage]'] = $currentPage;
         $parameters['searchCriteria[pageSize]'] = $this->pageSize;
 
-        return $parameters;
+        return array_merge($parameters, $this->filters);
     }
 
     public function extract(): iterable

tests/CustomerExtractorTest.php

@@ -5,6 +5,7 @@
 namespace Tests\Kiboko\Magento\V2\Extractor;
 
 use Kiboko\Component\Flow\Magento2\CustomerExtractor;
+use Kiboko\Component\Flow\Magento2\FilterGroup;
 use Kiboko\Component\PHPUnitExtension\Assert\ExtractorAssertTrait;
 use Kiboko\Component\PHPUnitExtension\PipelineRunner;
 use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
@@ -25,26 +26,38 @@ public function testIsSuccessful(): void
             ->setLastname('Doe')
             ->setEmail('johndoe@example.com');
 
+        $customer2 = (new CustomerDataCustomerInterface())
+            ->setFirstname('Seb')
+            ->setLastname('Parrat')
+            ->setEmail('seb@com');
+
         $client = $this->createMock(Client::class);
         $client
             ->expects($this->once())
             ->method('customerCustomerRepositoryV1GetListGet')
             ->willReturn(
                 (new CustomerDataCustomerSearchResultsInterface())
                     ->setItems([
-                        $customer
+                        $customer,
+                        $customer2,
                     ])
                     ->setTotalCount(1)
             );
 
         $extractor = new CustomerExtractor(
             new NullLogger(),
             $client,
+            1,
+            [
+                (new FilterGroup())->withFilter('updated_at', 'eq', '2022-09-05'),
+                (new FilterGroup())->withFilter('active', 'eq', true),
+            ]
         );
 
         $this->assertExtractorExtractsExactly(
             [
-                $customer
+                $customer,
+                $customer2
             ],
             $extractor
         );