fix: [MINT-4697] fix minicart updates categories fetching (#213)

* fix: [MINT-4697] fix minicart updates categories fetching

* add try/catch handling

* auto-changelog

---------

Co-authored-by: magento-bot <[email protected]>

Author: milesmcleod

Controller/Minicart/Categories.php

@@ -7,9 +7,11 @@
 namespace Extend\Integration\Controller\Minicart;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class Categories extends \Magento\Framework\App\Action\Action
 {
@@ -23,6 +25,11 @@ class Categories extends \Magento\Framework\App\Action\Action
      */
     protected $categoryRepository;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    protected $productRepository;
+
     /**
      * @var JsonFactory
      */
@@ -32,32 +39,42 @@ public function __construct(
       Context $context,
       JsonFactory $resultJsonFactory,
       CheckoutSession $checkoutSession,
-      CategoryRepositoryInterface $categoryRepository
+      CategoryRepositoryInterface $categoryRepository,
+      ProductRepositoryInterface $productRepository
     ) {
         $this->resultJsonFactory = $resultJsonFactory;
         $this->checkoutSession = $checkoutSession;
         $this->categoryRepository = $categoryRepository;
+        $this->productRepository = $productRepository;
         parent::__construct($context);
     }
 
     public function execute()
     {
         $items = [];
-        $cart = $this->checkoutSession->getQuote();
-        foreach ($cart->getAllVisibleItems() as $item) {
-            $product = $item->getProduct();
-
-            if (!$product) {
-                continue;
+        // this endpoint now accepts a query parameter `product_ids` which is a comma-separated list of product ids.
+        // this enables us to bypass a getQuote() call and simply get the category for the products specified in the request.
+        if ($this->getRequest()->getParam('product_ids') !== null) {
+          $productIds = array_filter(
+            array_map('trim', explode(',', $this->getRequest()->getParam('product_ids'))),
+            function ($id) {
+              return $id !== '' && is_numeric($id);
             }
-
-            $categories = $product->getCategoryIds();
-            $id = $item->getId();
-
-            if (count($categories) > 0) {
+          );
+          foreach ($productIds as $productId) {
+            try {
+              /** @var \Magento\Catalog\Model\Product $product */
+              $product = $this->productRepository->getById($productId);
+              $categories = $product->getCategoryIds();
+              if (count($categories) === 0) {
+                continue;
+              }
               $category = $this->categoryRepository->get($categories[0]);
-              $items[$id] = $category->getName();
+              $items[$productId] = $category->getName();
+            } catch (NoSuchEntityException $e) {
+              continue;
             }
+          }
         }
         $resultJson = $this->resultJsonFactory->create();
         return $resultJson->setData($items);

view/frontend/web/js/view/cart/minicart-updates.js

@@ -15,11 +15,45 @@ define([
   const itemDetailsSelector = 'div.product-item-details'
   const simpleOfferClass = 'extend-minicart-simple-offer'
 
-  const handleUpdate = function () {
+  const handleUpdate = async function () {
     const cartItems = cartUtils.getCartItems()
-    let categories
 
-    cartItems.forEach(async cartItem => {
+    const productIds = cartItems
+      .filter(cartItem => {
+        const isWarrantyInCart = ExtendMagento.warrantyInCart({
+          lineItemSku: cartItem.product_sku,
+          lineItems: cartItems,
+        })
+        return (
+          cartItem.product_sku !== 'extend-protection-plan' &&
+          cartItem.product_sku !== 'xtd-pp-pln' &&
+          !isWarrantyInCart
+        )
+      })
+      .map(cartItem => cartItem.product_id)
+      .join(',')
+
+    if (!productIds) {
+      return
+    }
+
+    const categories = await new Promise((resolve, _reject) => {
+      $.ajax({
+        url: window.BASE_URL + 'extend_integration/minicart/categories',
+        type: 'GET',
+        data: { product_ids: productIds },
+        dataType: 'json',
+        success: function (response) {
+          resolve(response)
+        },
+        error: function (xhr, status, error) {
+          console.error(error)
+          resolve({})
+        },
+      })
+    })
+
+    cartItems.forEach(cartItem => {
       const isWarrantyInCart = ExtendMagento.warrantyInCart({
         lineItemSku: cartItem.product_sku,
         lineItems: cartItems,
@@ -49,29 +83,6 @@ define([
           } else {
             // TODO: If warranty already in cart, no need to render
 
-            // Only fetch categories if we actually get to the point of needing to render an offer
-            // Once this is fetched once though we should never need to fetch categories again
-            // for the current execution of handleUpdate.
-            // Why Ajax? There's no JavaScript API to get categories in Magento and we can't use a
-            // ViewModel because the minicart doesn't rerender in cases such as items being added to cart.
-            if (!categories) {
-              categories = await new Promise((resolve, _reject) => {
-                $.ajax({
-                  url:
-                    window.BASE_URL + 'extend_integration/minicart/categories',
-                  type: 'GET',
-                  dataType: 'json',
-                  success: function (response) {
-                    resolve(response)
-                  },
-                  error: function (xhr, status, error) {
-                    console.error(error)
-                    resolve({})
-                  },
-                })
-              })
-            }
-
             simpleOfferElem = document.createElement('div')
             simpleOfferElem.setAttribute('id', simpleOfferElemId)
             simpleOfferElem.setAttribute('class', simpleOfferClass)
@@ -90,7 +101,7 @@ define([
               Extend.buttons.renderSimpleOffer('#' + simpleOfferElemId, {
                 referenceId: cartItem.product_sku,
                 price: cents,
-                category: categories[cartItem.item_id],
+                category: categories[cartItem.product_id],
                 onAddToCart: function (opts) {
                   addToCart(opts)
                 },