Merge remote-tracking branch 'origin/MC-18403' into MC-20244

Author: cpartica

app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php

@@ -127,6 +127,11 @@ public function getProductRegularPrice($productId): ?float
      */
     public function isLoaded(): bool
     {
+        $numFilterProductIds = count(array_unique($this->filterProductIds));
+        if ($numFilterProductIds > count($this->products)) {
+            //New products were added to the filter after load, so we should reload
+            return false;
+        }
         return $this->loaded;
     }
 
@@ -146,10 +151,26 @@ private function load(): void
         $productCollection->load();
         $productCollection->addTierPriceDataByGroupId($this->customerGroupId);
 
+        $this->setProducts($productCollection);
+        $this->loaded = true;
+    }
+
+    /**
+     * Set products from collection
+     *
+     * @param Collection $productCollection
+     */
+    private function setProducts(Collection $productCollection): void
+    {
+        $this->products = [];
+
         foreach ($productCollection as $product) {
             $this->products[$product->getId()] = $product;
         }
 
-        $this->loaded = true;
+        $missingProducts = array_diff($this->filterProductIds, array_keys($this->products));
+        foreach (array_unique($missingProducts) as $missingProductId) {
+            $this->products[$missingProductId] = null;
+        }
     }
 }

app/code/Magento/CatalogCustomerGraphQl/etc/schema.graphqls

@@ -15,8 +15,8 @@ type ProductTierPrices @doc(description: "ProductTierPrices is deprecated and ha
 }
 
 
-type TierPrice @doc(description: "TierPrice defines a tier price, which is a price offered based on a particular quantity purchased.") {
+type TierPrice @doc(description: "A price based on the quantity purchased.") {
     final_price: Money @doc(desription: "The price of the product at this tier.")
-    quantity: Float @doc(description: "The number of items that must be purchased to qualify for this price tier.")
+    quantity: Float @doc(description: "The minimum number of items that must be purchased to qualify for this price tier.")
     discount: ProductDiscount @doc(description: "The price discount that this tier represents.")
 }

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -41,13 +41,13 @@ enum PriceTypeEnum @doc(description: "This enumeration the price type.") {
     DYNAMIC
 }
 
-type ProductPrices @deprecated(reason: "Use PriceRange instead.") @doc(description: "The ProductPrices object contains the regular price of an item, as well as its minimum and maximum prices. Only composite products, which include bundle, configurable, and grouped products, can contain a minimum and maximum price.") {
+type ProductPrices @doc(description: "ProductPrices is deprecated, replaced by PriceRange. The ProductPrices object contains the regular price of an item, as well as its minimum and maximum prices. Only composite products, which include bundle, configurable, and grouped products, can contain a minimum and maximum price.") {
     minimalPrice: Price @deprecated(reason: "Use PriceRange.minimum_price.") @doc(description: "The lowest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the from value.")
     maximalPrice: Price @deprecated(reason: "Use PriceRange.maximum_price.") @doc(description: "The highest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the to value.")
     regularPrice: Price @deprecated(reason: "Use regular_price from PriceRange.minimum_price or PriceRange.maximum_price.") @doc(description: "The base price of a product.")
 }
 
-type PriceRange @doc(description: "Price range for a product. If the product only has a single price minimum and maximum price will be the same."){
+type PriceRange @doc(description: "Price range for a product. If the product has a single price, the minimum and maximum price will be the same."){
     minimum_price: ProductPrice! @doc(description: "The lowest possible price for the product.")
     maximum_price: ProductPrice @doc(description: "The highest possible price for the product.")
 }
@@ -58,9 +58,9 @@ type ProductPrice @doc(description: "Represents a product price.") {
     discount: ProductDiscount @doc(description: "The price discount. Represents the difference between the regular and final price.")
 }
 
-type ProductDiscount @doc(description: "Price discount applied to a product.") {
-    percent_off: Float @doc(description: "The discount expressed a percent value.")
-    amount_off: Float @doc(description: "The discount expressed an absolute value.")
+type ProductDiscount @doc(description: "A discount applied to a product price.") {
+    percent_off: Float @doc(description: "The discount expressed a percentage.")
+    amount_off: Float @doc(description: "The actual value of the discount.")
 }
 
 type ProductLinks implements ProductLinksInterface @doc(description: "ProductLinks is an implementation of ProductLinksInterface.") {