ACP2E-23: [Magento Cloud] Error message in PDP disappearing quickly - Code refactoring applied.

Author: pradeep1819

app/code/Magento/Catalog/Model/Theme/CustomerData/MessageService.php

@@ -16,6 +16,7 @@
 class MessageService implements MessageServiceInterface
 {
     /**
+     *
      * @var Config
      */
     private $appConfig;
@@ -51,6 +52,7 @@ public function __construct(
 
     /**
      * Verify flag value for synchronize product actions with backend or not
+     *
      * @return object
      */
     public function getMessages(): object

app/code/Magento/Catalog/etc/di.xml

@@ -73,7 +73,7 @@
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
     <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
     <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
-    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="\Magento\Catalog\Model\MassAction" />
+    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="Magento\Catalog\Model\MassAction" />
     <preference for="Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface" type="Magento\Catalog\Model\ProductLink\Data\ListCriteria" />
     <preference for="Magento\Catalog\Api\CategoryListDeleteBySkuInterface" type="Magento\Catalog\Model\CategoryLinkRepository"/>
     <preference for="Magento\Theme\CustomerData\MessageServiceInterface" type="Magento\Catalog\Model\Theme\CustomerData\MessageService"/>

app/code/Magento/Theme/CustomerData/MessageServiceInterface.php

@@ -10,6 +10,8 @@
 interface MessageServiceInterface
 {
     /**
+     *  Get the messages stored in session before session clear
+     *
      * @return object
      */
     public function getMessages();

app/code/Magento/Theme/Test/Unit/CustomerData/MessagesTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Theme\CustomerData\Messages;
+use Magento\Theme\CustomerData\MessageServiceInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -22,6 +23,11 @@ class MessagesTest extends TestCase
      */
     protected $messageManager;
 
+    /**
+     * @var MessageServiceInterface|MockObject
+     */
+    private $messageService;
+
     /**
      * @var InterpretationStrategyInterface|MockObject
      */
@@ -36,10 +42,12 @@ protected function setUp(): void
     {
         $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
             ->getMock();
+        $this->messageService = $this->getMockBuilder(MessageServiceInterface::class)
+            ->getMock();
         $this->messageInterpretationStrategy = $this->createMock(
             InterpretationStrategyInterface::class
         );
-        $this->object = new Messages($this->messageManager, $this->messageInterpretationStrategy);
+        $this->object = new Messages($this->messageManager, $this->messageInterpretationStrategy, $this->messageService);
     }
 
     public function testGetSectionData()
@@ -59,9 +67,8 @@ public function testGetSectionData()
             ->method('interpret')
             ->with($msg)
             ->willReturn($msgText);
-        $this->messageManager->expects($this->once())
+        $this->messageService->expects($this->once())
             ->method('getMessages')
-            ->with(true, null)
             ->willReturn($msgCollection);
         $msgCollection->expects($this->once())
             ->method('getItems')