Merge remote-tracking branch 'origin/2.4-develop' into MCP-304

magento · May 13, 2021 · 0c226b0 · 0c226b0
2 parents d2731af + f80f0d9
commit 0c226b0
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 2 deletions.
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Product;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
@@ -23,8 +24,13 @@ class SpecialPrice implements ResolverInterface
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
         /** @var ProductInterface $product */
         $product = $value['model'];
+
         /** @var PricingSpecialPrice $specialPrice */
         $specialPrice = $product->getPriceInfo()->getPrice(PricingSpecialPrice::PRICE_CODE);
 

diff --git a/...l/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php b/...l/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
@@ -36,8 +36,8 @@ public function process(
         ContextInterface $context = null
     ): Collection {
         $collection->addAttributeToSelect('special_price');
-        $collection->addAttributeToSelect('special_price_from');
-        $collection->addAttributeToSelect('special_price_to');
+        $collection->addAttributeToSelect('special_from_date');
+        $collection->addAttributeToSelect('special_to_date');
         $collection->addAttributeToSelect('tax_class_id');
 
         return $collection;

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
@@ -945,6 +945,72 @@ public function testProductWithCatalogDiscount()
         }
     }
 
+    /**
+     * Check if the special price visible if the current date is in the date range set
+     * for the special price
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_special_price.php
+     */
+    public function testSpecialPriceVisibleIfInDateRange()
+    {
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "simple_product"}}) {
+        items {
+            price_range {
+                minimum_price {
+                    regular_price {
+                        value
+                    }
+                }
+            }
+            special_price
+        }
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $productInformation = $result['products']['items'][0];
+        $productRegularPrice = $productInformation['price_range']['minimum_price']['regular_price']['value'];
+
+        self::assertEquals('10', $productRegularPrice);
+        self::assertEquals('5.99', $productInformation['special_price']);
+    }
+
+    /**
+     * Check if the special price is not visible if the current date is not in the date range set
+     * for the special price
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_special_price_future_date.php
+     */
+    public function testSpecialPriceNotVisibleIfNotInDateRange()
+    {
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "simple_product"}}) {
+        items {
+            price_range {
+                minimum_price {
+                    regular_price {
+                        value
+                    }
+                }
+            }
+            special_price
+        }
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $productInformation = $result['products']['items'][0];
+        $productRegularPrice = $productInformation['price_range']['minimum_price']['regular_price']['value'];
+
+        self::assertEquals('10', $productRegularPrice);
+        self::assertEquals(null, $productInformation['special_price']);
+    }
+
     /**
      * Get GraphQl query to fetch products by sku
      *

diff --git a/...integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_special_price.php b/...integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_special_price.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$product = $productRepository->get('simple_product');
+$product->setSpecialPrice('5.99');
+
+$product->setSpecialFromDate(date('Y-m-d', strtotime('-1 day')));
+$product->setSpecialToDate(date('Y-m-d', strtotime('+1 day')));
+
+$productRepository->save($product);
diff --git a/...testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_special_price_future_date.php b/...testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_special_price_future_date.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$product = $productRepository->get('simple_product');
+$product->setSpecialPrice('5.99');
+
+$product->setSpecialFromDate(date('Y-m-d', strtotime('+3 day')));
+$product->setSpecialToDate(date('Y-m-d', strtotime('+5 day')));
+
+$productRepository->save($product);