Refactor data setting and restriction di

* update how customer object is updated
* add di to restrict updating defined properties

Author: pmclain

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

@@ -13,14 +13,16 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
  * Update customer data
  */
 class UpdateCustomerData
 {
-    private const RESTRICTED_DATA_KEYS = ['email', 'password'];
-
     /**
      * @var CustomerRepositoryInterface
      */
@@ -36,19 +38,51 @@ class UpdateCustomerData
      */
     private $checkCustomerPassword;
 
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var DataObjectProcessor
+     */
+    private $dataObjectProcessor;
+
+    /**
+     * @var array
+     */
+    private $restrictedKeys;
+
     /**
      * @param CustomerRepositoryInterface $customerRepository
      * @param StoreManagerInterface $storeManager
      * @param CheckCustomerPassword $checkCustomerPassword
+     * @param CustomerInterfaceFactory $customerFactory
+     * @param DataObjectHelper $dataObjectHelper
+     * @param DataObjectProcessor $dataObjectProcessor
+     * @param array $restrictedKeys
      */
     public function __construct(
         CustomerRepositoryInterface $customerRepository,
         StoreManagerInterface $storeManager,
-        CheckCustomerPassword $checkCustomerPassword
+        CheckCustomerPassword $checkCustomerPassword,
+        CustomerInterfaceFactory $customerFactory,
+        DataObjectHelper $dataObjectHelper,
+        DataObjectProcessor $dataObjectProcessor,
+        array $restrictedKeys = []
     ) {
         $this->customerRepository = $customerRepository;
         $this->storeManager = $storeManager;
         $this->checkCustomerPassword = $checkCustomerPassword;
+        $this->customerFactory = $customerFactory;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->dataObjectProcessor = $dataObjectProcessor;
+        $this->restrictedKeys = $restrictedKeys;
     }
 
     /**
@@ -64,15 +98,17 @@ public function __construct(
     public function execute(int $customerId, array $data): void
     {
         $customer = $this->customerRepository->getById($customerId);
-        $newCustomerData = array_diff_key($data, array_flip(static::RESTRICTED_DATA_KEYS));
+        $newData = array_diff_key($data, array_flip($this->restrictedKeys));
 
-        foreach ($newCustomerData as $key => $value) {
-            $setterMethod = 'set' . ucwords($key, '_');
-            if (!method_exists($customer, $setterMethod)) {
-                continue;
-            }
-            $customer->{$setterMethod}($value);
-        }
+        $oldData = $this->dataObjectProcessor->buildOutputDataArray($customer, CustomerInterface::class);
+        $newData = array_merge($oldData, $newData);
+
+        $customer = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $customer,
+            $newData,
+            CustomerInterface::class
+        );
 
         if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
             if (!isset($data['password']) || empty($data['password'])) {

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

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\CustomerGraphQl\Model\Customer\UpdateCustomerData">
+        <arguments>
+            <argument name="restrictedKeys" xsi:type="array">
+                <item name="email" xsi:type="const">Magento\Customer\Api\Data\CustomerInterface::EMAIL</item>
+            </argument>
+        </arguments>
+    </type>
+</config>