Merge branch 'main' into ci/upgrade

PrestaShopCorp · Oct 25, 2024 · d7eb14d · d7eb14d
2 parents 55f776c + 26ad8fa
commit d7eb14d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/ps_eventbus.php b/ps_eventbus.php
@@ -633,7 +633,7 @@ public function hookActionObjectProductAddAfter($parameters)
         $product = $parameters['object'];
         if (isset($product->id)) {
             $synchronizationService->sendLiveSync('products', $product->id, 'upsert');
-            $synchronizationService->sendLiveSync('custom-product-carriers', $product->id, 'upsert');
+            $synchronizationService->sendLiveSync('custom_product_carriers', $product->id, 'upsert');
             $synchronizationService->sendLiveSync('stocks', $product->id, 'upsert');
 
             $synchronizationService->insertIncrementalSyncObject(
@@ -661,7 +661,7 @@ public function hookActionObjectProductUpdateAfter($parameters)
 
         if (isset($product->id)) {
             $synchronizationService->sendLiveSync('products', $product->id, 'upsert');
-            $synchronizationService->sendLiveSync('custom-product-carriers', $product->id, 'upsert');
+            $synchronizationService->sendLiveSync('custom_product_carriers', $product->id, 'upsert');
             $synchronizationService->sendLiveSync('stocks', $product->id, 'upsert');
 
             $synchronizationService->insertIncrementalSyncObject(
@@ -1152,7 +1152,7 @@ public function hookActionObjectCartRuleAddAfter($parameters)
         $cartRule = $parameters['object'];
 
         if (isset($cartRule->id)) {
-            $synchronizationService->sendLiveSync('cart-rules', $cartRule->id, 'upsert');
+            $synchronizationService->sendLiveSync('cart_rules', $cartRule->id, 'upsert');
             $synchronizationService->insertIncrementalSyncObject(
                 $cartRule->id,
                 Config::COLLECTION_CART_RULES,
@@ -1175,7 +1175,7 @@ public function hookActionObjectCartRuleDeleteAfter($parameters)
         $cartRule = $parameters['object'];
 
         if (isset($cartRule->id)) {
-            $synchronizationService->sendLiveSync('cart-rules', $cartRule->id, 'delete');
+            $synchronizationService->sendLiveSync('cart_rules', $cartRule->id, 'delete');
             $synchronizationService->insertDeletedObject(
                 $cartRule->id,
                 Config::COLLECTION_CART_RULES,
@@ -1198,7 +1198,7 @@ public function hookActionObjectCartRuleUpdateAfter($parameters)
         $cartRule = $parameters['object'];
 
         if (isset($cartRule->id)) {
-            $synchronizationService->sendLiveSync('cart-rules', $cartRule->id, 'upsert');
+            $synchronizationService->sendLiveSync('cart_rules', $cartRule->id, 'upsert');
             $synchronizationService->insertIncrementalSyncObject(
                 $cartRule->id,
                 Config::COLLECTION_CART_RULES,
@@ -1689,7 +1689,7 @@ public function hookActionObjectSpecificPriceAddAfter($parameters)
 
         if ($specificPrice instanceof SpecificPrice) {
             if (isset($specificPrice->id)) {
-                $synchronizationService->sendLiveSync('specific-prices', $specificPrice->id, 'upsert');
+                $synchronizationService->sendLiveSync('specific_prices', $specificPrice->id, 'upsert');
                 $synchronizationService->insertIncrementalSyncObject(
                     $specificPrice->id,
                     Config::COLLECTION_SPECIFIC_PRICES,
@@ -1715,7 +1715,7 @@ public function hookActionObjectSpecificPriceUpdateAfter($parameters)
 
         if ($specificPrice instanceof SpecificPrice) {
             if (isset($specificPrice->id)) {
-                $synchronizationService->sendLiveSync('specific-prices', $specificPrice->id, 'upsert');
+                $synchronizationService->sendLiveSync('specific_prices', $specificPrice->id, 'upsert');
                 $synchronizationService->insertIncrementalSyncObject(
                     $specificPrice->id,
                     Config::COLLECTION_SPECIFIC_PRICES,
@@ -1741,7 +1741,7 @@ public function hookActionObjectSpecificPriceDeleteAfter($parameters)
 
         if ($specificPrice instanceof SpecificPrice) {
             if (isset($specificPrice->id)) {
-                $synchronizationService->sendLiveSync('specific-prices', $specificPrice->id, 'delete');
+                $synchronizationService->sendLiveSync('specific_prices', $specificPrice->id, 'delete');
                 $synchronizationService->insertDeletedObject(
                     $specificPrice->id,
                     Config::COLLECTION_SPECIFIC_PRICES,

diff --git a/src/Api/LiveSyncApiClient.php b/src/Api/LiveSyncApiClient.php
@@ -73,6 +73,9 @@ private function getClient($timeout = Config::SYNC_API_MAX_TIMEOUT)
      */
     public function liveSync($shopContent, $shopContentId, $action)
     {
+        // shop content send to the API must be in kebab-case
+        $kebabCasedShopContent = str_replace('_', '-', $shopContent);
+
         $response = $this->getClient(3)->sendRequest(
             new Request(
                 'POST',
@@ -83,7 +86,7 @@ public function liveSync($shopContent, $shopContentId, $action)
                     'User-Agent' => 'ps-eventbus/' . $this->module->version,
                     'Content-Type' => 'application/json',
                 ],
-                '{"shopContents": ["' . $shopContent . '"], "shopContentId": ' . $shopContentId . ', "action": "' . $action . '"}'
+                '{"shopContents": ["' . $kebabCasedShopContent . '"], "shopContentId": ' . $shopContentId . ', "action": "' . $action . '"}'
             )
         );
 

diff --git a/upgrade/Upgrade-3.2.1.php b/upgrade/Upgrade-3.2.1.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @return bool
+ */
+function upgrade_module_3_2_1()
+{
+    $db = Db::getInstance();
+
+    // Delete all entries with type "cart_rules" from eventbus_incremental_sync
+    $db->delete('eventbus_incremental_sync', '`type` = "cart_rules"');
+
+    // reset full sync for cart_rules
+    $db->update(
+        'eventbus_type_sync',
+        [
+            'offset' => 0,
+            'full_sync_finished' => 0,
+        ],
+        '`type` = "cart_rules"'
+    );
+
+    return true;
+}