GraphQL-458: CustomerGraphQl module refactoring

Author: naydav

app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php

@@ -88,6 +88,8 @@ public function execute(array $data): CustomerInterface
     }
 
     /**
+     * Create account
+     *
      * @param array $data
      * @return CustomerInterface
      * @throws LocalizedException

app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Customer\Api\Data\CustomerInterface;
+
+/**
+ * Save customer
+ */
+class SaveCustomer
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Save customer
+     *
+     * @param CustomerInterface $customer
+     * @param array $data
+     * @throws GraphQlAlreadyExistsException
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlInputException
+     */
+    public function execute(CustomerInterface $customer): void
+    {
+        try {
+            $this->customerRepository->save($customer);
+        } catch (AlreadyExistsException $e) {
+            throw new GraphQlAlreadyExistsException(
+                __('A customer with the same email address already exists in an associated website.'),
+                $e
+            );
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+}

app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php

@@ -7,9 +7,6 @@
 
 namespace Magento\CustomerGraphQl\Model\Customer;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -23,9 +20,9 @@
 class UpdateCustomerAccount
 {
     /**
-     * @var CustomerRepositoryInterface
+     * @var SaveCustomer
      */
-    private $customerRepository;
+    private $saveCustomer;
 
     /**
      * @var StoreManagerInterface
@@ -53,22 +50,22 @@ class UpdateCustomerAccount
     private $restrictedKeys;
 
     /**
-     * @param CustomerRepositoryInterface $customerRepository
+     * @param SaveCustomer $saveCustomer
      * @param StoreManagerInterface $storeManager
      * @param CheckCustomerPassword $checkCustomerPassword
      * @param DataObjectHelper $dataObjectHelper
      * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      * @param array $restrictedKeys
      */
     public function __construct(
-        CustomerRepositoryInterface $customerRepository,
+        SaveCustomer $saveCustomer,
         StoreManagerInterface $storeManager,
         CheckCustomerPassword $checkCustomerPassword,
         DataObjectHelper $dataObjectHelper,
         ChangeSubscriptionStatus $changeSubscriptionStatus,
         array $restrictedKeys = []
     ) {
-        $this->customerRepository = $customerRepository;
+        $this->saveCustomer = $saveCustomer;
         $this->storeManager = $storeManager;
         $this->checkCustomerPassword = $checkCustomerPassword;
         $this->dataObjectHelper = $dataObjectHelper;
@@ -87,26 +84,6 @@ public function __construct(
      * @throws GraphQlInputException
      */
     public function execute(CustomerInterface $customer, array $data): void
-    {
-        try {
-            $this->updateCustomer($customer, $data);
-        } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-        }
-
-        if (isset($data['is_subscribed'])) {
-            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
-        }
-    }
-
-    /**
-     * @param CustomerInterface $customer
-     * @param array $data
-     * @throws GraphQlAlreadyExistsException
-     * @throws GraphQlAuthenticationException
-     * @throws GraphQlInputException
-     */
-    private function updateCustomer(CustomerInterface $customer, array $data): void
     {
         if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
             if (!isset($data['password']) || empty($data['password'])) {
@@ -122,15 +99,10 @@ private function updateCustomer(CustomerInterface $customer, array $data): void
 
         $customer->setStoreId($this->storeManager->getStore()->getId());
 
-        try {
-            $this->customerRepository->save($customer);
-        } catch (AlreadyExistsException $e) {
-            throw new GraphQlAlreadyExistsException(
-                __('A customer with the same email address already exists in an associated website.'),
-                $e
-            );
-        } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()), $e);
+        $this->saveCustomer->execute($customer);
+
+        if (isset($data['is_subscribed'])) {
+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
         }
     }
 }

app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php

@@ -9,8 +9,6 @@
 
 use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -67,8 +65,6 @@ public function __construct(
      * @param array $billingAddressInput
      * @return void
      * @throws GraphQlInputException
-     * @throws GraphQlAuthenticationException
-     * @throws GraphQlAuthorizationException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void