feat: pseventbus v4 carrier details and taxes (#354)

PrestaShopCorp · Sep 11, 2024 · e99ffb6 · e99ffb6
1 parent 2b47db3
commit e99ffb6
Show file tree

Hide file tree

Showing 31 changed files with 684 additions and 1,695 deletions.
diff --git a/config/common/builder.yml b/config/common/builder.yml
diff --git a/config/common/repository.yml b/config/common/repository.yml
@@ -121,8 +121,8 @@ services:
     class: PrestaShop\Module\PsEventbus\Repository\StateRepository
     public: true
 
-  PrestaShop\Module\PsEventbus\Repository\TaxRepository:
-    class: PrestaShop\Module\PsEventbus\Repository\TaxRepository
+  PrestaShop\Module\PsEventbus\Repository\TaxeRepository:
+    class: PrestaShop\Module\PsEventbus\Repository\TaxeRepository
     public: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext()'

diff --git a/config/front/services.yml b/config/front/services.yml
@@ -4,7 +4,6 @@ imports:
   - { resource: ../common/decorator.yml }
   - { resource: ../common/repository.yml }
   - { resource: ../common/new-repository.yml }
-  - { resource: ../common/builder.yml }
 
 services:
   PrestaShop\Module\PsEventbus\Service\ApiAuthorizationService:
@@ -85,4 +84,15 @@ services:
     arguments:
       - '@PrestaShop\Module\PsEventbus\Repository\NewRepository\CarrierRepository'
       - '@PrestaShop\Module\PsEventbus\Repository\ConfigurationRepository'
-      - '@PrestaShop\Module\PsEventbus\Builder\CarrierBuilder'
+
+  PrestaShop\Module\PsEventbus\Service\ShopContent\CarrierDetailsService:
+    class:  PrestaShop\Module\PsEventbus\Service\ShopContent\CarrierDetailsService
+    public: true
+    arguments:
+      - '@PrestaShop\Module\PsEventbus\Repository\NewRepository\CarrierRepository'
+
+  PrestaShop\Module\PsEventbus\Service\ShopContent\CarrierTaxesService:
+    class:  PrestaShop\Module\PsEventbus\Service\ShopContent\CarrierTaxesService
+    public: true
+    arguments:
+      - '@PrestaShop\Module\PsEventbus\Repository\NewRepository\CarrierRepository'
diff --git a/controllers/front/apiFront.php b/controllers/front/apiFront.php
@@ -23,8 +23,8 @@ public function postProcess()
         /** @var int $limit */
         $limit = Tools::getValue('limit', 50);
 
-        /** @var bool $isFull */
-        $isFull = Tools::getValue('full', 0) == 1;
+        /** @var bool $fullSyncRequested */
+        $fullSyncRequested = Tools::getValue('full', 0) == 1;
 
         /** @var bool $debug */
         $debug = Tools::getValue('debug') == 1;
@@ -41,6 +41,6 @@ public function postProcess()
         // edit shopContent for matching Config.php const
         $shopContentEdited = str_replace('-', '_', $shopContent);
 
-        $frontApiService->handleDataSync($shopContentEdited, $jobId, $langIso, $limit, $isFull, $debug, $ise2e);
+        $frontApiService->handleDataSync($shopContentEdited, $jobId, $langIso, $limit, $fullSyncRequested, $debug, $ise2e);
     }
 }
diff --git a/e2e/src/fixtures/1.6/carrier_taxes.json b/e2e/src/fixtures/1.6/carrier_taxes.json
@@ -0,0 +1 @@
+[]
diff --git a/e2e/src/fixtures/1.7/carrier_taxes.json b/e2e/src/fixtures/1.7/carrier_taxes.json
@@ -0,0 +1 @@
+[]
diff --git a/e2e/src/fixtures/8/carrier_taxes.json b/e2e/src/fixtures/8/carrier_taxes.json
@@ -0,0 +1 @@
+[]
diff --git a/e2e/src/fixtures/9/carrier_taxes.json b/e2e/src/fixtures/9/carrier_taxes.json
@@ -0,0 +1 @@
+[]
diff --git a/e2e/src/helpers/shop-contents.ts b/e2e/src/helpers/shop-contents.ts
@@ -35,6 +35,8 @@ import R from "ramda";
 
 export const shopContentMapping = {
   'carriers': 'carriers',
+  'carrier_details': 'carrier-details',
+  'carrier_taxes': 'carrier-taxes',
   'orders': 'orders',
   'order_cart_rules': 'order-cart-rules',
   'order_details': 'order-details',