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

 - Fixed the issue.

Author: devarul

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

@@ -43,7 +43,6 @@
 use Magento\Sales\Api\Data\OrderInterfaceFactory as OrderFactory;
 use Magento\Sales\Api\OrderManagementInterface as OrderManagement;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Model\AddressRegistry;
 
 /**
  * Class for managing quote
@@ -184,11 +183,6 @@ class QuoteManagement implements CartManagementInterface, ResetAfterRequestInter
      */
     private $cartMutex;
 
-    /**
-     * @var AddressRegistry
-     */
-    private $addressRegistry;
-
     /**
      * @param EventManager $eventManager
      * @param SubmitQuoteValidator $submitQuoteValidator
@@ -216,7 +210,6 @@ class QuoteManagement implements CartManagementInterface, ResetAfterRequestInter
      * @param RemoteAddress|null $remoteAddress
      * @param LockManagerInterface $lockManager
      * @param CartMutexInterface|null $cartMutex
-     * @param AddressRegistry|null $addressRegistry
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -246,8 +239,7 @@ public function __construct(
         RequestInterface $request = null,
         RemoteAddress $remoteAddress = null,
         LockManagerInterface $lockManager = null,
-        ?CartMutexInterface $cartMutex = null,
-        ?AddressRegistry $addressRegistry = null
+        ?CartMutexInterface $cartMutex = null
     ) {
         $this->eventManager = $eventManager;
         $this->submitQuoteValidator = $submitQuoteValidator;
@@ -279,8 +271,6 @@ public function __construct(
             ->get(RemoteAddress::class);
         $this->cartMutex = $cartMutex
             ?? ObjectManager::getInstance()->get(CartMutexInterface::class);
-        $this->addressRegistry = $addressRegistry
-            ?? ObjectManager::getInstance()->get(AddressRegistry::class);
     }
 
     /**
@@ -706,9 +696,7 @@ protected function _prepareCustomerQuote($quote)
                 }
                 //save here new customer address
                 $shippingAddress->setCustomerId($quote->getCustomerId());
-                if ($this->validateAddress((int) $shippingAddress->getId()) === true) {
-                    $this->addressRepository->save($shippingAddress);
-                }
+                $this->addressRepository->save($shippingAddress);
                 $quote->addCustomerAddress($shippingAddress);
                 $shipping->setCustomerAddressData($shippingAddress);
                 $this->addressesToSync[] = $shippingAddress->getId();
@@ -740,9 +728,7 @@ protected function _prepareCustomerQuote($quote)
                     $billingAddress->setIsDefaultBilling(true);
                 }
                 $billingAddress->setCustomerId($quote->getCustomerId());
-                if ($this->validateAddress((int) $billingAddress->getId()) === true) {
-                    $this->addressRepository->save($billingAddress);
-                }
+                $this->addressRepository->save($billingAddress);
                 $quote->addCustomerAddress($billingAddress);
                 $billing->setCustomerAddressData($billingAddress);
                 $this->addressesToSync[] = $billingAddress->getId();
@@ -805,17 +791,4 @@ public function _resetState(): void
     {
         $this->addressesToSync = [];
     }
-
-    /**
-     * Validate address
-     *
-     * @param int|null $addressId
-     * @return array|bool
-     * @throws NoSuchEntityException
-     */
-    private function validateAddress(?int $addressId): bool|array
-    {
-        $addressModel = $this->addressRegistry->retrieve($addressId);
-        return $addressModel->validate();
-    }
 }

app/code/Magento/QuoteGraphQl/Plugin/Model/CreateEmptyCartWithoutCountryValidation.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Plugin\Model;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Closure;
+use Exception;
+use Magento\Quote\Model\QuoteManagement;
+
+class CreateEmptyCartWithoutCountryValidation
+{
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param CartRepositoryInterface $quoteRepository
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param QuoteFactory $quoteFactory
+     */
+    public function __construct(
+        private readonly StoreManagerInterface $storeManager,
+        private readonly CartRepositoryInterface $quoteRepository,
+        private readonly CustomerRepositoryInterface $customerRepository,
+        private readonly QuoteFactory $quoteFactory
+    ) {}
+
+    /**
+     * Create empty cart for customer without country validation
+     *
+     * @param QuoteManagement $subject
+     * @param Closure $proceed
+     * @param int $customerId
+     * @return bool|int
+     * @throws CouldNotSaveException
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundCreateEmptyCartForCustomer(
+        QuoteManagement $subject,
+        Closure $proceed,
+        int $customerId
+    ): bool|int
+    {
+        $storeId = (int) $this->storeManager->getStore()->getStoreId();
+        $quote = $this->createCustomerCart($customerId,$storeId);
+
+        try {
+            $this->quoteRepository->save($quote);
+        } catch (Exception $e) {
+            throw new CouldNotSaveException(__("The quote can't be created."));
+        }
+        return (int)$quote->getId();
+    }
+
+    /**
+     * Creates a cart for the currently logged-in customer.
+     *
+     * @param int $customerId
+     * @param int $storeId
+     * @return Quote Cart object.
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
+    private function createCustomerCart(int $customerId, int $storeId): Quote
+    {
+        try {
+            $quote = $this->quoteRepository->getActiveForCustomer($customerId);
+        } catch (NoSuchEntityException $e) {
+            $customer = $this->customerRepository->getById($customerId);
+            $quote = $this->quoteFactory->create();
+            $quote->setStoreId($storeId);
+            $quote->setCustomer($customer);
+            $quote->setCustomerIsGuest(0);
+        }
+        return $quote;
+    }
+}

app/code/Magento/QuoteGraphQl/etc/graphql/di.xml

@@ -79,4 +79,8 @@
         <plugin name="merge_guest_orders_with_customer_after_place"
                 type="Magento\QuoteGraphQl\Plugin\Model\MergeGuestOrder" />
     </type>
+    <type name="Magento\Quote\Model\QuoteManagement">
+        <plugin name="create_empty_cart_without_country_validation"
+                type="Magento\QuoteGraphQl\Plugin\Model\CreateEmptyCartWithoutCountryValidation" />
+    </type>
 </config>