Merge branch 'B2B-2452' into B2B-2423

Author: dhaecker

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php

@@ -62,10 +62,7 @@ public function __construct(
      */
     public function addProductSku(string $sku) : void
     {
-        if (!in_array($sku, $this->productSkus) && !empty($this->productList)) {
-            $this->productList = [];
-            $this->productSkus[] = $sku;
-        } elseif (!in_array($sku, $this->productSkus)) {
+        if (!in_array($sku, $this->productSkus)) {
             $this->productSkus[] = $sku;
         }
     }
@@ -79,12 +76,7 @@ public function addProductSku(string $sku) : void
     public function addProductSkus(array $skus) : void
     {
         foreach ($skus as $sku) {
-            if (!in_array($sku, $this->productSkus) && !empty($this->productList)) {
-                $this->productList = [];
-                $this->productSkus[] = $sku;
-            } elseif (!in_array($sku, $this->productSkus)) {
-                $this->productSkus[] = $sku;
-            }
+            $this->addProductSku($sku);
         }
     }
 
@@ -108,28 +100,37 @@ public function addEavAttributes(array $attributeCodes) : void
      */
     public function getProductBySku(string $sku, ContextInterface $context = null) : array
     {
-        $products = $this->fetch($context);
+        if (isset($this->productList[$sku])) {
+            return $this->productList[$sku];
+        }
 
-        if (!isset($products[$sku])) {
+        $this->fetch($context);
+
+        if (!isset($this->productList[$sku])) {
             return [];
         }
 
-        return $products[$sku];
+        return $this->productList[$sku];
     }
 
     /**
      * Fetch product data and return in array format. Keys for products will be their skus.
      *
      * @param null|ContextInterface $context
-     * @return array
      */
-    private function fetch(ContextInterface $context = null) : array
+    private function fetch(ContextInterface $context = null): void
     {
-        if (empty($this->productSkus) || !empty($this->productList)) {
-            return $this->productList;
+        if (empty($this->productSkus)) {
+            return;
         }
 
-        $this->searchCriteriaBuilder->addFilter(ProductInterface::SKU, $this->productSkus, 'in');
+        $skusToFetch = array_diff($this->productSkus, array_keys($this->productList));
+
+        if (empty($skusToFetch)) {
+            return;
+        }
+
+        $this->searchCriteriaBuilder->addFilter(ProductInterface::SKU, $skusToFetch, 'in');
         $result = $this->productDataProvider->getList(
             $this->searchCriteriaBuilder->create(),
             $this->attributeCodes,
@@ -142,7 +143,5 @@ private function fetch(ContextInterface $context = null) : array
         foreach ($result->getItems() as $product) {
             $this->productList[$product->getSku()] = ['model' => $product];
         }
-
-        return $this->productList;
     }
 }