DEVX-813: refactoring

Author: ShipilA

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

@@ -34,9 +34,9 @@ public CategoryImport toCategoryImport(Category category) {
                         .map(CommonImportUtil::getLocalizedStringBuilder)
                         .map(LocalizedStringBuilder::build)
                         .orElse(null))
-                .parent(CategoryKeyReference(category.getParent()))
+                .parent(categoryKeyReference(category.getParent()))
                 .orderHint(category.getOrderHint())
-                .externalId(category.getId())
+                .externalId(category.getExternalId())
                 .metaTitle(Optional.ofNullable(category.getMetaTitle())
                         .map(CommonImportUtil::getLocalizedStringBuilder)
                         .map(LocalizedStringBuilder::build)
@@ -54,7 +54,7 @@ public CategoryImport toCategoryImport(Category category) {
                 .build();
     }
 
-    private CategoryKeyReference CategoryKeyReference(CategoryReference categoryReference) {
+    private CategoryKeyReference categoryKeyReference(CategoryReference categoryReference) {
         if (categoryReference == null) {
             return null;
         }

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

@@ -4,17 +4,21 @@
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.commercetools.api.models.common.LocalizedString;
+import com.commercetools.api.models.product_type.AttributeLocalizedEnumValue;
+import com.commercetools.api.models.product_type.AttributePlainEnumValue;
 import com.commercetools.api.models.type.CustomFields;
 import com.commercetools.api.models.type.FieldContainer;
 import com.commercetools.api.models.type.TypeReference;
 import com.commercetools.importapi.models.common.*;
 import com.commercetools.importapi.models.customfields.CustomField;
 
+import com.commercetools.importapi.models.productvariants.Attribute;
 import io.vrap.rmf.base.client.Builder;
 
 public class CommonImportUtil {
@@ -58,6 +62,9 @@ public static Builder<? extends TypedMoney> importApiTypedMoney(com.commercetool
     }
 
     public com.commercetools.importapi.models.customfields.Custom getImportApiCustom(CustomFields customFields) {
+        if (customFields == null) {
+            return null;
+        }
         return com.commercetools.importapi.models.customfields.Custom.builder()
                 .type(getTypeReference(customFields.getType()))
                 .fields(getImportApiFields(customFields.getFields()))
@@ -114,6 +121,67 @@ static CustomField mapCustomField(Object value) {
                     .value(v -> importApiTypedMoney((com.commercetools.api.models.common.TypedMoney) value, v))
                     .build();
         }
+        if (value instanceof ArrayList) {
+            var list = (ArrayList<?>) value;
+            if (list.isEmpty()) {
+                return CustomField.localizedStringSetBuilder().value().build();
+            }
+            if (list.get(0) instanceof LocalDate) {
+                return CustomField.dateSetBuilder().value((ArrayList<LocalDate>) list).build();
+            }
+            if (list.get(0) instanceof ZonedDateTime) {
+                return CustomField.dateTimeSetBuilder()
+                        .value((ArrayList<ZonedDateTime>) list)
+                        .build();
+            }
+            if (list.get(0) instanceof LocalTime) {
+                return CustomField.timeSetBuilder().value((ArrayList<LocalTime>) list).build();
+            }
+            if (list.get(0) instanceof String) {
+                return CustomField.stringSetBuilder().value((ArrayList<String>) list).build();
+            }
+            if (list.get(0) instanceof Integer) {
+                return CustomField.numberSetBuilder().value((ArrayList<Double>) list).build();
+            }
+            if (list.get(0) instanceof Long) {
+                return CustomField.numberSetBuilder().value((ArrayList<Double>) list).build();
+            }
+            if (list.get(0) instanceof Boolean) {
+                return CustomField.booleanSetBuilder().value((ArrayList<Boolean>) list).build();
+            }
+            if (list.get(0) instanceof Double) {
+                return CustomField.numberSetBuilder().value((ArrayList<Double>) list).build();
+            }
+            if (list.get(0) instanceof LocalizedString) {
+                return CustomField.localizedStringSetBuilder()
+                        .value(list.stream()
+                                .map(v -> getLocalizedStringBuilder(((LocalizedString) v)).build())
+                                .collect(Collectors.toList()))
+                        .build();
+            }
+            if (list.get(0) instanceof AttributePlainEnumValue) {
+                return CustomField.enumSetBuilder()
+                        .value(((ArrayList<AttributePlainEnumValue>) list).stream()
+                                .map(AttributePlainEnumValue::getKey)
+                                .collect(Collectors.toList()))
+                        .build();
+            }
+            if (list.get(0) instanceof AttributeLocalizedEnumValue) {
+                return CustomField.enumSetBuilder()
+                        .value(((ArrayList<AttributeLocalizedEnumValue>) list).stream()
+                                .map(AttributeLocalizedEnumValue::getKey)
+                                .collect(Collectors.toList()))
+                        .build();
+            }
+            if (list.get(0) instanceof com.commercetools.api.models.common.Money) {
+                return CustomField.moneySetBuilder()
+                        .value(list.stream()
+                                .map(v -> importApiTypedMoney((com.commercetools.api.models.common.TypedMoney) v,
+                                        new TypedMoneyBuilder()).build())
+                                .collect(Collectors.toList()))
+                        .build();
+            }
+        }
         throw new IllegalArgumentException("Unsupported custom field type: " + value.getClass());
     }
 

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

@@ -36,7 +36,7 @@ public CustomerImport toCustomerImport(Customer customer) {
                 .customerNumber(customer.getCustomerNumber())
                 .email(customer.getEmail()) // required field
                 .password(customer.getPassword())
-                .stores(toImportApiStoreKeyReferences(customer.getStores())) // required field
+                .stores(toImportApiStoreKeyReferences(customer.getStores()))
                 .firstName(customer.getFirstName())
                 .lastName(customer.getLastName())
                 .middleName(customer.getMiddleName())
@@ -47,14 +47,14 @@ public CustomerImport toCustomerImport(Customer customer) {
                 .companyName(customer.getCompanyName())
                 .vatId(customer.getVatId())
                 .isEmailVerified(customer.getIsEmailVerified())
-                .customerGroup(toCustomerGroupKeyReference(customer.getCustomerGroup())) // required field
-                .addresses(mapToCustomerAddresses(customer.getAddresses())) // required field
-                .defaultBillingAddress(getAddressesId(customer.getDefaultBillingAddress()))
+                .customerGroup(toCustomerGroupKeyReference(customer.getCustomerGroup()))
+                .addresses(mapToCustomerAddresses(customer.getAddresses()))
+                .defaultBillingAddress(getAddressesId(customer.getAddresses(), customer.getDefaultBillingAddressId()))
                 .billingAddresses(getAddressesIds(customer.getBillingAddresses()))
                 .shippingAddresses(getAddressesIds(customer.getShippingAddresses()))
-                .defaultShippingAddress(getAddressesId(customer.findDefaultShippingAddress().orElse(null)))
+                .defaultShippingAddress(getAddressesId(customer.getAddresses(), customer.getDefaultShippingAddressId()))
                 .locale(customer.getLocale())
-                .custom(util.getImportApiCustom(customer.getCustom())) // required field
+                .custom(util.getImportApiCustom(customer.getCustom()))
                 .authenticationMode(toImportApiAuthenticationMode(customer.getAuthenticationMode()))
                 .build();
     }
@@ -68,7 +68,8 @@ private AuthenticationMode toImportApiAuthenticationMode(
             return null;
     }
 
-    public CustomerGroupKeyReference toCustomerGroupKeyReference(@NotNull CustomerGroupReference customerGroup) {
+    public CustomerGroupKeyReference toCustomerGroupKeyReference(CustomerGroupReference customerGroup) {
+        if (customerGroup == null) return null;
         return CustomerGroupKeyReference.builder().key(keyResolverService.resolveKey(customerGroup)).build();
     }
 
@@ -78,14 +79,15 @@ private List<StoreKeyReference> toImportApiStoreKeyReferences(
     }
 
     private List<Integer> getAddressesIds(List<Address> shippingAddresses) {
-        return shippingAddresses.stream().map(CustomerUtil::getAddressesId).toList();
+        return shippingAddresses.stream().map(a -> getAddressesId(shippingAddresses, a.getId())).toList();
     }
 
-    private static Integer getAddressesId(Address shippingAddress) {
-        if (shippingAddress == null) {
-            return null;
+    private Integer getAddressesId(List<Address> addresses, String addressId) {
+        if (addressId == null) return null;
+        for (int i = 0; i < addresses.size(); i++) {
+            if (addressId.equals(addresses.get(i).getId())) return i;
         }
-        return parseInt(shippingAddress.getId());
+        return null;
     }
 
     private List<CustomerAddress> mapToCustomerAddresses(List<Address> shippingAddresses) {

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

@@ -11,8 +11,7 @@
 import com.commercetools.importapi.models.productvariants.ProductVariantImport;
 
 public class ProductVariantUtil {
-    public ProductVariantImport toProductVariantImport(ProductProjection product, ProductVariant variant,
-            String productKey) {
+    public ProductVariantImport toProductVariantImport(ProductProjection product, ProductVariant variant) {
         return ProductVariantImport.builder()
                 .key(variant.getKey()) // required field
                 .sku(variant.getSku())
@@ -21,7 +20,7 @@ public ProductVariantImport toProductVariantImport(ProductProjection product, Pr
                     variant.getAttributes().stream().map(ProductUtil::mapAttribute).collect(Collectors.toList()))
                 .images(toImportImages(variant.getImages()))
                 .assets(importAssets(variant.getAssets()))
-                .product(p -> p.key(productKey)) // required field
+                .product(p -> p.key(product.getKey())) // required field
                 .build();
     }
 }

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

@@ -46,6 +46,9 @@ public StandalonePriceImport toStandalonePriceImport(StandalonePrice price) {
 
     private static DiscountedPrice toImportApiDiscountedPrice(
             com.commercetools.api.models.common.DiscountedPrice discounted) {
+        if (discounted == null) {
+            return null;
+        }
         return DiscountedPrice.builder()
                 .value(v -> importApiTypedMoney(discounted.getValue(), v))
                 .discount(toProductDiscountKeyReference(discounted.getDiscount()))