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

@@ -15,7 +15,6 @@
 /**
  * Customer repository.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
  */
 class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInterface
 {
@@ -132,8 +131,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null)
     {
@@ -218,32 +215,7 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
         $this->customerRegistry->push($customerModel);
         $customerId = $customerModel->getId();
 
-        if ($customer->getAddresses() !== null) {
-            if ($customer->getId()) {
-                $existingAddresses = $this->getById($customer->getId())->getAddresses();
-                $getIdFunc = function ($address) {
-                    return $address->getId();
-                };
-                $existingAddressIds = array_map($getIdFunc, $existingAddresses);
-            } else {
-                $existingAddressIds = [];
-            }
-
-            $savedAddressIds = [];
-            foreach ($customer->getAddresses() as $address) {
-                $address->setCustomerId($customerId)
-                    ->setRegion($address->getRegion());
-                $this->addressRepository->save($address);
-                if ($address->getId()) {
-                    $savedAddressIds[] = $address->getId();
-                }
-            }
-
-            $addressIdsToDelete = array_diff($existingAddressIds, $savedAddressIds);
-            foreach ($addressIdsToDelete as $addressId) {
-                $this->addressRepository->deleteById($addressId);
-            }
-        }
+        $this->updateAddresses($customer, $customerId);
 
         $savedCustomer = $this->get($customer->getEmail(), $customer->getWebsiteId());
         $this->eventManager->dispatch(
@@ -363,4 +335,42 @@ protected function addFilterGroupToCollection(
             $collection->addFieldToFilter($fields);
         }
     }
+
+    /**
+     * Update customer addresses.
+     *
+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param $customerId
+     * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     */
+    private function updateAddresses(\Magento\Customer\Api\Data\CustomerInterface $customer, $customerId)
+    {
+        if ($customer->getAddresses() !== null) {
+            if ($customer->getId()) {
+                $existingAddresses = $this->getById($customer->getId())->getAddresses();
+                $getIdFunc = function ($address) {
+                    return $address->getId();
+                };
+                $existingAddressIds = array_map($getIdFunc, $existingAddresses);
+            } else {
+                $existingAddressIds = [];
+            }
+
+            $savedAddressIds = [];
+            foreach ($customer->getAddresses() as $address) {
+                $address->setCustomerId($customerId)
+                    ->setRegion($address->getRegion());
+                $this->addressRepository->save($address);
+                if ($address->getId()) {
+                    $savedAddressIds[] = $address->getId();
+                }
+            }
+
+            $addressIdsToDelete = array_diff($existingAddressIds, $savedAddressIds);
+            foreach ($addressIdsToDelete as $addressId) {
+                $this->addressRepository->deleteById($addressId);
+            }
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php

@@ -76,6 +76,8 @@ protected function tearDown()
     }
 
     /**
+     * Test create new customer new then update first name.
+     *
      * @magentoDbIsolation enabled
      */
     public function testCreateCustomerNewThenUpdateFirstName()
@@ -110,6 +112,8 @@ public function testCreateCustomerNewThenUpdateFirstName()
     }
 
     /**
+     * Test create new customer.
+     *
      * @magentoDbIsolation enabled
      */
     public function testCreateNewCustomer()
@@ -137,6 +141,8 @@ public function testCreateNewCustomer()
     }
 
     /**
+     * Test update customer.
+     *
      * @dataProvider updateCustomerDataProvider
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
@@ -212,6 +218,8 @@ public function testUpdateCustomer($defaultBilling, $defaultShipping)
     }
 
     /**
+     * Test update customer address.
+     *
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -253,6 +261,8 @@ public function testUpdateCustomerAddress()
     }
 
     /**
+     * Test update customer preserve all addresses.
+     *
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -278,6 +288,8 @@ public function testUpdateCustomerPreserveAllAddresses()
     }
 
     /**
+     * Test update customer delete all addresses with empty array.
+     *
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -303,6 +315,8 @@ public function testUpdateCustomerDeleteAllAddressesWithEmptyArray()
     }
 
     /**
+     * Test search customers.
+     *
      * @param \Magento\Framework\Api\Filter[] $filters
      * @param \Magento\Framework\Api\Filter[] $filterGroup
      * @param array $expectedResult array of expected results indexed by ID
@@ -336,7 +350,7 @@ public function testSearchCustomers($filters, $filterGroup, $expectedResult)
     }
 
     /**
-     * Test ordering
+     * Test search customers order.
      *
      * @magentoDataFixture Magento/Customer/_files/three_customers.php
      * @magentoDbIsolation enabled
@@ -380,6 +394,8 @@ public function testSearchCustomersOrder()
     }
 
     /**
+     * Test delete.
+     *
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoAppIsolation enabled
@@ -398,6 +414,8 @@ public function testDelete()
     }
 
     /**
+     * Test delete by id.
+     *
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoAppIsolation enabled
@@ -416,7 +434,7 @@ public function testDeleteById()
     }
 
     /**
-     * DataProvider update customer
+     * DataProvider update customer.
      *
      * @return array
      */
@@ -434,6 +452,11 @@ public function updateCustomerDataProvider()
         ];
     }
 
+    /**
+     * DataProvider search customers.
+     *
+     * @return array
+     */
     public function searchCustomersDataProvider()
     {
         $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
@@ -474,7 +497,7 @@ public function searchCustomersDataProvider()
     }
 
     /**
-     * Check defaults billing and shipping in customer model
+     * Check default shippings in customer model.
      *
      * @param $customerId
      * @param $defaultBilling
@@ -504,6 +527,8 @@ protected function expectedDefaultShippingsInCustomerModelAttributes(
     }
 
     /**
+     * Test update default shipping and default billing address.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDbIsolation enabled
      */
@@ -531,13 +556,13 @@ public function testUpdateDefaultShippingAndDefaultBillingTest()
         $this->assertEquals(
             $savedCustomer->getDefaultBilling(),
             $oldDefaultBilling,
-            'Default billing shoud not be overridden'
+            'Default billing should not be overridden'
         );
 
         $this->assertEquals(
             $savedCustomer->getDefaultShipping(),
             $oldDefaultShipping,
-            'Default shipping shoud not be overridden'
+            'Default shipping should not be overridden'
         );
     }
 }