Merge branch 'ACP2E-2798' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-03-12-2024-anna

Author: abukatar

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

@@ -342,21 +342,25 @@ public function _construct()
     public function getDataModel()
     {
         $customerData = $this->getData();
-        $addressesData = [];
+        $regularAddresses = $defaultAddresses = [];
         /** @var \Magento\Customer\Model\Address $address */
         foreach ($this->getAddresses() as $address) {
             if (!isset($this->storedAddress[$address->getId()])) {
                 $this->storedAddress[$address->getId()] = $address->getDataModel();
             }
-            $addressesData[] = $this->storedAddress[$address->getId()];
+            if ($this->storedAddress[$address->getId()]->isDefaultShipping()) {
+                $defaultAddresses[] = $this->storedAddress[$address->getId()];
+            } else {
+                $regularAddresses[] = $this->storedAddress[$address->getId()];
+            }
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        $customerDataObject->setAddresses($addressesData)
+        $customerDataObject->setAddresses(array_merge($defaultAddresses, $regularAddresses))
             ->setId($this->getId());
         return $customerDataObject;
     }

app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php

@@ -1,9 +1,18 @@
 <?php declare(strict_types=1);
-/**
- * Unit test for customer service layer \Magento\Customer\Model\Customer
+/************************************************************************
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
  */
 
 /**
@@ -387,6 +396,7 @@ public function testGetDataModel()
         $this->_model->setEntityId($customerId);
         $this->_model->setId($customerId);
         $addressDataModel = $this->getMockForAbstractClass(AddressInterface::class);
+        $addressDataModel->expects($this->exactly(4))->method('isDefaultShipping')->willReturn(true);
         $address = $this->getMockBuilder(AddressModel::class)
             ->disableOriginalConstructor()
             ->setMethods(['setCustomer', 'getDataModel'])