Implementation changes to reuse plugin

Author: glo05363

app/code/Magento/Multishipping/Model/Cart/MultishippingClearItemAddress.php

@@ -10,6 +10,7 @@
 use Magento\Checkout\Controller\Cart;
 use Magento\Checkout\Controller\Sidebar\UpdateItemQty;
 use Magento\Checkout\Model\Session;
+use Magento\Checkout\Model\Cart as CartModel;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -19,6 +20,8 @@
 
 /**
  * Cleans shipping addresses and item assignments after MultiShipping flow
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class MultishippingClearItemAddress
 {
@@ -42,22 +45,30 @@ class MultishippingClearItemAddress
      */
     private $disableMultishipping;
 
+    /**
+     * @var CartModel
+     */
+    private $cartmodel;
+
     /**
      * @param CartRepositoryInterface $cartRepository
      * @param Session $checkoutSession
      * @param AddressRepositoryInterface $addressRepository
      * @param DisableMultishipping $disableMultishipping
+     * @param CartModel $cartmodel
      */
     public function __construct(
         CartRepositoryInterface $cartRepository,
         Session $checkoutSession,
         AddressRepositoryInterface $addressRepository,
-        DisableMultishipping $disableMultishipping
+        DisableMultishipping $disableMultishipping,
+        CartModel $cartmodel
     ) {
         $this->cartRepository = $cartRepository;
         $this->checkoutSession = $checkoutSession;
         $this->addressRepository = $addressRepository;
         $this->disableMultishipping = $disableMultishipping;
+        $this->cartmodel = $cartmodel;
     }
 
     /**
@@ -90,9 +101,8 @@ public function clearAddressItem($subject, $request)
             }
             $this->cartRepository->save($quote);
             if ($subject instanceof UpdateItemQty) {
-                $quote = $this->checkoutSession->getQuote();
-                $quote->setTotalsCollectedFlag(false);
-                $this->cartRepository->save($quote);
+                $quote = $this->cartRepository->get($quote->getId());
+                $this->cartmodel->setQuote($quote);
             }
         } elseif ($this->disableMultishipping->execute($quote) && $this->isVirtualItemInQuote($quote)) {
             $quote->setTotalsCollectedFlag(false);

app/code/Magento/Multishipping/Test/Unit/Model/Cart/MultishippingClearItemAddressTest.php

@@ -10,6 +10,7 @@
 use Magento\Checkout\Controller\Cart;
 use Magento\Checkout\Controller\Sidebar\UpdateItemQty;
 use Magento\Checkout\Model\Session;
+use Magento\Checkout\Model\Cart as CartModel;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
@@ -50,17 +51,24 @@ class MultishippingClearItemAddressTest extends TestCase
      */
     private $addressRepositoryMock;
 
+    /**
+     * @var CartModel|MockObject
+     */
+    private $cartMock;
+
     protected function setUp(): void
     {
         $this->cartRepositoryMock = $this->getMockForAbstractClass(CartRepositoryInterface::class);
         $this->checkoutSessionMock = $this->createMock(Session::class);
         $this->addressRepositoryMock = $this->getMockForAbstractClass(AddressRepositoryInterface::class);
         $disableMultishippingMock = $this->createMock(DisableMultishipping::class);
+        $this->cartMock = $this->createMock(CartModel::class);
         $this->model = new MultishippingClearItemAddress(
             $this->cartRepositoryMock,
             $this->checkoutSessionMock,
             $this->addressRepositoryMock,
-            $disableMultishippingMock
+            $disableMultishippingMock,
+            $this->cartMock
         );
     }
 
@@ -125,7 +133,12 @@ public function testClearAddressItem(
         $this->cartRepositoryMock->expects($this->any())
             ->method('save')
             ->with($quoteMock);
-
+        if ($actionName instanceof UpdateItemQty) {
+            $quoteMock->expects($this->any())->method('getId')->willReturnSelf();
+            $this->cartRepositoryMock->expects($this->any())
+                ->method('get')->with($quoteMock)->willReturn($quoteMock);
+            $this->cartMock->expects($this->any())->method('setQuote')->with($quoteMock);
+        }
         $this->model->clearAddressItem(
             $this->createMock(Cart::class),
             $requestMock