Make single product visible by direct URL

scandipwa · Jul 10, 2019 · cffd426 · cffd426
1 parent 1d5bea4
commit cffd426
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 16 deletions.
diff --git a/src/Model/Resolver/Products/DataProvider/Product.php b/src/Model/Resolver/Products/DataProvider/Product.php
@@ -17,6 +17,7 @@
 use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
 use Magento\Framework\Api\SearchResultsInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use ScandiPWA\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CriteriaCheck;
 
 /**
  * Product field data provider, used for GraphQL resolver processing.
@@ -93,9 +94,14 @@ public function getList(
         $this->collectionProcessor->process($collection, $searchCriteria, $attributes);
 
         if (!$isChildSearch) {
-            $visibilityIds = $isSearch
-                ? $this->visibility->getVisibleInSearchIds()
-                : $this->visibility->getVisibleInCatalogIds();
+            $singleProduct = CriteriaCheck::isSingleProductFilter($searchCriteria);
+            if ($singleProduct) {
+                $visibilityIds = $this->visibility->getVisibleInSiteIds();
+            } else {
+                $visibilityIds = $isSearch
+                    ? $this->visibility->getVisibleInSearchIds()
+                    : $this->visibility->getVisibleInCatalogIds();
+            }
             $collection->setVisibility($visibilityIds);
         }
 

diff --git a/src/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php b/src/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
@@ -5,12 +5,12 @@
 
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor
-\StockProcessor as MagentoStockProcessor;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\StockProcessor as MagentoStockProcessor;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Status as StockStatusResource;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use ScandiPWA\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CriteriaCheck;
 
 class StockProcessor extends MagentoStockProcessor implements CollectionProcessorInterface
 {
@@ -28,7 +28,10 @@ class StockProcessor extends MagentoStockProcessor implements CollectionProcesso
      * @param StockConfigurationInterface $stockConfig
      * @param StockStatusResource         $stockStatusResource
      */
-    public function __construct(StockConfigurationInterface $stockConfig, StockStatusResource $stockStatusResource)
+    public function __construct(
+        StockConfigurationInterface $stockConfig,
+        StockStatusResource $stockStatusResource
+    )
     {
         $this->stockConfig = $stockConfig;
         $this->stockStatusResource = $stockStatusResource;
@@ -40,16 +43,7 @@ public function process(
         array $attributeNames
     ): Collection
     {
-        $singleProduct = false;
-        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
-            $filters = $filterGroup->getFilters();
-            $type = $filters[0]->getConditionType();
-            $field = $filters[0]->getField();
-            if ($type === 'eq' && $field === 'url_key') {
-                $singleProduct = true;
-                break;
-            }
-        }
+        $singleProduct = CriteriaCheck::isSingleProductFilter($searchCriteria);
         if (!$singleProduct && !$this->stockConfig->isShowOutOfStock()) {
             $this->stockStatusResource->addIsInStockFilterToCollection($collection);
         }

diff --git a/src/Model/Resolver/Products/DataProvider/Product/CriteriaCheck.php b/src/Model/Resolver/Products/DataProvider/Product/CriteriaCheck.php
@@ -0,0 +1,30 @@
+<?php
+
+
+namespace ScandiPWA\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product;
+
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+class CriteriaCheck
+{
+    /**
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return bool
+     */
+    static public function isSingleProductFilter(SearchCriteriaInterface$searchCriteria)
+    {
+        $singleProduct = false;
+        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
+            $filters = $filterGroup->getFilters();
+            $type = $filters[0]->getConditionType();
+            $field = $filters[0]->getField();
+            if ($type === 'eq' && $field === 'url_key') {
+                $singleProduct = true;
+                break;
+            }
+        }
+
+        return $singleProduct;
+    }
+}