Return product stock data - Code Rewiev FIX

Author: bartekszymanski

app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/OnlyXLeftInStockResolver.php

@@ -18,6 +18,9 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * {@inheritdoc}
+ */
 class OnlyXLeftInStockResolver implements ResolverInterface
 {
     /**
@@ -51,7 +54,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null): Value
     {
@@ -75,12 +78,22 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     }
 
     /**
+     * Get product qty left when "Catalog > Inventory > Stock Options > Only X left Threshold" is greater than 0
+     *
      * @param ProductInterface $product
      *
      * @return null|float
      */
     private function getOnlyXLeftQty(ProductInterface $product): ?float
     {
+        $thresholdQty = (float)$this->scopeConfig->getValue(
+            Configuration::XML_PATH_STOCK_THRESHOLD_QTY,
+            ScopeInterface::SCOPE_STORE
+        );
+        if($thresholdQty === 0){
+            return null;
+        }
+
         $stockItem = $this->stockRegistry->getStockItem($product->getId());
 
         $stockCurrentQty = $this->stockRegistry->getStockStatus(

app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/StockStatusProvider.php

@@ -8,13 +8,17 @@
 namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
 use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
+/**
+ * {@inheritdoc}
+ */
 class StockStatusProvider implements ResolverInterface
 {
     /**
@@ -38,7 +42,7 @@ public function __construct(ValueFactory $valueFactory, StockStatusRepositoryInt
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null): Value
     {
@@ -54,9 +58,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $product = $value['model'];
 
         $stockStatus = $this->stockStatusRepository->get($product->getId());
+        $productStockStatus = (int)$stockStatus->getStockStatus();
 
-        $result = function () use ($stockStatus) {
-            return $stockStatus->getStockStatus();
+        $result = function () use ($productStockStatus) {
+            return $productStockStatus === StockStatusInterface::STATUS_IN_STOCK ? 'IN_STOCK' : 'OUT_OF_STOCK';
         };
 
         return $this->valueFactory->create($result);

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

@@ -3,5 +3,10 @@
 
 interface ProductInterface {
     only_x_left_in_stock: Float @doc(description: "Product stock only x left count") @resolver(class: "Magento\\CatalogInventoryGraphQl\\Model\\Resolver\\OnlyXLeftInStockResolver")
-    stock_status: Int @doc(description: "Stock status of the product") @resolver(class: "Magento\\CatalogInventoryGraphQl\\Model\\Resolver\\StockStatusProvider")
+    stock_status: ProductStockStatus @doc(description: "Stock status of the product") @resolver(class: "Magento\\CatalogInventoryGraphQl\\Model\\Resolver\\StockStatusProvider")
+}
+
+enum ProductStockStatus @doc(description: "This enumeration states whether a product stock status is in stock or out of stock") {
+    IN_STOCK
+    OUT_OF_STOCK
 }

app/code/Magento/CatalogInventoryGraphQl/Test/CatalogInventory/ProductOnlyXLeftInStockTest.php renamed to dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CatalogInventoryGraphQl\Test\CatalogInventory;
+namespace Magento\GraphQl\CatalogInventory;
 
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 

app/code/Magento/CatalogInventoryGraphQl/Test/CatalogInventory/ProductStockStatusTest.php renamed to dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductStockStatusTest.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CatalogInventoryGraphQl\Test\CatalogInventory;
+namespace Magento\GraphQl\CatalogInventory;
 
 use Magento\CatalogInventory\Api\Data\StockStatusInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
@@ -46,10 +46,7 @@ public function testQueryProductStockStatusInStock()
 
         $this->assertArrayHasKey(0, $response['products']['items']);
         $this->assertArrayHasKey('stock_status', $response['products']['items'][0]);
-        $this->assertEquals(
-            StockStatusInterface::STATUS_IN_STOCK,
-            $response['products']['items'][0]['stock_status']
-        );
+        $this->assertEquals('IN_STOCK', $response['products']['items'][0]['stock_status']);
     }
 
     /**
@@ -79,9 +76,6 @@ public function testQueryProductStockStatusOutOfStock()
 
         $this->assertArrayHasKey(0, $response['products']['items']);
         $this->assertArrayHasKey('stock_status', $response['products']['items'][0]);
-        $this->assertEquals(
-            StockStatusInterface::STATUS_OUT_OF_STOCK,
-            $response['products']['items'][0]['stock_status']
-        );
+        $this->assertEquals('OUT_OF_STOCK', $response['products']['items'][0]['stock_status']);
     }
 }