SUPPORT-36587: support custom type resolution in customer's address

Author: kafis

src/integration-test/resources/logback.xml

@@ -0,0 +1,43 @@
+<configuration>
+    <appender name="JSON-STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.out</target>
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <!-- Some fields are mapped to camel-case for consistency -->
+                <timestamp>
+                    <!-- Map default "@timestamp" to "timestamp" -->
+                    <fieldName>timestamp</fieldName>
+                </timestamp>
+                <logLevel>
+                    <!-- Map default "logLevel" to "severity" for cloud platforms such as GCP Stackdriver -->
+                    <fieldName>severity</fieldName>
+                </logLevel>
+                <loggerName>
+                    <!-- Map default "logger_name" to "loggerName" -->
+                    <fieldName>loggerName</fieldName>
+                </loggerName>
+                <message/>
+                <stackHash>
+                    <!-- Map default "stack_hash" to "stackHash" -->
+                    <fieldName>stackHash</fieldName>
+                </stackHash>
+                <stackTrace>
+                    <!-- Map default "stack_trace" to "stackTrace" -->
+                    <fieldName>stackTrace</fieldName>
+                    <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+                        <maxDepthPerThrowable>30</maxDepthPerThrowable>
+                        <maxLength>2048</maxLength>
+                        <shortenedClassNameLength>20</shortenedClassNameLength>
+                        <rootCauseFirst>true</rootCauseFirst>
+                    </throwableConverter>
+                </stackTrace>
+                <arguments/>
+                <logstashMarkers/>
+            </providers>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="JSON-STDOUT"/>
+    </root>
+</configuration>

src/main/java/com/commercetools/sync/customers/utils/CustomerReferenceResolutionUtils.java

@@ -111,7 +111,7 @@ private static CustomerDraft mapToCustomerDraft(
         .dateOfBirth(customer.getDateOfBirth())
         .isEmailVerified(customer.getIsEmailVerified())
         .vatId(customer.getVatId())
-        .addresses(mapToAddressesDraft(customer.getAddresses()))
+        .addresses(mapToAddressesDraft(customer.getAddresses(), referenceIdToKeyCache))
         .defaultBillingAddress(
             getAddressIndex(customer.getAddresses(), customer.getDefaultBillingAddressId()))
         .billingAddresses(
@@ -143,7 +143,9 @@ private static CustomerGroupResourceIdentifier mapToCustomerGroupResourceIdentif
     return null;
   }
 
-  private static List<BaseAddress> mapToAddressesDraft(@Nonnull List<Address> addresses) {
+  private static List<BaseAddress> mapToAddressesDraft(
+      @Nonnull List<Address> addresses,
+      @Nonnull final ReferenceIdToKeyCache referenceIdToKeyCache) {
     if (addresses.isEmpty()) {
       return emptyList();
     }
@@ -178,8 +180,9 @@ private static List<BaseAddress> mapToAddressesDraft(@Nonnull List<Address> addr
                       .externalId(address.getExternalId());
 
               if (address.getCustom() != null) {
-                builder.custom(
-                    CustomFieldsDraftBuilder.of().fields(address.getCustom().getFields()).build());
+                CustomFieldsDraft draft =
+                    mapToCustomFieldsDraft(address.getCustom(), referenceIdToKeyCache);
+                builder.custom(draft);
               }
               return builder.build();
             })

src/main/java/com/commercetools/sync/customers/utils/CustomerTransformUtils.java

@@ -3,6 +3,7 @@
 import static java.util.stream.Collectors.toSet;
 
 import com.commercetools.api.client.ProjectApiRoot;
+import com.commercetools.api.models.common.Address;
 import com.commercetools.api.models.common.Reference;
 import com.commercetools.api.models.customer.Customer;
 import com.commercetools.api.models.customer.CustomerDraft;
@@ -84,6 +85,17 @@ private CompletableFuture<Void> transformCustomTypeReference(
               .map(Reference::getId)
               .collect(toSet());
 
+      final Set<String> setOfAddressCustomTypeIds =
+              customers.stream()
+                      .flatMap(c -> c.getAddresses().stream())
+                      .map(Address::getCustom)
+                      .filter(Objects::nonNull)
+                      .map(CustomFields::getType)
+                      .map(Reference::getId)
+                      .collect(toSet());
+
+      setOfTypeIds.addAll(setOfAddressCustomTypeIds);
+
       return fetchAndFillReferenceIdToKeyCache(setOfTypeIds, GraphQlQueryResource.TYPES);
     }