chore(api): change querybuilder named parameter

tleon · Apr 12, 2024 · d949f68 · d949f68
1 parent 428e5cb
commit d949f68
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/config/admin/services.yml b/config/admin/services.yml
@@ -6,3 +6,21 @@ services:
   PrestaShop\Module\APIResources\List\ModuleQueryBuilder:
     parent: 'prestashop.core.grid.abstract_query_builder'
     autowire: true
+
+  prestashop.core.grid.data_factory.hook:
+    class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
+    public: true
+    arguments:
+      - '@prestashop.core.api.query_builder.hook'
+      - '@prestashop.core.hook.dispatcher'
+      - '@prestashop.core.grid.query.doctrine_query_parser'
+      - 'hook'
+
+  prestashop.core.grid.data_factory.module:
+    class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
+    public: true
+    arguments:
+      - '@PrestaShop\Module\APIResources\List\ModuleQueryBuilder'
+      - '@prestashop.core.hook.dispatcher'
+      - '@prestashop.core.grid.query.doctrine_query_parser'
+      - 'module'
diff --git a/src/ApiPlatform/Resources/ApiClient/ApiClientList.php b/src/ApiPlatform/Resources/ApiClient/ApiClientList.php
@@ -24,13 +24,12 @@
 
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
-use PrestaShop\PrestaShop\Core\Grid\Query\ApiClientQueryBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters\ApiClientFilters;
-use PrestaShopBundle\ApiPlatform\Metadata\DQBPaginatedList;
+use PrestaShopBundle\ApiPlatform\Metadata\PaginatedList;
 
 #[ApiResource(
     operations: [
-        new DQBPaginatedList(
+        new PaginatedList(
             uriTemplate: '/api-clients',
             scopes: [
                 'api_client_read',
@@ -41,7 +40,7 @@
                 '[client_name]' => '[clientName]',
                 '[external_issuer]' => '[externalIssuer]',
             ],
-            queryBuilder: ApiClientQueryBuilder::class,
+            gridDataFactory: 'prestashop.core.grid.data_factory.api_client',
             filtersClass: ApiClientFilters::class,
             filtersMapping: [
                 '[apiClientId]' => '[id_api_client]',

diff --git a/src/ApiPlatform/Resources/Hook.php b/src/ApiPlatform/Resources/Hook.php
@@ -31,7 +31,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShopBundle\ApiPlatform\Metadata\CQRSGet;
 use PrestaShopBundle\ApiPlatform\Metadata\CQRSUpdate;
-use PrestaShopBundle\ApiPlatform\Metadata\DQBPaginatedList;
+use PrestaShopBundle\ApiPlatform\Metadata\PaginatedList;
 use PrestaShopBundle\ApiPlatform\Provider\QueryListProvider;
 
 #[ApiResource(
@@ -75,12 +75,12 @@
             CQRSQuery: GetHook::class,
             scopes: ['hook_read']
         ),
-        new DQBPaginatedList(
+        new PaginatedList(
             uriTemplate: '/hooks',
             provider: QueryListProvider::class,
             scopes: ['hook_read'],
             ApiResourceMapping: ['[id_hook]' => '[id]'],
-            queryBuilder: 'prestashop.core.api.query_builder.hook',
+            gridDataFactory: 'prestashop.core.grid.data_factory.hook',
         ),
     ],
 )]

diff --git a/src/ApiPlatform/Resources/Module/Module.php b/src/ApiPlatform/Resources/Module/Module.php
@@ -24,10 +24,9 @@
 
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
-use PrestaShop\Module\APIResources\List\ModuleQueryBuilder;
 use PrestaShop\PrestaShop\Core\Domain\Module\Query\GetModuleInfos;
 use PrestaShopBundle\ApiPlatform\Metadata\CQRSGet;
-use PrestaShopBundle\ApiPlatform\Metadata\DQBPaginatedList;
+use PrestaShopBundle\ApiPlatform\Metadata\PaginatedList;
 
 #[ApiResource(
     operations: [
@@ -38,12 +37,12 @@
                 'module_read',
             ],
         ),
-        new DQBPaginatedList(
+        new PaginatedList(
             uriTemplate: '/modules',
             scopes: [
                 'module_read',
             ],
-            queryBuilder: ModuleQueryBuilder::class,
+            gridDataFactory: 'prestashop.core.grid.data_factory.module',
         ),
     ],
 )]

diff --git a/src/ApiPlatform/Resources/ProductList.php b/src/ApiPlatform/Resources/ProductList.php
@@ -25,24 +25,25 @@
 
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
+use PrestaShop\PrestaShop\Adapter\Product\Grid\Data\Factory\ProductGridDataFactoryDecorator;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 use PrestaShop\PrestaShop\Core\Search\Filters\ProductFilters;
-use PrestaShopBundle\ApiPlatform\Metadata\DQBPaginatedList;
+use PrestaShopBundle\ApiPlatform\Metadata\PaginatedList;
 use PrestaShopBundle\ApiPlatform\Provider\QueryListProvider;
 use Symfony\Component\HttpFoundation\Response;
 
 #[ApiResource(
     operations: [
-        new DQBPaginatedList(
+        new PaginatedList(
             uriTemplate: '/products',
             provider: QueryListProvider::class,
             scopes: ['product_read'],
             ApiResourceMapping: [
                 '[id_product]' => '[productId]',
                 '[final_price_tax_excluded]' => '[price]',
             ],
-            queryBuilder: 'prestashop.core.grid.query_builder.product',
+            gridDataFactory: ProductGridDataFactoryDecorator::class,
             filtersClass: ProductFilters::class,
         ),
     ],