DEVX-813: adding tests for CustomerUtil and fixing a bug with addresses

Author: ShipilA

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/CustomerUtil.java

@@ -2,6 +2,7 @@
 package com.commercetools.sdk;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.commercetools.api.models.common.Address;
 import com.commercetools.api.models.customer.Customer;
@@ -47,8 +48,8 @@ public CustomerImport toCustomerImport(Customer customer) {
                 .customerGroup(toCustomerGroupKeyReference(customer.getCustomerGroup()))
                 .addresses(mapToCustomerAddresses(customer.getAddresses()))
                 .defaultBillingAddress(getAddressesId(customer.getAddresses(), customer.getDefaultBillingAddressId()))
-                .billingAddresses(getAddressesIds(customer.getBillingAddresses()))
-                .shippingAddresses(getAddressesIds(customer.getShippingAddresses()))
+                .billingAddresses(getAddressesIds(customer.getAddresses(), customer.getBillingAddresses()))
+                .shippingAddresses(getAddressesIds(customer.getAddresses(), customer.getShippingAddresses()))
                 .defaultShippingAddress(getAddressesId(customer.getAddresses(), customer.getDefaultShippingAddressId()))
                 .locale(customer.getLocale())
                 .custom(util.getImportApiCustom(customer.getCustom()))
@@ -76,8 +77,8 @@ private List<StoreKeyReference> toImportApiStoreKeyReferences(
         return stores.stream().map(x -> StoreKeyReference.builder().key(x.getKey()).build()).toList();
     }
 
-    private List<Integer> getAddressesIds(List<Address> shippingAddresses) {
-        return shippingAddresses.stream().map(a -> getAddressesId(shippingAddresses, a.getId())).toList();
+    private List<Integer> getAddressesIds(List<Address> addresses, List<Address> shippingAddresses) {
+        return shippingAddresses.stream().map(a -> getAddressesId(addresses, a.getId())).filter(Objects::nonNull).toList();
     }
 
     private Integer getAddressesId(List<Address> addresses, String addressId) {

commercetools/commercetools-importapi-utils/src/test/java/com/commercetools/sdk/CustomerUtilTest.java

@@ -0,0 +1,60 @@
+package com.commercetools.sdk;
+
+import com.commercetools.api.models.customer.Customer;
+import io.vrap.rmf.base.client.utils.json.JsonUtils;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.commercetools.sdk.TestUtils.stringFromResource;
+import static org.junit.jupiter.api.Assertions.*;
+
+class CustomerUtilTest {
+    private final CustomerUtil util = new CustomerUtil();
+
+    @Test
+    void shouldMapRequiredFields() {
+        var customer = JsonUtils.fromJsonString(stringFromResource("src/test/resources/customer.example.json"), Customer.class);
+        var result = util.toCustomerImport(customer);
+
+        assertEquals("customer-key", result.getKey());
+        assertEquals("test@example.com", result.getEmail());
+    }
+
+    @Test
+    void shouldMapCustomerGroupKeyFromExpandedObj() {
+        var customer = JsonUtils.fromJsonString(stringFromResource("src/test/resources/customer.example.json"), Customer.class);
+        var result = util.toCustomerImport(customer);
+
+        assertNotNull(result.getCustomerGroup());
+        assertEquals("vip-group", result.getCustomerGroup().getKey());  // catches getId() bug
+    }
+
+    @Test
+    void shouldMapAddressIndices() {
+        var customer = JsonUtils.fromJsonString(stringFromResource("src/test/resources/customer.example.json"), Customer.class);
+        var result = util.toCustomerImport(customer);
+
+        // addr-0 is index 0, addr-1 is index 1
+        assertEquals(0, result.getDefaultBillingAddress());
+        assertEquals(1, result.getDefaultShippingAddress());
+        assertEquals(List.of(0), result.getBillingAddresses());
+        assertEquals(List.of(1), result.getShippingAddresses());
+    }
+
+    @Test
+    void shouldMapAddresses() {
+        var customer = JsonUtils.fromJsonString(stringFromResource("src/test/resources/customer.example.json"), Customer.class);
+        var result = util.toCustomerImport(customer);
+
+        assertEquals(2, result.getAddresses().size());
+        assertEquals("DE", result.getAddresses().get(0).getCountry());
+    }
+
+    @Test
+    void shouldHandleNullCustomerGroup() {
+        var customer = JsonUtils.fromJsonString(stringFromResource("src/test/resources/customer.no-group.json"), Customer.class);
+        var result = util.toCustomerImport(customer);
+        assertNull(result.getCustomerGroup());
+    }
+}

commercetools/commercetools-importapi-utils/src/test/resources/customer.example.json

@@ -0,0 +1,19 @@
+{
+    "id": "cust-id-001", "version": 1, "key": "customer-key",
+    "email": "test@example.com", "password": "hashed",
+    "addresses": [
+        { "id": "addr-0", "key": "home", "country": "DE" },
+        { "id": "addr-1", "key": "work", "country": "US" }
+    ],
+    "defaultBillingAddressId": "addr-0",
+    "defaultShippingAddressId": "addr-1",
+    "billingAddressIds": ["addr-0"],
+    "shippingAddressIds": ["addr-1"],
+    "customerGroup": {
+        "typeId": "customer-group", "id": "cg-id-001",
+        "obj": { "id": "cg-id-001", "version": 1, "key": "vip-group",
+            "name": "VIP", "createdAt": "1970-01-01T00:00:00.001Z", "lastModifiedAt": "1970-01-01T00:00:00.001Z" }
+    },
+    "isEmailVerified": true, "stores": [], "authenticationMode": "Password",
+    "createdAt": "1970-01-01T00:00:00.001Z", "lastModifiedAt": "1970-01-01T00:00:00.001Z"
+}

commercetools/commercetools-importapi-utils/src/test/resources/customer.no-group.json

@@ -0,0 +1,14 @@
+{
+    "id": "cust-id-001", "version": 1, "key": "customer-key",
+    "email": "test@example.com", "password": "hashed",
+    "addresses": [
+        { "id": "addr-0", "key": "home", "country": "DE" },
+        { "id": "addr-1", "key": "work", "country": "US" }
+    ],
+    "defaultBillingAddressId": "addr-0",
+    "defaultShippingAddressId": "addr-1",
+    "billingAddressIds": ["addr-0"],
+    "shippingAddressIds": ["addr-1"],
+    "isEmailVerified": true, "stores": [], "authenticationMode": "Password",
+    "createdAt": "1970-01-01T00:00:00.001Z", "lastModifiedAt": "1970-01-01T00:00:00.001Z"
+}