MC-18403: Pricing :: Product pricing schema

- Fix percent-based tier price

Author: danielrenaud

app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php

@@ -102,20 +102,17 @@ public function resolve(
 
         $product = $value['model'];
         $productId = $product->getId();
-        $productPrice = $this->priceProviderPool
-            ->getProviderByProductType($product->getTypeId())
-            ->getMinimalRegularPrice($product)
-            ->getValue();
         $this->tiers->addProductFilter($productId);
 
         return $this->valueFactory->create(
-            function () use ($productId, $productPrice, $context) {
-
+            function () use ($productId, $context) {
                 /** @var StoreInterface $store */
                 $store = $context->getExtensionAttributes()->getStore();
 
+                $productPrice = $this->tiers->getProductRegularPrice($productId) ?? 0.0;
                 $tierPrices = $this->tiers->getProductTierPrices($productId) ?? [];
 
+
                 return $this->formatProductTierPrices($tierPrices, $productPrice, $store);
             }
         );

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

@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
 
 /**
  * Get product tier price information
@@ -28,6 +29,11 @@ class Tiers
      */
     private $productResource;
 
+    /**
+     * @var PriceProviderPool
+     */
+    private $priceProviderPool;
+
     /**
      * @var bool
      */
@@ -36,7 +42,7 @@ class Tiers
     /**
      * @var int
      */
-    private $customerGroupId =  GroupManagement::CUST_GROUP_ALL;
+    private $customerGroupId = GroupManagement::CUST_GROUP_ALL;
 
     /**
      * @var array
@@ -51,15 +57,18 @@ class Tiers
     /**
      * @param CollectionFactory $collectionFactory
      * @param ProductResource $productResource
+     * @param PriceProviderPool $priceProviderPool
      * @param int $customerGroupId
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         ProductResource $productResource,
+        PriceProviderPool $priceProviderPool,
         $customerGroupId
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->productResource = $productResource;
+        $this->priceProviderPool = $priceProviderPool;
         $this->customerGroupId = $customerGroupId;
     }
 
@@ -91,6 +100,26 @@ public function getProductTierPrices($productId): ?array
         return $this->products[$productId]->getTierPrices();
     }
 
+    /**
+     * Get product regular price by ID
+     *
+     * @param int $productId
+     * @return float|null
+     */
+    public function getProductRegularPrice($productId): ?float
+    {
+        if (!$this->isLoaded()) {
+            $this->load();
+        }
+
+        if (empty($this->products[$productId])) {
+            return null;
+        }
+        $product = $this->products[$productId];
+        $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
+        return $priceProvider->getMinimalRegularPrice($product)->getValue();
+    }
+
     /**
      * Check if collection has been loaded
      *
@@ -112,6 +141,8 @@ private function load(): void
         /** @var Collection $productCollection */
         $productCollection = $this->collectionFactory->create();
         $productCollection->addFieldToFilter($productIdField, ['in' => $this->filterProductIds]);
+        $productCollection->addAttributeToSelect('price');
+        $productCollection->load();
         $productCollection->addTierPriceDataByGroupId($this->customerGroupId);
 
         foreach ($productCollection as $product) {