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

 - Fixed the CR comments.

Author: devarul

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

@@ -18,6 +18,8 @@
 use Closure;
 use Exception;
 use Magento\Quote\Model\QuoteManagement;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Customer\Model\Config\Share;
 
 class CreateEmptyCartWithoutCountryValidation
 {
@@ -26,12 +28,14 @@ class CreateEmptyCartWithoutCountryValidation
      * @param CartRepositoryInterface $quoteRepository
      * @param CustomerRepositoryInterface $customerRepository
      * @param QuoteFactory $quoteFactory
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         private readonly StoreManagerInterface $storeManager,
         private readonly CartRepositoryInterface $quoteRepository,
         private readonly CustomerRepositoryInterface $customerRepository,
-        private readonly QuoteFactory $quoteFactory
+        private readonly QuoteFactory $quoteFactory,
+        private readonly ScopeConfigInterface $scopeConfig
     ) {
     }
 
@@ -52,15 +56,23 @@ public function aroundCreateEmptyCartForCustomer(
         Closure $proceed,
         int $customerId
     ): bool|int {
-        $storeId = (int) $this->storeManager->getStore()->getStoreId();
-        $quote = $this->createCustomerCart($customerId, $storeId);
+        $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);
 
-        try {
-            $this->quoteRepository->save($quote);
-        } catch (Exception $e) {
-            throw new CouldNotSaveException(__("The quote can't be created."));
+            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);
         }
-        return (int)$quote->getId();
     }
 
     /**

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

@@ -19,6 +19,7 @@
 use Magento\QuoteGraphQl\Plugin\Model\CreateEmptyCartWithoutCountryValidation;
 use Magento\Store\Model\Store;
 use Magento\Customer\Api\Data\CustomerInterface as Customer;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -68,6 +69,11 @@ class CreateEmptyCartWithoutCountryValidationTest extends TestCase
      */
     private MockObject|Quote $quote;
 
+    /**
+     * @var MockObject|ScopeConfigInterface
+     */
+    private MockObject|ScopeConfigInterface $scopeConfig;
+
     /**
      * @throws Exception
      */
@@ -83,12 +89,14 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->quote = $this->createMock(Quote::class);
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
 
         $this->model = new CreateEmptyCartWithoutCountryValidation(
             $this->storeManager,
             $this->quoteRepository,
             $this->customerRepository,
-            $this->quoteFactory
+            $this->quoteFactory,
+            $this->scopeConfig
         );
     }