MC-41534: [On-Premise] Product themes don't apply as expected

Author: tsviklinskyi

app/code/Magento/Catalog/Controller/Product/View.php

@@ -5,8 +5,9 @@
  */
 namespace Magento\Catalog\Controller\Product;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Design;
-use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\App\Action\Context;
@@ -60,14 +61,19 @@ class View extends ProductAction implements HttpGetActionInterface, HttpPostActi
     private $catalogDesign;
 
     /**
-     * @var ProductRepository
+     * @var ProductRepositoryInterface
      */
     private $productRepository;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @var StoreManagerInterface
      */
-    protected $storeManager;
+    private $storeManager;
 
     /**
      * Constructor
@@ -79,7 +85,8 @@ class View extends ProductAction implements HttpGetActionInterface, HttpPostActi
      * @param LoggerInterface|null $logger
      * @param Data|null $jsonHelper
      * @param Design|null $catalogDesign
-     * @param ProductRepository|null $productRepository
+     * @param ProductRepositoryInterface|null $productRepository
+     * @param CategoryRepositoryInterface|null $categoryRepository
      * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
@@ -90,7 +97,8 @@ public function __construct(
         ?LoggerInterface $logger = null,
         ?Data $jsonHelper = null,
         ?Design $catalogDesign = null,
-        ?ProductRepository $productRepository = null,
+        ?ProductRepositoryInterface $productRepository = null,
+        ?CategoryRepositoryInterface $categoryRepository = null,
         ?StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($context);
@@ -104,7 +112,9 @@ public function __construct(
         $this->catalogDesign = $catalogDesign ?: ObjectManager::getInstance()
             ->get(Design::class);
         $this->productRepository = $productRepository ?: ObjectManager::getInstance()
-            ->get(ProductRepository::class);
+            ->get(ProductRepositoryInterface::class);
+        $this->categoryRepository = $categoryRepository ?: ObjectManager::getInstance()
+            ->get(CategoryRepositoryInterface::class);
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()
             ->get(StoreManagerInterface::class);
     }
@@ -196,9 +206,17 @@ public function execute()
     private function applyCustomDesign(int $productId): void
     {
         $product = $this->productRepository->getById($productId, false, $this->storeManager->getStore()->getId());
-        $settings = $this->catalogDesign->getDesignSettings($product);
-        if ($settings->getCustomDesign()) {
-            $this->catalogDesign->applyCustomDesign($settings->getCustomDesign());
+        $productSettings = $this->catalogDesign->getDesignSettings($product);
+        if ($productSettings->getCustomDesign()) {
+            $this->catalogDesign->applyCustomDesign($productSettings->getCustomDesign());
+        } else {
+            foreach ($product->getCategoryIds() as $categoryId) {
+                $category = $this->categoryRepository->get($categoryId, $this->storeManager->getStore()->getId());
+                $categorySettings = $this->catalogDesign->getDesignSettings($category);
+                if ($categorySettings->getCustomDesign()) {
+                    $this->catalogDesign->applyCustomDesign($categorySettings->getCustomDesign());
+                }
+            }
         }
     }
 }

app/code/Magento/Catalog/Test/Unit/Controller/Product/ViewTest.php

@@ -7,11 +7,12 @@
 
 namespace Magento\Catalog\Test\Unit\Controller\Product;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Controller\Product\View;
 use Magento\Catalog\Helper\Product\View as ViewHelper;
 use Magento\Catalog\Model\Design;
-use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\ForwardFactory;
@@ -49,10 +50,15 @@ class ViewTest extends TestCase
     private $catalogDesignMock;
 
     /**
-     * @var ProductRepository|MockObject
+     * @var ProductRepositoryInterface|MockObject
      */
     private $productRepositoryMock;
 
+    /**
+     * @var CategoryRepositoryInterface|MockObject
+     */
+    private $categoryRepositoryMock;
+
     /**
      * @var ProductInterface|MockObject
      */
@@ -93,9 +99,8 @@ protected function setUp(): void
         $this->catalogDesignMock = $this->getMockBuilder(Design::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->productRepositoryMock = $this->getMockBuilder(ProductRepository::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->productRepositoryMock = $this->getMockForAbstractClass(ProductRepositoryInterface::class);
+        $this->categoryRepositoryMock = $this->getMockForAbstractClass(CategoryRepositoryInterface::class);
         $this->productInterfaceMock = $this->getMockBuilder(ProductInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -112,6 +117,7 @@ protected function setUp(): void
             null,
             $this->catalogDesignMock,
             $this->productRepositoryMock,
+            $this->categoryRepositoryMock,
             $this->storeManagerMock
         );
     }