MAGETWO-61907: [Backport] - Updating customer via REST API without address unsets default billing and default shipping address - for 2.1

Author: svitja

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -130,6 +130,8 @@ public function __construct(
     }
 
     /**
+     * Save.
+     *
      * {@inheritdoc}
      */
     public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null)
@@ -175,19 +177,7 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
             );
         }
         // Populate model with secure data
-        if ($customer->getId()) {
-            $customerSecure = $this->customerRegistry->retrieveSecureData($customer->getId());
-            $customerModel->setRpToken($customerSecure->getRpToken());
-            $customerModel->setRpTokenCreatedAt($customerSecure->getRpTokenCreatedAt());
-            $customerModel->setPasswordHash($customerSecure->getPasswordHash());
-            $customerModel->setFailuresNum($customerSecure->getFailuresNum());
-            $customerModel->setFirstFailure($customerSecure->getFirstFailure());
-            $customerModel->setLockExpires($customerSecure->getLockExpires());
-        } else {
-            if ($passwordHash) {
-                $customerModel->setPasswordHash($passwordHash);
-            }
-        }
+        $this->populateCustomerModelWithSecureData($customer, $passwordHash, $customerModel);
 
         // If customer email was changed, reset RpToken info
         if ($prevCustomerData
@@ -197,19 +187,9 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
             $customerModel->setRpTokenCreatedAt(null);
         }
 
-        if (!array_key_exists('default_billing', $customerArr) &&
-            null !== $prevCustomerDataArr &&
-            array_key_exists('default_billing', $prevCustomerDataArr)
-        ) {
-            $customerModel->setDefaultBilling($prevCustomerDataArr['default_billing']);
-        }
+        $this->setDefaultBilling($customerArr, $prevCustomerDataArr, $customerModel);
 
-        if (!array_key_exists('default_shipping', $customerArr) &&
-            null !== $prevCustomerDataArr &&
-            array_key_exists('default_shipping', $prevCustomerDataArr)
-        ) {
-            $customerModel->setDefaultShipping($prevCustomerDataArr['default_shipping']);
-        }
+        $this->setDefaultShipping($customerArr, $prevCustomerDataArr, $customerModel);
 
         $customerModel->save();
         $this->customerRegistry->push($customerModel);
@@ -226,6 +206,8 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
     }
 
     /**
+     * Get.
+     *
      * {@inheritdoc}
      */
     public function get($email, $websiteId = null)
@@ -235,6 +217,8 @@ public function get($email, $websiteId = null)
     }
 
     /**
+     * Get by Id.
+     *
      * {@inheritdoc}
      */
     public function getById($customerId)
@@ -244,6 +228,8 @@ public function getById($customerId)
     }
 
     /**
+     * Get list.
+     *
      * {@inheritdoc}
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
@@ -296,6 +282,8 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     }
 
     /**
+     * Delete.
+     *
      * {@inheritdoc}
      */
     public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer)
@@ -304,6 +292,8 @@ public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer)
     }
 
     /**
+     * Delete by Id.
+     *
      * {@inheritdoc}
      */
     public function deleteById($customerId)
@@ -373,4 +363,65 @@ private function updateAddresses(\Magento\Customer\Api\Data\CustomerInterface $c
             }
         }
     }
+
+    /**
+     * Populate customer model with secure data.
+     *
+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param $passwordHash
+     * @param $customerModel
+     */
+    private function populateCustomerModelWithSecureData(
+        \Magento\Customer\Api\Data\CustomerInterface $customer,
+        $passwordHash,
+        $customerModel
+    ) {
+        if ($customer->getId()) {
+            $customerSecure = $this->customerRegistry->retrieveSecureData($customer->getId());
+            $customerModel->setRpToken($customerSecure->getRpToken());
+            $customerModel->setRpTokenCreatedAt($customerSecure->getRpTokenCreatedAt());
+            $customerModel->setPasswordHash($customerSecure->getPasswordHash());
+            $customerModel->setFailuresNum($customerSecure->getFailuresNum());
+            $customerModel->setFirstFailure($customerSecure->getFirstFailure());
+            $customerModel->setLockExpires($customerSecure->getLockExpires());
+        } else {
+            if ($passwordHash) {
+                $customerModel->setPasswordHash($passwordHash);
+            }
+        }
+    }
+
+    /**
+     * Set default billing.
+     *
+     * @param $customerArr
+     * @param $prevCustomerDataArr
+     * @param $customerModel
+     */
+    private function setDefaultBilling($customerArr, $prevCustomerDataArr, $customerModel)
+    {
+        if (!array_key_exists('default_billing', $customerArr) &&
+            null !== $prevCustomerDataArr &&
+            array_key_exists('default_billing', $prevCustomerDataArr)
+        ) {
+            $customerModel->setDefaultBilling($prevCustomerDataArr['default_billing']);
+        }
+    }
+
+    /**
+     * Set default shipping.
+     *
+     * @param $customerArr
+     * @param $prevCustomerDataArr
+     * @param $customerModel
+     */
+    private function setDefaultShipping($customerArr, $prevCustomerDataArr, $customerModel)
+    {
+        if (!array_key_exists('default_shipping', $customerArr) &&
+            null !== $prevCustomerDataArr &&
+            array_key_exists('default_shipping', $prevCustomerDataArr)
+        ) {
+            $customerModel->setDefaultShipping($prevCustomerDataArr['default_shipping']);
+        }
+    }
 }