MC-18403: Pricing :: Product pricing schema

- fix tier prices

Author: danielrenaud

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Price/Provider.php

@@ -8,6 +8,8 @@
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Price;
 
 use Magento\Bundle\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Bundle\Model\Product\Price;
 use Magento\Catalog\Pricing\Price\RegularPrice;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
@@ -55,6 +57,9 @@ public function getMaximalRegularPrice(SaleableInterface $product): AmountInterf
      */
     public function getRegularPrice(SaleableInterface $product): AmountInterface
     {
+        if ($product->getPriceType() == Price::PRICE_TYPE_FIXED) {
+            return $product->getPriceInfo()->getPrice(BasePrice::PRICE_CODE)->getAmount();
+        }
         return $product->getPriceInfo()->getPrice(RegularPrice::PRICE_CODE)->getAmount();
     }
 }

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

@@ -112,7 +112,6 @@ function () use ($productId, $context) {
                 $productPrice = $this->tiers->getProductRegularPrice($productId) ?? 0.0;
                 $tierPrices = $this->tiers->getProductTierPrices($productId) ?? [];
 
-
                 return $this->formatProductTierPrices($tierPrices, $productPrice, $store);
             }
         );
@@ -131,8 +130,15 @@ private function formatProductTierPrices(array $tierPrices, float $productPrice,
         $tiers = [];
 
         foreach ($tierPrices as $tierPrice) {
+            $percentValue = $tierPrice->getExtensionAttributes()->getPercentageValue();
+            if ($percentValue && is_numeric($percentValue)) {
+                $discount = $this->discount->getDiscountByPercent($productPrice, (float)$percentValue);
+            } else {
+                $discount = $this->discount->getDiscountByDifference($productPrice, (float)$tierPrice->getValue());
+            }
+
             $tiers[] = [
-                "discount" => $this->discount->getPriceDiscount($productPrice, (float)$tierPrice->getValue()),
+                "discount" => $discount,
                 "quantity" => $tierPrice->getQty(),
                 "final_price" => [
                     "value" => $tierPrice->getValue(),

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

@@ -117,7 +117,7 @@ public function getProductRegularPrice($productId): ?float
         }
         $product = $this->products[$productId];
         $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
-        return $priceProvider->getMinimalRegularPrice($product)->getValue();
+        return $priceProvider->getRegularPrice($product)->getValue();
     }
 
     /**
@@ -142,6 +142,7 @@ private function load(): void
         $productCollection = $this->collectionFactory->create();
         $productCollection->addFieldToFilter($productIdField, ['in' => $this->filterProductIds]);
         $productCollection->addAttributeToSelect('price');
+        $productCollection->addAttributeToSelect('price_type');
         $productCollection->load();
         $productCollection->addTierPriceDataByGroupId($this->customerGroupId);
 

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Discount.php

@@ -24,14 +24,29 @@ class Discount
      * @param float $finalPrice
      * @return array
      */
-    public function getPriceDiscount(float $regularPrice, float $finalPrice): array
+    public function getDiscountByDifference(float $regularPrice, float $finalPrice): array
     {
         return [
             'amount_off' => $this->getPriceDifferenceAsValue($regularPrice, $finalPrice),
             'percent_off' => $this->getPriceDifferenceAsPercent($regularPrice, $finalPrice)
         ];
     }
 
+    /**
+     * Get formatted discount based on percent off
+     *
+     * @param float $regularPrice
+     * @param float $percentOff
+     * @return array
+     */
+    public function getDiscountByPercent(float $regularPrice, float $percentOff): array
+    {
+        return [
+            'amount_off' => $this->getPercentDiscountAsValue($regularPrice, $percentOff),
+            'percent_off' => $percentOff
+        ];
+    }
+
     /**
      * Get value difference between two prices
      *
@@ -65,4 +80,19 @@ private function getPriceDifferenceAsPercent(float $regularPrice, float $finalPr
 
         return round(($difference / $regularPrice) * 100, 2);
     }
+
+    /**
+     * Get amount difference that percentOff represents
+     *
+     * @param float $regularPrice
+     * @param float $percentOff
+     * @return float
+     */
+    private function getPercentDiscountAsValue(float $regularPrice, float $percentOff): float
+    {
+        $percentDecimal = $percentOff / 100;
+        $valueDiscount = $regularPrice * $percentDecimal;
+
+        return round($valueDiscount, 2);
+    }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php

@@ -119,7 +119,7 @@ private function formatPrice(float $regularPrice, float $finalPrice, StoreInterf
                 'value' => $finalPrice,
                 'currency' => $store->getCurrentCurrencyCode()
             ],
-            'discount' => $this->discount->getPriceDiscount($regularPrice, $finalPrice),
+            'discount' => $this->discount->getDiscountByDifference($regularPrice, $finalPrice),
         ];
     }
 }

app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/Price/DiscountTest.php

@@ -31,7 +31,7 @@ protected function setUp()
      */
     public function testGetPriceDiscount($regularPrice, $finalPrice, $expectedAmountOff, $expectedPercentOff)
     {
-        $discountResult = $this->discount->getPriceDiscount($regularPrice, $finalPrice);
+        $discountResult = $this->discount->getDiscountByDifference($regularPrice, $finalPrice);
 
         $this->assertEquals($expectedAmountOff, $discountResult['amount_off']);
         $this->assertEquals($expectedPercentOff, $discountResult['percent_off']);