Merge pull request #4687 from magento-tsg/MC-19568

[tsg] MC-19568: Worldpay: Product is missing from shopping cart after Worldpay cancellation

Author: nathanjosiah

app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php

@@ -9,6 +9,9 @@
 namespace Magento\Persistent\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
 
 /**
@@ -77,6 +80,11 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      */
     private $quote;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Persistent\Helper\Data $persistentData
@@ -85,6 +93,7 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\RequestInterface $request
+     * @param CartRepositoryInterface $quoteRepository
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -93,7 +102,8 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\App\RequestInterface $request
+        \Magento\Framework\App\RequestInterface $request,
+        CartRepositoryInterface $quoteRepository
     ) {
         $this->_persistentSession = $persistentSession;
         $this->quoteManager = $quoteManager;
@@ -102,6 +112,7 @@ public function __construct(
         $this->_eventManager = $eventManager;
         $this->_persistentData = $persistentData;
         $this->request = $request;
+        $this->quoteRepository = $quoteRepository;
     }
 
     /**
@@ -146,7 +157,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     private function isPersistentQuoteOutdated(): bool
     {
         if (!$this->_persistentData->isEnabled() && !$this->_customerSession->isLoggedIn()
-            && $this->_checkoutSession->getQuoteId()) {
+            && $this->_checkoutSession->getQuoteId()
+            && $this->isActiveQuote()
+        ) {
             return (bool)$this->getQuote()->getIsPersistent();
         }
         return false;
@@ -175,6 +188,21 @@ private function getQuote(): Quote
         return $this->quote;
     }
 
+    /**
+     * Check if quote is active.
+     *
+     * @return bool
+     */
+    private function isActiveQuote(): bool
+    {
+        try {
+            $this->quoteRepository->getActive($this->_checkoutSession->getQuoteId());
+            return true;
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+    }
+
     /**
      * Check current request is coming from onepage checkout page.
      *

app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 
 /**
@@ -63,6 +65,11 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
      */
     private $quoteMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CartRepositoryInterface
+     */
+    private $quoteRepositoryMock;
+
     protected function setUp()
     {
         $this->sessionMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
@@ -78,6 +85,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getRequestUri', 'getServer'])
             ->getMockForAbstractClass();
+        $this->quoteRepositoryMock = $this->createMock(CartRepositoryInterface::class);
 
         $this->model = new \Magento\Persistent\Observer\CheckExpirePersistentQuoteObserver(
             $this->sessionMock,
@@ -86,7 +94,8 @@ protected function setUp()
             $this->eventManagerMock,
             $this->customerSessionMock,
             $this->checkoutSessionMock,
-            $this->requestMock
+            $this->requestMock,
+            $this->quoteRepositoryMock
         );
         $this->quoteMock = $this->getMockBuilder(Quote::class)
             ->setMethods(['getCustomerIsGuest', 'getIsPersistent'])
@@ -107,12 +116,19 @@ public function testExecuteWhenCanNotApplyPersistentData()
 
     public function testExecuteWhenPersistentIsNotEnabled()
     {
+        $quoteId = 'quote_id_1';
+
         $this->persistentHelperMock
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
             ->will($this->returnValue(true));
         $this->persistentHelperMock->expects($this->exactly(2))->method('isEnabled')->will($this->returnValue(false));
+        $this->checkoutSessionMock->expects($this->exactly(2))->method('getQuoteId')->willReturn($quoteId);
+        $this->quoteRepositoryMock->expects($this->once())
+            ->method('getActive')
+            ->with($quoteId)
+            ->willThrowException(new NoSuchEntityException());
         $this->eventManagerMock->expects($this->never())->method('dispatch');
         $this->model->execute($this->observerMock);
     }