MCLOUD-9134: Cache Warming hits "not visible individually" pages (#20)

Author: dhorytskyi

Model/UrlFinder/Product.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CloudComponents\Model\UrlFinder;
 
+use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CloudComponents\Model\UrlFinderInterface as CloudUrlFinderInterface;
@@ -43,6 +44,11 @@ class Product implements CloudUrlFinderInterface
      */
     private $productCollectionFactory;
 
+    /**
+     * @var ProductVisibility
+     */
+    private $productVisibility;
+
     /**
      * @var integer
      */
@@ -51,19 +57,22 @@ class Product implements CloudUrlFinderInterface
     /**
      * @param UrlFixer $urlFixer
      * @param CollectionFactory $productCollectionFactory
+     * @param ProductVisibility $productVisibility
      * @param StoreInterface[] $stores
      * @param array $productSku
      * @param int $productLimit
      */
     public function __construct(
         UrlFixer $urlFixer,
         CollectionFactory $productCollectionFactory,
+        ProductVisibility $productVisibility,
         array $stores,
         array $productSku = [],
         int $productLimit = self::PRODUCT_LIMIT
     ) {
         $this->urlFixer = $urlFixer;
         $this->productCollectionFactory = $productCollectionFactory;
+        $this->productVisibility = $productVisibility;
         $this->stores = $stores;
         $this->productSku = $productSku;
         $this->productLimit = $productLimit;
@@ -100,6 +109,7 @@ private function getProducts($storeId): Collection
         /** @var Collection $collection */
         $collection = $this->productCollectionFactory->create();
         $collection->addStoreFilter($storeId);
+        $collection->setVisibility($this->productVisibility->getVisibleInSiteIds());
 
         if (count($this->productSku)) {
             $collection->addAttributeToFilter('sku', $this->productSku);