ACP2E-3413: All products are indexed with [is_out_of_stock] = 1 when the SKU is not set as a searchable attribute

Author: dhorytskyi

InventoryCatalog/Plugin/Catalog/Model/ResourceModel/Product/CollectionPlugin.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -82,7 +82,7 @@ private function applyOutOfStockSortOrders(Collection $collection): void
                 $collection->setFlag('is_sorted_by_oos', true);
 
                 if ($this->isOutOfStockBottom() && $this->sortableBySaleabilityProvider->isSortableBySaleability()) {
-                    $collection->setOrder(SortableBySaleabilityInterface::IS_OUT_OF_STOCK, Select::SQL_DESC);
+                    $collection->setOrder(SortableBySaleabilityInterface::IS_OUT_OF_STOCK, Select::SQL_ASC);
                 }
             }
             $collection->setFlag('is_processing', false);

InventoryElasticsearch/Plugin/Model/Adapter/BatchDataMapper/ProductDataMapperPlugin.php

@@ -1,48 +1,33 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\InventoryElasticsearch\Plugin\Model\Adapter\BatchDataMapper;
 
 use Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\InventoryCatalogApi\Model\GetSkusByProductIdsInterface;
+use Magento\InventorySalesApi\Model\GetStockItemsDataInterface;
 use Magento\InventorySalesApi\Model\StockByWebsiteIdResolverInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\InventorySalesApi\Model\GetStockItemDataInterface;
 
 class ProductDataMapperPlugin
 {
-    /**
-     * @var StockByWebsiteIdResolverInterface
-     */
-    private $stockByWebsiteIdResolver;
-
-    /**
-     * @var StoreRepositoryInterface
-     */
-    private $storeRepository;
-
-    /**
-     * @var GetStockItemDataInterface
-     */
-    private $getStockItemData;
-
     /**
      * @param StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver
      * @param StoreRepositoryInterface $storeRepository
-     * @param GetStockItemDataInterface $getStockItemData
+     * @param GetStockItemsDataInterface $getStockItemsData
+     * @param GetSkusByProductIdsInterface $getSkusByProductIds
      */
     public function __construct(
-        StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver,
-        StoreRepositoryInterface $storeRepository,
-        GetStockItemDataInterface $getStockItemData
+        private readonly StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver,
+        private readonly StoreRepositoryInterface $storeRepository,
+        private readonly GetStockItemsDataInterface $getStockItemsData,
+        private readonly GetSkusByProductIdsInterface $getSkusByProductIds
     ) {
-        $this->stockByWebsiteIdResolver = $stockByWebsiteIdResolver;
-        $this->storeRepository = $storeRepository;
-        $this->getStockItemData = $getStockItemData;
     }
 
     /**
@@ -64,20 +49,11 @@ public function afterMap(
     ): array {
         $store = $this->storeRepository->getById($storeId);
         $stock = $this->stockByWebsiteIdResolver->execute((int)$store->getWebsiteId());
-
+        $skus = $this->getSkusByProductIds->execute(array_keys($documents));
+        $stockItems = $this->getStockItemsData->execute($skus, $stock->getStockId());
         foreach ($documents as $productId => $document) {
-            $sku = $document['sku'] ?? '';
-            if (!$sku) {
-                $document['is_out_of_stock'] = 1;
-            } else {
-                try {
-                    $stockItemData = $this->getStockItemData->execute($sku, $stock->getStockId());
-                } catch (NoSuchEntityException $e) {
-                    $stockItemData = null;
-                }
-                $document['is_out_of_stock'] = null !== $stockItemData
-                    ? (int)$stockItemData[GetStockItemDataInterface::IS_SALABLE] : 1;
-            }
+            $sku = $skus[$productId];
+            $document['is_out_of_stock'] = (int)!($stockItems[$sku][GetStockItemsDataInterface::IS_SALABLE] ?? 0);
             $documents[$productId] = $document;
         }