Always use canonical urls in the sitemap

resolve comments

Whitelist URL_REWRITE_IS_AUTOGENERATED_METADATA index

Suppress unused parameter warning

Author: AntonEvers

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

@@ -5,11 +5,9 @@
  */
 namespace Magento\Sitemap\Model\ResourceModel\Catalog;
 
-use Magento\Catalog\Helper\Product as HelperProduct;
 use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\ObjectManager;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 
 /**
@@ -82,28 +80,11 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $_mediaConfig;
 
-    /**
-     * @var \Magento\Catalog\Model\Product
-     */
-    private $productModel;
-
-    /**
-     * @var \Magento\Catalog\Helper\Image
-     */
-    private $catalogImageHelper;
-
     /**
      * @var UrlBuilder
      */
     private $imageUrlBuilder;
 
-    /**
-     * Scope Config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    private $scopeConfig;
-
     /**
      * Product constructor.
      *
@@ -122,6 +103,7 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
      * @param UrlBuilder $urlBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -147,13 +129,7 @@ public function __construct(
         $this->mediaGalleryReadHandler = $mediaGalleryReadHandler;
         $this->_mediaConfig = $mediaConfig;
         $this->_sitemapData = $sitemapData;
-        $this->productModel = $productModel ?: ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product::class);
-        $this->catalogImageHelper = $catalogImageHelper;
         $this->imageUrlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlBuilder::class);
-        $this->catalogImageHelper = $catalogImageHelper ?: ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Helper\Image::class);
-        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()
-            ->get(\Magento\Framework\App\Config\ScopeConfigInterface::class);
 
         parent::__construct($context, $connectionName);
     }
@@ -311,11 +287,6 @@ 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()],
             [$this->getIdFieldName(), $this->_productResource->getLinkField(), 'updated_at']
@@ -326,7 +297,7 @@ public function getCollection($storeId)
         )->joinLeft(
             ['url_rewrite' => $this->getTable('url_rewrite')],
             'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1'
-            . $urlRewriteMetaDataCondition
+            . ' AND url_rewrite.metadata IS NULL'
             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),
             ['url' => 'request_path']
@@ -490,20 +461,4 @@ 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
-        );
-    }
 }

app/code/Magento/UrlRewrite/etc/db_schema.xml

@@ -40,5 +40,9 @@
         <index referenceId="URL_REWRITE_ENTITY_ID" indexType="btree">
             <column name="entity_id"/>
         </index>
+        <index referenceId="URL_REWRITE_IS_AUTOGENERATED_METADATA" indexType="btree">
+            <column name="is_autogenerated"/>
+            <column name="metadata"/>
+        </index>
     </table>
 </schema>

app/code/Magento/UrlRewrite/etc/db_schema_whitelist.json

@@ -15,11 +15,12 @@
         "index": {
             "URL_REWRITE_TARGET_PATH": true,
             "URL_REWRITE_STORE_ID_ENTITY_ID": true,
-            "URL_REWRITE_ENTITY_ID": true
+            "URL_REWRITE_ENTITY_ID": true,
+            "URL_REWRITE_IS_AUTOGENERATED_METADATA": true
         },
         "constraint": {
             "PRIMARY": true,
             "URL_REWRITE_REQUEST_PATH_STORE_ID": true
         }
     }
-}
+}