🔃 [Magento Community Engineering] Community Contributions - 2.2-develop

Accepted Public Pull Requests:
 - #22581: [Backport] #21747 Fix catalog_product_flat_data attribute value for store during indexer (by @maheshWebkul721)


Fixed GitHub Issues:
 - #21747: catalog_product_flat_data for store view populated with default view data when it should be store view data (reported by @bengower) has been fixed in #22581 by @maheshWebkul721 in 2.2-develop branch
   Related commits:
     1. 020f970
     2. aae1e59

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php

@@ -289,12 +289,16 @@ protected function _fillTemporaryTable(
 
                 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
                 foreach ($columnsList as $columnName => $attribute) {
-                    $countTableName = 't' . $iterationNum++;
+                    $countTableName = 't' . ($iterationNum++);
                     $joinCondition = sprintf(
-                        'e.%3$s = %1$s.%3$s AND %1$s.attribute_id = %2$d AND %1$s.store_id = 0',
+                        'e.%3$s = %1$s.%3$s' .
+                        ' AND %1$s.attribute_id = %2$d' .
+                        ' AND (%1$s.store_id = %4$d' .
+                        ' OR %1$s.store_id = 0)',
                         $countTableName,
                         $attribute->getId(),
-                        $metadata->getLinkField()
+                        $metadata->getLinkField(),
+                        $storeId
                     );
 
                     $select->joinLeft(
@@ -308,9 +312,10 @@ protected function _fillTemporaryTable(
                         $columnValueName = $attributeCode . $valueFieldSuffix;
                         if (isset($flatColumns[$columnValueName])) {
                             $valueJoinCondition = sprintf(
-                                'e.%1$s = %2$s.option_id AND %2$s.store_id = 0',
+                                'e.%1$s = %2$s.option_id AND (%2$s.store_id = %3$d OR %2$s.store_id = 0)',
                                 $attributeCode,
-                                $countTableName
+                                $countTableName,
+                                $storeId
                             );
                             $selectValue->joinLeft(
                                 [