Send custom_id instead of uuid in wishlist events. (#45)

* Send custom_id instead of uuid in wishlist events. * MQ support for remove from wishlist event
Synerise · Aug 11, 2023 · d3c62b1 · d3c62b1
1 parent 8bda694
commit d3c62b1
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 16 deletions.
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": "2.2.5",
+  "version": "2.2.6",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/src/Helper/Event.php b/src/Helper/Event.php
@@ -18,6 +18,7 @@
 use Synerise\Integration\Observer\OrderPlace;
 use Synerise\Integration\Observer\ProductReview;
 use Synerise\Integration\Observer\WishlistAddProduct;
+use Synerise\Integration\Observer\WishlistRemoveProduct;
 
 class Event extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -83,9 +84,10 @@ public function sendEvent($event_name, $payload, int $storeId, int $entityId = n
                     $apiInstance->clientRemovedProductFromCart('4.4', $payload);
                     break;
                 case CartQtyUpdate::EVENT:
-                case ProductReview::EVENT:
                 case CartStatus::EVENT:
-                    $apiInstance->customEvent('4.4', $payload);
+                case ProductReview::EVENT:
+                case WishlistRemoveProduct::EVENT:
+                $apiInstance->customEvent('4.4', $payload);
                     break;
                 case CustomerRegister::EVENT:
                     $apiInstance->clientRegistered('4.4', $payload);

diff --git a/src/Observer/WishlistAddProduct.php b/src/Observer/WishlistAddProduct.php
@@ -67,6 +67,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         try {
+            /** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+            $wishlist = $observer->getEvent()->getWishlist();
+            if (!$wishlist->getCustomerId()) {
+                return;
+            }
+
             $product = $observer->getEvent()->getProduct();
             $storeId = $this->trackingHelper->getStoreId();
             $params = [
@@ -105,9 +111,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $eventClientAction = new EventClientAction([
                 'time' => $this->trackingHelper->getCurrentTime(),
                 'label' => $this->trackingHelper->getEventLabel(self::EVENT),
-                'client' => [
-                    'uuid' => $this->trackingHelper->getClientUuid()
-                ],
+                'client' => new \Synerise\ApiClient\Model\Client([
+                    'custom_id' => $wishlist->getCustomerId()
+                ]),
                 'params' => $params
             ]);
 

diff --git a/src/Observer/WishlistRemoveProduct.php b/src/Observer/WishlistRemoveProduct.php
@@ -10,20 +10,57 @@ class WishlistRemoveProduct implements ObserverInterface
 {
     const EVENT = 'wishlist_item_delete_after';
 
+    /**
+     * @var \Synerise\Integration\Helper\Api
+     */
     protected $apiHelper;
+
+    /**
+     * @var \Synerise\Integration\Helper\Catalog
+     */
+    protected $catalogHelper;
+
+    /**
+     * @var \Synerise\Integration\Helper\Tracking
+     */
     protected $trackingHelper;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
     protected $logger;
 
+    /**
+     * @var \Magento\Wishlist\Model\Wishlist
+     */
+    protected $wishlist;
+
+    /**
+     * @var \Synerise\Integration\Helper\Queue
+     */
+    protected $queueHelper;
+
+    /**
+     * @var \Synerise\Integration\Helper\Event
+     */
+    protected $eventHelper;
+
     public function __construct(
+        \Magento\Wishlist\Model\Wishlist $wishlist,
         \Psr\Log\LoggerInterface $logger,
         \Synerise\Integration\Helper\Api $apiHelper,
         \Synerise\Integration\Helper\Catalog $catalogHelper,
-        \Synerise\Integration\Helper\Tracking $trackingHelper
+        \Synerise\Integration\Helper\Tracking $trackingHelper,
+        \Synerise\Integration\Helper\Queue $queueHelper,
+        \Synerise\Integration\Helper\Event $eventHelper
     ) {
+        $this->wishlist = $wishlist;
         $this->logger = $logger;
         $this->apiHelper = $apiHelper;
         $this->catalogHelper = $catalogHelper;
         $this->trackingHelper = $trackingHelper;
+        $this->queueHelper = $queueHelper;
+        $this->eventHelper = $eventHelper;
     }
 
     public function execute(\Magento\Framework\Event\Observer $observer)
@@ -37,12 +74,20 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         try {
+            /** @var \Magento\Wishlist\Model\Item $item */
+            $item = $observer->getItem();
+
+            $storeId = $item->getStoreId();
 
-            /** @var \Magento\Wishlist\Model\Item $wishlistItem */
-            $wishlistItem = $observer->getEvent()->getItem();
-            $storeId = $wishlistItem->getStoreId();
+            /** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+            $wishlist = $this->wishlist->load($item->getWishlistId());
 
-            $product = $wishlistItem->getProduct();
+            if (!$wishlist->getCustomerId()) {
+                return;
+            }
+
+            /** @var \Magento\Catalog\Model\Product $product */
+            $product = $item->getProduct();
 
             $params = [
                 "sku" => $product->getSku(),
@@ -81,14 +126,17 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 'time' => $this->trackingHelper->getCurrentTime(),
                 'action' => 'product.removeFromFavorites',
                 'label' => $this->trackingHelper->getEventLabel(self::EVENT),
-                'client' => [
-                    'uuid' => $this->trackingHelper->getClientUuid()
-                ],
+                'client' => new \Synerise\ApiClient\Model\Client([
+                    'custom_id' => $wishlist->getCustomerId()
+                ]),
                 'params' => $params
             ]);
 
-            $this->apiHelper->getDefaultApiInstance()
-                ->customEvent('4.4', $customEventRequest);
+            if ($this->queueHelper->isQueueAvailable(self::EVENT, $storeId)) {
+                $this->queueHelper->publishEvent(self::EVENT, $customEventRequest, $storeId);
+            } else {
+                $this->eventHelper->sendEvent(self::EVENT, $customEventRequest, $storeId);
+            }
         } catch (ApiException $e) {
         } catch (\Exception $e) {
             $this->logger->error('Synerise Error', ['exception' => $e]);