ACP2E-3255: [GRAPHQL] model value should be specified when getting customerCart

 - Fixed the static test failure.

Author: devarul

app/code/Magento/Quote/Model/CreateEmptyCartForCustomer.php

@@ -18,7 +18,7 @@
 /**
  * Class to create an empty cart and quote for a specified customer.
  */
-readonly class CreateEmptyCartForCustomer
+class CreateEmptyCartForCustomer
 {
     /**
      * @param StoreManagerInterface $storeManager
@@ -27,10 +27,10 @@
      * @param QuoteFactory $quoteFactory
      */
     public function __construct(
-        private StoreManagerInterface $storeManager,
-        private CartRepositoryInterface $quoteRepository,
-        private CustomerRepositoryInterface $customerRepository,
-        private QuoteFactory $quoteFactory,
+        private readonly StoreManagerInterface $storeManager,
+        private readonly CartRepositoryInterface $quoteRepository,
+        private readonly CustomerRepositoryInterface $customerRepository,
+        private readonly QuoteFactory $quoteFactory,
     ) {
     }
 

app/code/Magento/QuoteGraphQl/Plugin/Model/Cart/CustomerEmptyCartResolver.php

@@ -23,7 +23,7 @@
 /**
  * Get customer cart or create empty cart. Ensure mask_id is created
  */
-readonly class CustomerEmptyCartResolver
+class CustomerEmptyCartResolver
 {
     /**
      * @param CartManagementInterface $cartManagement
@@ -33,12 +33,12 @@
      * @param QuoteIdMaskResourceModel $quoteIdMaskResourceModel
      */
     public function __construct(
-        private CartManagementInterface $cartManagement,
-        private CreateEmptyCartForCustomer $createEmptyCartForCustomer,
-        private QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
-        private QuoteIdMaskFactory $quoteIdMaskFactory,
-        private QuoteIdMaskResourceModel $quoteIdMaskResourceModel
-    ){
+        private readonly CartManagementInterface $cartManagement,
+        private readonly CreateEmptyCartForCustomer $createEmptyCartForCustomer,
+        private readonly QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
+        private readonly QuoteIdMaskFactory $quoteIdMaskFactory,
+        private readonly QuoteIdMaskResourceModel $quoteIdMaskResourceModel
+    ) {
     }
 
     /**
@@ -47,6 +47,7 @@ public function __construct(
      * @param CustomerCartResolver $subject
      * @param Closure $proceed
      * @param int $customerId
+     * @param $predefinedMaskedQuoteId
      * @return Quote
      * @throws NoSuchEntityException
      * @throws LocalizedException
@@ -55,7 +56,8 @@ public function __construct(
     public function aroundResolve(
         CustomerCartResolver $subject,
         Closure $proceed,
-        int $customerId
+        int $customerId,
+        $predefinedMaskedQuoteId = null
     ): Quote {
         try {
             /** @var Quote $cart */
@@ -65,7 +67,7 @@ public function aroundResolve(
             $cart = $this->cartManagement->getCartForCustomer($customerId);
         }
         try {
-            $this->ensureQuoteMaskIdExist((int)$cart->getId());
+            $this->ensureQuoteMaskIdExist((int)$cart->getId(), $predefinedMaskedQuoteId);
             // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (AlreadyExistsException $e) {
             // do nothing, we already have masked id
@@ -78,10 +80,11 @@ public function aroundResolve(
      * Create masked id for customer's active quote if it's not exists
      *
      * @param int $quoteId
+     * @param $predefinedMaskedQuoteId
      * @return void
      * @throws AlreadyExistsException
      */
-    private function ensureQuoteMaskIdExist(int $quoteId): void
+    private function ensureQuoteMaskIdExist(int $quoteId, $predefinedMaskedQuoteId): void
     {
         try {
             $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
@@ -91,6 +94,9 @@ private function ensureQuoteMaskIdExist(int $quoteId): void
         if ($maskedId === '') {
             $quoteIdMask = $this->quoteIdMaskFactory->create();
             $quoteIdMask->setQuoteId($quoteId);
+            if (null !== $predefinedMaskedQuoteId) {
+                $quoteIdMask->setMaskedId($predefinedMaskedQuoteId);
+            }
             $this->quoteIdMaskResourceModel->save($quoteIdMask);
         }
     }