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

 - Fixed the CR comments.

Author: devarul

app/code/Magento/Quote/Model/Cart/CustomerCartResolver.php

@@ -14,6 +14,7 @@
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
+use Magento\Quote\Model\CreateEmptyCartForCustomerWithoutCountryValidation;
 
 /**
  * Get customer cart or create empty cart. Ensure mask_id is created
@@ -40,22 +41,30 @@ class CustomerCartResolver
      */
     private $quoteIdToMaskedQuoteId;
 
+    /**
+     * @var CreateEmptyCartForCustomerWithoutCountryValidation
+     */
+    private $createEmptyCartForCustomerWithoutCountryValidation;
+
     /**
      * @param CartManagementInterface $cartManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
      * @param QuoteIdMaskResourceModel $quoteIdMaskResourceModel
      * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+     * @param CreateEmptyCartForCustomerWithoutCountryValidation $createEmptyCartForCustomerWithoutCountryValidation
      */
     public function __construct(
         CartManagementInterface $cartManagement,
         QuoteIdMaskFactory $quoteIdMaskFactory,
         QuoteIdMaskResourceModel $quoteIdMaskResourceModel,
-        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
+        CreateEmptyCartForCustomerWithoutCountryValidation $createEmptyCartForCustomerWithoutCountryValidation
     ) {
         $this->cartManagement = $cartManagement;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
         $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
         $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+        $this->createEmptyCartForCustomerWithoutCountryValidation = $createEmptyCartForCustomerWithoutCountryValidation;
     }
 
     /**
@@ -73,7 +82,8 @@ public function resolve(int $customerId, string $predefinedMaskedQuoteId = null)
             /** @var Quote $cart */
             $cart = $this->cartManagement->getCartForCustomer($customerId);
         } catch (NoSuchEntityException $e) {
-            $this->cartManagement->createEmptyCartForCustomer($customerId);
+            $this->createEmptyCartForCustomerWithoutCountryValidation
+                ->createEmptyCartForCustomerWithoutCountryValidation($customerId);
             $cart = $this->cartManagement->getCartForCustomer($customerId);
         }
         try {

app/code/Magento/QuoteGraphQl/Plugin/Model/CreateEmptyCartWithoutCountryValidation.php renamed to app/code/Magento/Quote/Model/CreateEmptyCartForCustomerWithoutCountryValidation.php

@@ -1,30 +1,23 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
-namespace Magento\QuoteGraphQl\Plugin\Model;
+namespace Magento\Quote\Model;
 
-use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 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;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Customer\Model\Config\Share;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Class for creating empty cart for customer without country validation
  */
-class CreateEmptyCartWithoutCountryValidation
+class CreateEmptyCartForCustomerWithoutCountryValidation
 {
     /**
      * @param StoreManagerInterface $storeManager
@@ -45,37 +38,22 @@ public function __construct(
     /**
      * 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)
+     * @throws NoSuchEntityException
      */
-    public function aroundCreateEmptyCartForCustomer(
-        QuoteManagement $subject,
-        Closure $proceed,
-        int $customerId
-    ): bool|int {
-        $customerAccountShareScope = (int) $this->scopeConfig->getValue(
-            Share::XML_PATH_CUSTOMER_ACCOUNT_SHARE,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
-        );
-        if ($customerAccountShareScope === Share::SHARE_GLOBAL) {
-            $storeId = (int) $this->storeManager->getStore()->getStoreId();
-            $quote = $this->createCustomerCart($customerId, $storeId);
+    public function createEmptyCartForCustomerWithoutCountryValidation(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();
-        } else {
-            return $proceed($customerId);
+        try {
+            $this->quoteRepository->save($quote);
+        } catch (Exception $e) {
+            throw new CouldNotSaveException(__("The quote can't be created."));
         }
+        return (int)$quote->getId();
     }
 
     /**

app/code/Magento/QuoteGraphQl/Test/Unit/Plugin/Model/CreateEmptyCartWithoutCountryValidationTest.php

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