ENGCOM-5240: #22934 Improved sitemap product generation logic #23129

Author: VladimirZaets

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php

@@ -257,9 +257,11 @@ protected function _joinAttribute($storeId, $attributeCode, $column = null)
 
         // Add attribute value to result set if needed
         if (isset($column)) {
-            $this->_select->columns([
-                $column => $columnValue
-            ]);
+            $this->_select->columns(
+                [
+                    $column => $columnValue
+                ]
+            );
         }
     }
 
@@ -309,6 +311,10 @@ public function getCollection($storeId)
         }
 
         $connection = $this->getConnection();
+        $urlRewriteMetaDataCondition = '';
+        if (!$this->isCategoryProductURLsConfig($storeId)) {
+            $urlRewriteMetaDataCondition = ' AND url_rewrite.metadata IS NULL';
+        }
 
         $this->_select = $connection->select()->from(
             ['e' => $this->getMainTable()],
@@ -319,7 +325,8 @@ public function getCollection($storeId)
             []
         )->joinLeft(
             ['url_rewrite' => $this->getTable('url_rewrite')],
-            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS NULL'
+            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1'
+            . $urlRewriteMetaDataCondition
             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),
             ['url' => 'request_path']
@@ -483,4 +490,20 @@ private function getProductImageUrl($image)
     {
         return $this->imageUrlBuilder->getUrl($image, 'product_page_image_large');
     }
+
+    /**
+     * Return Use Categories Path for Product URLs config value
+     *
+     * @param null|string $storeId
+     *
+     * @return bool
+     */
+    private function isCategoryProductURLsConfig($storeId)
+    {
+        return $this->scopeConfig->isSetFlag(
+            HelperProduct::XML_PATH_PRODUCT_URL_USE_CATEGORY,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
 }