Merge branch 'ACP2E-38' of https://github.com/magento-l3/magento2ce into PR1-21-01-2022

Author: chittima

app/code/Magento/Checkout/Model/Layout/DepersonalizePlugin.php

@@ -28,6 +28,11 @@ class DepersonalizePlugin
      */
     private $checkoutSession;
 
+    /**
+     * @var int
+     */
+    private $quoteId;
+
     /**
      * @param DepersonalizeChecker $depersonalizeChecker
      * @param CheckoutSession $checkoutSession
@@ -41,6 +46,19 @@ public function __construct(
         $this->checkoutSession = $checkoutSession;
     }
 
+    /**
+     * Resolve quote data if the depersonalization is needed.
+     *
+     * @param LayoutInterface $subject
+     * @return void
+     */
+    public function beforeGenerateXml(LayoutInterface $subject)
+    {
+        if ($this->depersonalizeChecker->checkIfDepersonalize($subject)) {
+            $this->quoteId = $this->checkoutSession->getQuoteId();
+        }
+    }
+
     /**
      * Change sensitive customer data if the depersonalization is needed.
      *
@@ -51,6 +69,7 @@ public function afterGenerateElements(LayoutInterface $subject)
     {
         if ($this->depersonalizeChecker->checkIfDepersonalize($subject)) {
             $this->checkoutSession->clearStorage();
+            $this->checkoutSession->setQuoteId($this->quoteId);
         }
     }
 }

app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php

@@ -46,7 +46,10 @@ class DepersonalizePluginTest extends TestCase
     protected function setUp(): void
     {
         $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
-        $this->checkoutSessionMock = $this->createPartialMock(CheckoutSession::class, ['clearStorage']);
+        $this->checkoutSessionMock = $this->createPartialMock(
+            CheckoutSession::class,
+            ['clearStorage', 'setQuoteId', 'getQuoteId']
+        );
         $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
 
         $this->plugin = (new ObjectManagerHelper($this))->getObject(
@@ -70,6 +73,10 @@ public function testAfterGenerateElements(): void
             ->expects($this->once())
             ->method('clearStorage')
             ->willReturnSelf();
+        $this->checkoutSessionMock
+            ->expects($this->once())
+            ->method('setQuoteId')
+            ->willReturn(1);
 
         $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
@@ -86,7 +93,43 @@ public function testAfterGenerateElementsNoDepersonalize(): void
             ->expects($this->never())
             ->method('clearStorage')
             ->willReturnSelf();
+        $this->checkoutSessionMock
+            ->expects($this->never())
+            ->method('setQuoteId')
+            ->willReturn(1);
 
         $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
+
+    /**
+     * Test beforeGenerateElements method when depersonalization is needed.
+     *
+     * @return void
+     */
+    public function testBeforeGenerateXml(): void
+    {
+        $this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(true);
+        $this->checkoutSessionMock
+            ->expects($this->once())
+            ->method('getQuoteId')
+            ->willReturn(1);
+
+        $this->assertEmpty($this->plugin->beforeGenerateXml($this->layoutMock));
+    }
+
+    /**
+     * Test beforeGenerateElements method when depersonalization is not needed.
+     *
+     * @return void
+     */
+    public function testBeforeGenerateXmlNoDepersonalize(): void
+    {
+        $this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(false);
+        $this->checkoutSessionMock
+            ->expects($this->never())
+            ->method('getQuoteId')
+            ->willReturn(1);
+
+        $this->assertEmpty($this->plugin->beforeGenerateXml($this->layoutMock));
+    }
 }