merge magento/2.2.10-develop into magento-tsg/MC-19568

Author: magento-cicd2

app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageActionGroup.xml

@@ -11,6 +11,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 
 /**
  * CatalogInventory Default Stock Status Indexer Resource Model
@@ -225,6 +226,8 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
     {
         $connection = $this->getConnection();
         $qtyExpr = $connection->getCheckSql('cisi.qty > 0', 'cisi.qty', 0);
+        $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $linkField = $metadata->getLinkField();
 
         $select = $connection->select()->from(
             ['e' => $this->getTable('catalog_product_entity')],
@@ -238,6 +241,12 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
             ['cisi' => $this->getTable('cataloginventory_stock_item')],
             'cisi.stock_id = cis.stock_id AND cisi.product_id = e.entity_id',
             []
+        )->joinInner(
+            ['mcpei' => $this->getTable('catalog_product_entity_int')],
+            'e.' . $linkField . ' = mcpei.' . $linkField
+            . ' AND mcpei.attribute_id = ' . $this->_getAttribute('status')->getId()
+            . ' AND mcpei.value = ' . ProductStatus::STATUS_ENABLED,
+            []
         )->columns(
             ['qty' => $qtyExpr]
         )->where(
@@ -308,8 +317,7 @@ protected function _updateIndex($entityIds)
     }
 
     /**
-     * Delete records by their ids from index table.
-     *
+     * Delete records by their ids from index table
      * Used to clean table before re-indexation
      *
      * @param array $ids
@@ -354,8 +362,6 @@ public function getIdxTable($table = null)
     }
 
     /**
-     * Get status expression
-     *
      * @param AdapterInterface $connection
      * @param bool $isAggregate
      * @return mixed
@@ -381,8 +387,6 @@ protected function getStatusExpression(AdapterInterface $connection, $isAggregat
     }
 
     /**
-     * Get stock configuration
-     *
      * @return StockConfigurationInterface
      *
      * @deprecated 100.1.0
@@ -398,8 +402,6 @@ protected function getStockConfiguration()
     }
 
     /**
-     * Get query processor composite
-     *
      * @return QueryProcessorComposite
      */
     private function getQueryProcessorComposite()

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -79,25 +79,30 @@ public function get()
                 'scopes' => [],
             ];
 
-            /** @var Group $group */
-            foreach ($groups[$website->getId()] as $group) {
-                $groupScope = [
-                    'scope' => ScopeInterface::SCOPE_GROUP,
-                    'scope_id' => $group->getId(),
-                    'scopes' => [],
-                ];
-
-                /** @var Store $store */
-                foreach ($stores[$group->getId()] as $store) {
-                    $storeScope = [
-                        'scope' => ScopeInterface::SCOPE_STORES,
-                        'scope_id' => $store->getId(),
+            if (!empty($groups[$website->getId()])) {
+                /** @var Group $group */
+                foreach ($groups[$website->getId()] as $group) {
+                    $groupScope = [
+                        'scope' => ScopeInterface::SCOPE_GROUP,
+                        'scope_id' => $group->getId(),
                         'scopes' => [],
                     ];
-                    $groupScope['scopes'][] = $storeScope;
+
+                    if (!empty($stores[$group->getId()])) {
+                        /** @var Store $store */
+                        foreach ($stores[$group->getId()] as $store) {
+                            $storeScope = [
+                                'scope' => ScopeInterface::SCOPE_STORES,
+                                'scope_id' => $store->getId(),
+                                'scopes' => [],
+                            ];
+                            $groupScope['scopes'][] = $storeScope;
+                        }
+                    }
+                    $websiteScope['scopes'][] = $groupScope;
                 }
-                $websiteScope['scopes'][] = $groupScope;
             }
+
             $defaultScope['scopes'][] = $websiteScope;
         }