v3.0.5 (#79)

Synerise · Jun 27, 2024 · 75f2d9d · 75f2d9d
1 parent 4dbd394
commit 75f2d9d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/SyneriseApi/Sender/Data/Customer.php b/SyneriseApi/Sender/Data/Customer.php
@@ -11,9 +11,9 @@
 use Synerise\ApiClient\Api\DefaultApi;
 use Synerise\ApiClient\ApiException;
 use Synerise\Integration\Helper\Logger;
-use Synerise\Integration\Helper\Tracking\UuidManagement;
 use Synerise\Integration\Model\Config\Source\Debug\Exclude;
 use Synerise\Integration\Model\Workspace\ConfigFactory as WorkspaceConfigFactory;
+use Synerise\Integration\Observer\MergeUuids;
 use Synerise\Integration\SyneriseApi\Mapper\Data\CustomerCRUD;
 use Synerise\Integration\SyneriseApi\Sender\AbstractSender;
 use Synerise\Integration\Model\Config\Source\Customers\Attributes;
@@ -122,7 +122,7 @@ function () use ($storeId, $payload) {
             }
         } catch (ApiException $e) {
             $shouldLogException = true;
-            if ($eventName == UuidManagement::EVENT) {
+            if ($eventName == MergeUuids::EVENT) {
                 $shouldLogException = $this->loggerHelper->isExcludedFromLogging(
                     Exclude::EXCEPTION_CLIENT_MERGE_FAIL
                 );

diff --git a/SyneriseApi/Sender/Data/Order.php b/SyneriseApi/Sender/Data/Order.php
@@ -109,7 +109,7 @@ public function sendItems($collection, int $storeId, ?int $websiteId = null, arr
         }
 
         if ($ids) {
-            $this->markItemsAsSent($ids);
+            $this->markItemsAsSent($ids, $storeId);
         }
     }
 
@@ -162,15 +162,17 @@ public function isSent(int $orderId): string
     /**
      * Mark orders as sent
      *
-     * @param string[] $ids
+     * @param int[] $ids
+     * @param int $storeId
      * @return void
      */
-    public function markItemsAsSent(array $ids)
+    public function markItemsAsSent(array $ids, int $storeId)
     {
         $data = [];
         foreach ($ids as $id) {
             $data[] = [
-                'order_id' => $id
+                'order_id' => $id,
+                'store_id' => $storeId
             ];
         }
         $this->resource->getConnection()->insertOnDuplicate(

diff --git a/SyneriseApi/Sender/Data/Subscriber.php b/SyneriseApi/Sender/Data/Subscriber.php
@@ -79,7 +79,7 @@ public function sendItems($collection, int $storeId, ?int $websiteId = null, arr
                 $requests,
                 $storeId
             );
-            $this->markSubscribersAsSent($ids);
+            $this->markSubscribersAsSent($ids, $storeId);
         }
     }
 
@@ -146,13 +146,15 @@ protected function getDefaultApiInstance(int $storeId): DefaultApi
      * Mark subscribers as sent
      *
      * @param int[] $ids
+     * @param int $storeId
      */
-    public function markSubscribersAsSent($ids)
+    public function markSubscribersAsSent(array $ids, int $storeId)
     {
         $data = [];
         foreach ($ids as $id) {
             $data[] = [
-                'subscriber_id' => $id
+                'subscriber_id' => $id,
+                'store_id' => $storeId
             ];
         }
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "synerise/magento2-integration",
   "description": "Synerise Magento 2 integration module.",
   "type": "magento2-module",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/etc/db_schema.xml b/etc/db_schema.xml
@@ -43,6 +43,7 @@
     <table name="synerise_sync_order" resource="default" engine="innodb"
            comment="Synerise Synchronization Order Status">
         <column xsi:type="int" name="order_id" unsigned="true" nullable="false" comment="Order ID"/>
+        <column xsi:type="int" name="store_id" unsigned="true" nullable="true" comment="Store ID"/>
         <column xsi:type="timestamp" name="synerise_updated_at" nullable="false" default="CURRENT_TIMESTAMP" comment="Synerise Updated At"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="order_id"/>
@@ -61,6 +62,7 @@
     <table name="synerise_sync_subscriber" resource="default" engine="innodb"
            comment="Synerise Synchronization Subscriber Status">
         <column xsi:type="int" name="subscriber_id" unsigned="true" nullable="false" comment="Subscriber ID"/>
+        <column xsi:type="int" name="store_id" unsigned="true" nullable="true" comment="Store ID"/>
         <column xsi:type="timestamp" name="synerise_updated_at" nullable="false" default="CURRENT_TIMESTAMP" comment="Synerise Updated At"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="subscriber_id"/>

diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
@@ -12,7 +12,8 @@
     "synerise_sync_order": {
         "column": {
             "order_id": true,
-            "synerise_updated_at": true
+            "synerise_updated_at": true,
+            "store_id": true
         },
         "constraint": {
             "PRIMARY": true
@@ -31,7 +32,8 @@
     "synerise_sync_subscriber": {
         "column": {
             "subscriber_id": true,
-            "synerise_updated_at": true
+            "synerise_updated_at": true,
+            "store_id": true
         },
         "constraint": {
             "PRIMARY": true