Use visibility class for category product indexer, instead of hardcoded values

Author: Nuranto

app/code/Magento/Catalog/Model/Config.php

@@ -8,6 +8,7 @@
 
 use Magento\Eav\Model\ResourceModel\Entity\Type\CollectionFactory;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Catalog\Model\Product\Visibility;
 
 /**
  * Catalog config model.
@@ -114,6 +115,11 @@ class Config extends \Magento\Eav\Model\Config
      */
     protected $_configFactory;
 
+    /**
+     * @var Visibility
+     */
+    protected $_visibility;
+
     /**
      * Constructor
      *
@@ -147,6 +153,7 @@ public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $setCollectionFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig,
+        Visibility $visibility,
         SerializerInterface $serializer = null,
         $attributesForPreload = []
     ) {
@@ -157,6 +164,7 @@ public function __construct(
         $this->_setCollectionFactory = $setCollectionFactory;
         $this->_storeManager = $storeManager;
         $this->_eavConfig = $eavConfig;
+        $this->_visibility = $visibility;
 
         parent::__construct(
             $cache,
@@ -506,4 +514,9 @@ public function getProductListDefaultSortBy($store = null)
             $store
         );
     }
+
+    public function getVisibility()
+    {
+        return $this->_visibility;
+    }
 }

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -348,11 +348,7 @@ protected function getNonAnchorCategoriesSelect(Store $store)
                 \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
             )->where(
                 $this->connection->getIfNullSql('cpvs.value', 'cpvd.value') . ' IN (?)',
-                [
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG,
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH,
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
-                ]
+                $this->config->getVisibility()->getVisibleInSiteIds()
             )->columns(
                 [
                     'category_id' => 'cc.entity_id',
@@ -593,11 +589,7 @@ protected function createAnchorSelect(Store $store)
             \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
         )->where(
             $this->connection->getIfNullSql('cpvs.value', 'cpvd.value') . ' IN (?)',
-            [
-                \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG,
-                \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH,
-                \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
-            ]
+            $this->config->getVisibility()->getVisibleInSiteIds()
         )->where(
             $this->connection->getIfNullSql('ccas.value', 'ccad.value') . ' = ?',
             1
@@ -841,11 +833,7 @@ protected function getAllProducts(Store $store)
                 \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
             )->where(
                 $this->connection->getIfNullSql('cpvs.value', 'cpvd.value') . ' IN (?)',
-                [
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG,
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH,
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
-                ]
+                $this->config->getVisibility()->getVisibleInSiteIds()
             )->group(
                 'cp.entity_id'
             )->columns(