Merge remote-tracking branch 'origin/MC-41093' into 2.4-develop-pr135

Author: zakdma

app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php

@@ -25,6 +25,7 @@
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Psr\Log\LoggerInterface as PsrLogger;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -98,8 +99,11 @@ class StockItemRepository implements StockItemRepositoryInterface
     protected $productCollectionFactory;
 
     /**
-     * Constructor
-     *
+     * @var PsrLogger
+     */
+    private $psrLogger;
+
+    /**
      * @param StockConfigurationInterface $stockConfiguration
      * @param StockStateProviderInterface $stockStateProvider
      * @param StockItemResource $resource
@@ -111,7 +115,8 @@ class StockItemRepository implements StockItemRepositoryInterface
      * @param TimezoneInterface $localeDate
      * @param Processor $indexProcessor
      * @param DateTime $dateTime
-     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory|null $collectionFactory
+     * @param CollectionFactory|null $productCollectionFactory
+     * @param PsrLogger|null $psrLogger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -126,7 +131,8 @@ public function __construct(
         TimezoneInterface $localeDate,
         Processor $indexProcessor,
         DateTime $dateTime,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory = null
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory = null,
+        PsrLogger $psrLogger = null
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->stockStateProvider = $stockStateProvider;
@@ -141,6 +147,8 @@ public function __construct(
         $this->dateTime = $dateTime;
         $this->productCollectionFactory = $productCollectionFactory ?: ObjectManager::getInstance()
             ->get(CollectionFactory::class);
+        $this->psrLogger = $psrLogger ?: ObjectManager::getInstance()
+            ->get(PsrLogger::class);
     }
 
     /**
@@ -184,6 +192,7 @@ public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stoc
 
             $this->resource->save($stockItem);
         } catch (\Exception $exception) {
+            $this->psrLogger->error($exception->getMessage());
             throw new CouldNotSaveException(__('The stock item was unable to be saved. Please try again.'), $exception);
         }
         return $stockItem;

app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php

@@ -6,6 +6,7 @@
 namespace Magento\Elasticsearch\Model\ResourceModel;
 
 use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -137,7 +138,11 @@ public function getFullCategoryProductIndexData($storeId = null, $productIds = n
 
         foreach ($categoryPositions as $productId => $positions) {
             foreach ($positions as $categoryId => $position) {
-                $category = $this->categoryRepository->get($categoryId, $storeId);
+                try {
+                    $category = $this->categoryRepository->get($categoryId, $storeId);
+                } catch (NoSuchEntityException $e) {
+                    continue;
+                }
                 $categoryName = $category->getName();
                 $categoryData[$productId][] = [
                     'id' => $categoryId,

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php

@@ -22,6 +22,8 @@
 use Magento\TestFramework\TestCase\AbstractBackendController;
 use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager;
 use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
 
 /**
  * Test class for Product adminhtml actions
@@ -46,6 +48,11 @@ class ProductTest extends AbstractBackendController
      */
     private $resourceModel;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @inheritDoc
      */
@@ -62,6 +69,7 @@ protected function setUp(): void
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
         $this->repositoryFactory = Bootstrap::getObjectManager()->get(ProductRepositoryFactory::class);
         $this->resourceModel = Bootstrap::getObjectManager()->get(ProductResource::class);
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -677,4 +685,24 @@ public function testSaveActionWithInvalidUrlKey(array $postData)
         );
         $this->assertRedirect($this->stringContains('/backend/catalog/product/new'));
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea adminhtml
+     */
+    public function testSaveProductWithDeletedCategory(): void
+    {
+        $category = $this->_objectManager->get(Category::class);
+        $category->load(333);
+        $category->delete();
+        $product = $this->productRepository->get('simple333');
+        $this->productRepository->save($product);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the product.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
 }