improve fix

Author: engcom-Charlie

app/code/Magento/Customer/Model/Plugin/UpdateCustomer.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Plugin;
+
+use Magento\Framework\Webapi\Rest\Request as RestRequest;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+
+/**
+ * Update customer by id from request param
+ */
+class UpdateCustomer
+{
+    /**
+     * @var RestRequest
+     */
+    private $request;
+
+    /**
+     * @param RestRequest $request
+     */
+    public function __construct(RestRequest $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Update customer by id from request if exist
+     *
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param CustomerInterface $customer
+     * @param string|null $passwordHash
+     * @return array
+     */
+    public function beforeSave(
+        CustomerRepositoryInterface $customerRepository,
+        CustomerInterface $customer,
+        ?string $passwordHash = null
+    ): array {
+        $customerId = $this->request->getParam('customerId');
+
+        if ($customerId) {
+            $customer = $this->getUpdatedCustomer($customerRepository->getById($customerId), $customer);
+        }
+
+        return [$customer, $passwordHash];
+    }
+
+    /**
+     * Return updated customer
+     *
+     * @param CustomerInterface $originCustomer
+     * @param CustomerInterface $customer
+     * @return CustomerInterface
+     */
+    private function getUpdatedCustomer(
+        CustomerInterface $originCustomer,
+        CustomerInterface $customer
+    ): CustomerInterface {
+        $newCustomer = clone $originCustomer;
+        foreach ($customer->__toArray() as $name => $value) {
+            if ($name === CustomerInterface::CUSTOM_ATTRIBUTES) {
+                $value = $customer->getCustomAttributes();
+            } elseif ($name === CustomerInterface::EXTENSION_ATTRIBUTES_KEY) {
+                $value = $customer->getExtensionAttributes();
+            } elseif ($name === CustomerInterface::KEY_ADDRESSES) {
+                $value = $customer->getAddresses();
+            }
+
+            $newCustomer->setData($name, $value);
+        }
+
+        return $newCustomer;
+    }
+}

app/code/Magento/Customer/Model/Plugin/UpdateCustomerId.php

@@ -26,7 +26,6 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -120,11 +119,6 @@ class CustomerRepository implements CustomerRepositoryInterface
      */
     private $delegatedStorage;
 
-    /**
-     * @var HydratorInterface
-     */
-    private $hydrator;
-
     /**
      * @param CustomerFactory $customerFactory
      * @param CustomerSecureFactory $customerSecureFactory
@@ -142,7 +136,6 @@ class CustomerRepository implements CustomerRepositoryInterface
      * @param CollectionProcessorInterface $collectionProcessor
      * @param NotificationStorage $notificationStorage
      * @param DelegatedStorage|null $delegatedStorage
-     * @param HydratorInterface|null $hydrator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -161,8 +154,7 @@ public function __construct(
         JoinProcessorInterface $extensionAttributesJoinProcessor,
         CollectionProcessorInterface $collectionProcessor,
         NotificationStorage $notificationStorage,
-        DelegatedStorage $delegatedStorage = null,
-        ?HydratorInterface $hydrator = null
+        DelegatedStorage $delegatedStorage = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->customerSecureFactory = $customerSecureFactory;
@@ -180,7 +172,6 @@ public function __construct(
         $this->collectionProcessor = $collectionProcessor;
         $this->notificationStorage = $notificationStorage;
         $this->delegatedStorage = $delegatedStorage ?? ObjectManager::getInstance()->get(DelegatedStorage::class);
-        $this->hydrator = $hydrator ?: ObjectManager::getInstance()->get(HydratorInterface::class);
     }
 
     /**
@@ -194,7 +185,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function save(CustomerInterface $customer, $passwordHash = null)
     {
@@ -203,11 +193,10 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         $prevCustomerData = $prevCustomerDataArr = null;
         if ($customer->getId()) {
             $prevCustomerData = $this->getById($customer->getId());
-            $prevCustomerDataArr = $this->hydrator->extract($prevCustomerData);
-            $customer = $this->hydrator->hydrate($prevCustomerData, $customer->__toArray());
+            $prevCustomerDataArr = $prevCustomerData->__toArray();
         }
         /** @var $customer \Magento\Customer\Model\Data\Customer */
-        $customerArr = $this->hydrator->extract($customer);
+        $customerArr = $customer->__toArray();
         $customer = $this->imageProcessor->save(
             $customer,
             CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,