chore: remove extra id in payload send to upload

README.md

@@ -118,7 +118,7 @@ const SHOP_CONTENTS = [
 ];
 ```
 
-Create a service "planesService.php" (in plural) in the [shop content services folder](src/Service/ShopContent/) that implements the [ShopContentServiceInterface.php](src/Service/ShopContent/ShopContentServiceInterface.php) interface. For the method structure, use the existing base on all other shop content services to maintain consistency.
+Create a service "planesService.php" (in plural) in the [shop content services folder](src/Service/ShopContent/) that extends the [ShopContentAbstractService](src/Service/ShopContent/ShopContentAbstractService.php) and implements the [ShopContentServiceInterface.php](src/Service/ShopContent/ShopContentServiceInterface.php) interface. For the method structure, use the existing base on all other shop content services to maintain consistency.
 ```PHP
 class PlanesService extends ShopContentAbstractService implements ShopContentServiceInterface
 {

src/Config/Config.php

@@ -34,7 +34,7 @@ class Config
 {
     const MYSQL_DATE_FORMAT = 'Y-m-d H:i:s';
 
-    CONST INCREMENTAL_SYNC_TABLE_NAME = 'eventbus_incremental_sync';
+    const INCREMENTAL_SYNC_TABLE_NAME = 'eventbus_incremental_sync';
     const INCREMENTAL_SYNC_TABLE_SIZE_CHECK_MOD = 20;
     const INCREMENTAL_SYNC_MAX_TABLE_SIZE = 100000;
 

src/Repository/AbstractRepository.php

@@ -26,7 +26,6 @@
 
 namespace PrestaShop\Module\PsEventbus\Repository;
 
-use PrestaShop\Module\PsEventbus\Config\Config;
 use PrestaShop\Module\PsEventbus\Service\CommonService;
 
 if (!defined('_PS_VERSION_')) {

src/Repository/IncrementalSyncRepository.php

@@ -26,7 +26,6 @@
 
 namespace PrestaShop\Module\PsEventbus\Repository;
 
-use PrestaShop\Module\PsEventbus\Config\Config;
 use PrestaShop\Module\PsEventbus\Handler\ErrorHandler\ErrorHandler;
 
 if (!defined('_PS_VERSION_')) {
@@ -146,7 +145,7 @@ public function getIncrementalSyncObjects($shopContent, $langIso, $limit)
 
         $this->query->select(
             'eis.type',
-            'eis.id_object as id', 
+            'eis.id_object as id',
             'eis.action'
         );
 

src/Repository/ProductRepository.php

@@ -26,8 +26,6 @@
 
 namespace PrestaShop\Module\PsEventbus\Repository;
 
-use PrestaShop\Module\PsEventbus\Config\Config;
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }

src/Service/ShopContent/CarrierDetailsService.php

@@ -95,7 +95,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
             foreach ($result as $carrierData) {
                 $carrierDetails = array_merge($carrierDetails, $this->buildCarrierDetails($carrierData));
             }
-    
+
             $this->castCarrierDetails($carrierDetails);
         }
 

src/Service/ShopContent/CarrierTaxesService.php

@@ -97,7 +97,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
 
             $this->castCarrierTaxes($carrierTaxes);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_CARRIER_TAXES, 'id_carrier', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/CartRulesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_cart_rule'],
                 'collection' => Config::COLLECTION_CART_RULES,
                 'properties' => $item,
             ];

src/Service/ShopContent/CurrenciesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_currency'],
                 'collection' => Config::COLLECTION_CURRENCIES,
                 'properties' => $item,
             ];

src/Service/ShopContent/CustomProductCarriersService.php

@@ -78,7 +78,7 @@ public function getContentsForFull($offset, $limit, $langIso)
     public function getContentsForIncremental($limit, $upsertedContents, $deletedContents, $langIso)
     {
         $result = $this->customProductCarrierRepository->retrieveContentsForIncremental($limit, array_column($upsertedContents, 'id'), $langIso);
-    
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_CUSTOM_PRODUCT_CARRIERS, 'id_carrier_reference', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/EmployeesService.php

@@ -84,7 +84,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castEmployees($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_EMPLOYEES, 'id_employee', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/ImageTypesService.php

@@ -84,7 +84,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castImageTypes($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_IMAGE_TYPES, 'id_image_type', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/LanguagesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_lang'],
                 'collection' => Config::COLLECTION_LANGUAGES,
                 'properties' => $item,
             ];
@@ -84,7 +83,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castLanguages($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_LANGUAGES, 'id_lang', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/ManufacturersService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_manufacturer'],
                 'collection' => Config::COLLECTION_MANUFACTURERS,
                 'properties' => $item,
             ];

src/Service/ShopContent/OrderCartRulesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_order_cart_rule'],
                 'collection' => Config::COLLECTION_ORDER_CART_RULES,
                 'properties' => $item,
             ];

src/Service/ShopContent/OrderDetailsService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_order_detail'],
                 'collection' => Config::COLLECTION_ORDER_DETAILS,
                 'properties' => $item,
             ];
@@ -84,7 +83,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castOrderDetails($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_ORDER_DETAILS, 'id_order_detail', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/OrderHistoriesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_order_history'],
                 'collection' => Config::COLLECTION_ORDER_HISTORIES,
                 'properties' => $item,
             ];
@@ -84,7 +83,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castOrderHistories($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_ORDER_HISTORIES, 'id_order_state', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/OrdersService.php

@@ -75,7 +75,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_order'],
                 'collection' => Config::COLLECTION_ORDERS,
                 'properties' => $item,
             ];
@@ -97,7 +96,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castOrders($result, $langIso);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_ORDERS, 'id_order', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/ProductBundlesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_bundle'],
                 'collection' => Config::COLLECTION_PRODUCT_BUNDLES,
                 'properties' => $item,
             ];

src/Service/ShopContent/ProductSuppliersService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_product_supplier'],
                 'collection' => Config::COLLECTION_PRODUCT_SUPPLIERS,
                 'properties' => $item,
             ];

src/Service/ShopContent/ShopContentAbstractService.php

@@ -37,8 +37,8 @@ protected function formatIncrementalSyncResponse($collection, $idKeyForBinding,
         $data = [];
 
         // We need to bind the upserted data with list of upserted content from incremental table to get the action
-        foreach($upsertedContents as $upsertedContent) {
-            foreach($upsertedList as $item) {
+        foreach ($upsertedContents as $upsertedContent) {
+            foreach ($upsertedList as $item) {
                 if ($upsertedContent[$idKeyForBinding] == $item['id']) {
                     $data[] = [
                         'collection' => $collection,
@@ -54,7 +54,6 @@ protected function formatIncrementalSyncResponse($collection, $idKeyForBinding,
             $data[] = [
                 'collection' => $collection,
                 'properties' => [
-                    'id' => $item['id'],
                 ],
                 'action' => $item['action'],
             ];

src/Service/ShopContent/SpecificPricesService.php

@@ -69,7 +69,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_specific_price'],
                 'collection' => Config::COLLECTION_SPECIFIC_PRICES,
                 'properties' => $item,
             ];
@@ -91,7 +90,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castCustomPrices($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_SPECIFIC_PRICES, 'id_specific_price', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/StockMovementsService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_stock_mvt'],
                 'collection' => Config::COLLECTION_STOCK_MOVEMENTS,
                 'properties' => $item,
             ];

src/Service/ShopContent/StocksService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_stock_available'],
                 'collection' => Config::COLLECTION_STOCKS,
                 'properties' => $item,
             ];

src/Service/ShopContent/StoresService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_store'],
                 'collection' => Config::COLLECTION_STORES,
                 'properties' => $item,
             ];

src/Service/ShopContent/SuppliersService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_supplier'],
                 'collection' => Config::COLLECTION_SUPPLIERS,
                 'properties' => $item,
             ];
@@ -84,7 +83,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castSuppliers($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_SUPPLIERS, 'id_supplier', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/TaxonomiesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['taxonomy_id'],
                 'collection' => Config::COLLECTION_TAXONOMIES,
                 'properties' => $item,
             ];
@@ -84,7 +83,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castTaxonomies($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_TAXONOMIES, 'id_category', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/ThemesService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['theme_id'],
                 'collection' => Config::COLLECTION_THEMES,
                 'properties' => $item,
             ];
@@ -86,7 +85,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $themes = $this->formatThemes($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_THEMES, 'theme_id', $themes, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/TranslationsService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_lang'],
                 'collection' => Config::COLLECTION_TRANSLATIONS,
                 'properties' => $item,
             ];
@@ -84,7 +83,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castTranslations($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_TRANSLATIONS, 'id_translation', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/WishlistProductsService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_wishlist_product'],
                 'collection' => Config::COLLECTION_WISHLIST_PRODUCTS,
                 'properties' => $item,
             ];
@@ -84,7 +83,7 @@ public function getContentsForIncremental($limit, $upsertedContents, $deletedCon
         if (!empty($result)) {
             $this->castWishlistProducts($result);
         }
-        
+
         return parent::formatIncrementalSyncResponse(Config::COLLECTION_WISHLIST_PRODUCTS, 'id_wishlist', $result, $upsertedContents, $deletedContents);
     }
 

src/Service/ShopContent/WishlistsService.php

@@ -62,7 +62,6 @@ public function getContentsForFull($offset, $limit, $langIso)
 
         return array_map(function ($item) {
             return [
-                'id' => $item['id_wishlist'],
                 'collection' => Config::COLLECTION_WISHLISTS,
                 'properties' => $item,
             ];