Merge remote-tracking branch 'tango/MC-34259' into Chaika-PR-2020-05-21

Author: veloraven

app/code/Magento/Catalog/Model/Product/SalabilityChecker.php

@@ -7,8 +7,9 @@
 
 namespace Magento\Downloadable\Controller\Download;
 
-use Magento\Catalog\Model\Product\SalabilityChecker;
 use Magento\Downloadable\Helper\Download as DownloadHelper;
+use Magento\Downloadable\Model\Link as LinkModel;
+use Magento\Downloadable\Model\RelatedProductRetriever;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ResponseInterface;
 
@@ -20,20 +21,21 @@
 class LinkSample extends \Magento\Downloadable\Controller\Download
 {
     /**
-     * @var SalabilityChecker
+     * @var RelatedProductRetriever
      */
-    private $salabilityChecker;
+    private $relatedProductRetriever;
 
     /**
      * @param Context $context
-     * @param SalabilityChecker|null $salabilityChecker
+     * @param RelatedProductRetriever $relatedProductRetriever
      */
     public function __construct(
         Context $context,
-        SalabilityChecker $salabilityChecker = null
+        RelatedProductRetriever $relatedProductRetriever
     ) {
         parent::__construct($context);
-        $this->salabilityChecker = $salabilityChecker ?: $this->_objectManager->get(SalabilityChecker::class);
+
+        $this->relatedProductRetriever = $relatedProductRetriever;
     }
 
     /**
@@ -44,9 +46,10 @@ public function __construct(
     public function execute()
     {
         $linkId = $this->getRequest()->getParam('link_id', 0);
-        /** @var \Magento\Downloadable\Model\Link $link */
-        $link = $this->_objectManager->create(\Magento\Downloadable\Model\Link::class)->load($linkId);
-        if ($link->getId() && $this->salabilityChecker->isSalable($link->getProductId())) {
+        /** @var LinkModel $link */
+        $link = $this->_objectManager->create(LinkModel::class);
+        $link->load($linkId);
+        if ($link->getId() && $this->isProductSalable($link)) {
             $resource = '';
             $resourceType = '';
             if ($link->getSampleType() == DownloadHelper::LINK_TYPE_URL) {
@@ -74,4 +77,16 @@ public function execute()
 
         return $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
     }
+
+    /**
+     * Check is related product salable.
+     *
+     * @param LinkModel $link
+     * @return bool
+     */
+    private function isProductSalable(LinkModel $link): bool
+    {
+        $product = $this->relatedProductRetriever->getProduct((int) $link->getProductId());
+        return $product ? $product->isSalable() : false;
+    }
 }

app/code/Magento/Downloadable/Controller/Download/LinkSample.php

@@ -7,8 +7,9 @@
 
 namespace Magento\Downloadable\Controller\Download;
 
-use Magento\Catalog\Model\Product\SalabilityChecker;
 use Magento\Downloadable\Helper\Download as DownloadHelper;
+use Magento\Downloadable\Model\RelatedProductRetriever;
+use Magento\Downloadable\Model\Sample as SampleModel;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ResponseInterface;
 
@@ -20,20 +21,21 @@
 class Sample extends \Magento\Downloadable\Controller\Download
 {
     /**
-     * @var SalabilityChecker
+     * @var RelatedProductRetriever
      */
-    private $salabilityChecker;
+    private $relatedProductRetriever;
 
     /**
      * @param Context $context
-     * @param SalabilityChecker|null $salabilityChecker
+     * @param RelatedProductRetriever $relatedProductRetriever
      */
     public function __construct(
         Context $context,
-        SalabilityChecker $salabilityChecker = null
+        RelatedProductRetriever $relatedProductRetriever
     ) {
         parent::__construct($context);
-        $this->salabilityChecker = $salabilityChecker ?: $this->_objectManager->get(SalabilityChecker::class);
+
+        $this->relatedProductRetriever = $relatedProductRetriever;
     }
 
     /**
@@ -44,9 +46,10 @@ public function __construct(
     public function execute()
     {
         $sampleId = $this->getRequest()->getParam('sample_id', 0);
-        /** @var \Magento\Downloadable\Model\Sample $sample */
-        $sample = $this->_objectManager->create(\Magento\Downloadable\Model\Sample::class)->load($sampleId);
-        if ($sample->getId() && $this->salabilityChecker->isSalable($sample->getProductId())) {
+        /** @var SampleModel $sample */
+        $sample = $this->_objectManager->create(SampleModel::class);
+        $sample->load($sampleId);
+        if ($sample->getId() && $this->isProductSalable($sample)) {
             $resource = '';
             $resourceType = '';
             if ($sample->getSampleType() == DownloadHelper::LINK_TYPE_URL) {
@@ -71,4 +74,16 @@ public function execute()
 
         return $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
     }
+
+    /**
+     * Check is related product salable.
+     *
+     * @param SampleModel $sample
+     * @return bool
+     */
+    private function isProductSalable(SampleModel $sample): bool
+    {
+        $product = $this->relatedProductRetriever->getProduct((int) $sample->getProductId());
+        return $product ? $product->isSalable() : false;
+    }
 }

app/code/Magento/Downloadable/Controller/Download/Sample.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Downloadable\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * Related parent product retriever.
+ */
+class RelatedProductRetriever
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        ProductRepositoryInterface $productRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        MetadataPool $metadataPool
+    ) {
+        $this->productRepository = $productRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * Get related product.
+     *
+     * @param int $productId
+     * @return ProductInterface|null
+     */
+    public function getProduct(int $productId): ?ProductInterface
+    {
+        $productMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter($productMetadata->getLinkField(), $productId)
+            ->create();
+        $items = $this->productRepository->getList($searchCriteria)
+            ->getItems();
+        $product = $items ? array_shift($items) : null;
+
+        return $product;
+    }
+}

app/code/Magento/Downloadable/Model/RelatedProductRetriever.php

@@ -24,7 +24,7 @@ class Sample extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-     * @param null $connectionName
+     * @param string|null $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -126,7 +126,7 @@ public function getSearchableData($productId, $storeId)
         )->join(
             ['cpe' => $this->getTable('catalog_product_entity')],
             sprintf(
-                'cpe.entity_id = m.product_id',
+                'cpe.%s = m.product_id',
                 $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()
             ),
             []