Merge pull request #658 from commercetools/release5.9.1

New Release 5.9.1

Author: marcelogpinheiro

README.md

@@ -221,7 +221,7 @@ Example:
 ##### Download
 
 ```bash
-docker pull commercetools/commercetools-project-sync:5.9.0
+docker pull commercetools/commercetools-project-sync:5.9.1
 ```
 ##### Run
 
@@ -233,14 +233,14 @@ docker run \
 -e TARGET_PROJECT_KEY=xxxx \
 -e TARGET_CLIENT_ID=xxxx \
 -e TARGET_CLIENT_SECRET=xxxx \
-commercetools/commercetools-project-sync:5.9.0 -s all
+commercetools/commercetools-project-sync:5.9.1 -s all
 ```
 
 
 ### Examples
  - To run the all sync modules from a source project to a target project
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s all
+   docker run commercetools/commercetools-project-sync:5.9.1 -s all
    ```
    This will run the following sync modules in the given order:
  1. `Type` Sync and `ProductType` Sync and `States` Sync and `TaxCategory` Sync and `CustomObject` Sync in parallel.
@@ -250,70 +250,70 @@ commercetools/commercetools-project-sync:5.9.0 -s all
 
  - To run the type sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s types
+   docker run commercetools/commercetools-project-sync:5.9.1 -s types
    ```
 
  - To run the productType sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s productTypes
+   docker run commercetools/commercetools-project-sync:5.9.1 -s productTypes
    ```
 
 - To run the states sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s states
+   docker run commercetools/commercetools-project-sync:5.9.1 -s states
    ```
 - To run the taxCategory sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s taxCategories
+   docker run commercetools/commercetools-project-sync:5.9.1 -s taxCategories
    ```
 
 - To run the category sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s categories
+   docker run commercetools/commercetools-project-sync:5.9.1 -s categories
    ```
 
 - To run the product sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s products
+   docker run commercetools/commercetools-project-sync:5.9.1 -s products
    ```
 
 - To run the cartDiscount sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s cartDiscounts
+   docker run commercetools/commercetools-project-sync:5.9.1 -s cartDiscounts
    ```
 
 - To run the inventoryEntry sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s inventoryEntries
+   docker run commercetools/commercetools-project-sync:5.9.1 -s inventoryEntries
    ```
 
 - To run the customObject sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s customObjects
+   docker run commercetools/commercetools-project-sync:5.9.1 -s customObjects
    ```
 
 - To run the customer sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s customers
+   docker run commercetools/commercetools-project-sync:5.9.1 -s customers
    ```
 
 - To run the shoppingList sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s shoppingLists
+   docker run commercetools/commercetools-project-sync:5.9.1 -s shoppingLists
    ```
 - To run both products and shoppingList sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s products shoppingLists
+   docker run commercetools/commercetools-project-sync:5.9.1 -s products shoppingLists
    ```
 
 - To run type, productType and shoppingList sync
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s types productTypes shoppingLists
+   docker run commercetools/commercetools-project-sync:5.9.1 -s types productTypes shoppingLists
    ```
 
 - To run all sync modules using a runner name
    ```bash
-   docker run commercetools/commercetools-project-sync:5.9.0 -s all -r myRunnerName
+   docker run commercetools/commercetools-project-sync:5.9.1 -s all -r myRunnerName
    ```
 
 ## Scopes

docs/RELEASE_NOTES.md

@@ -33,6 +33,14 @@ All notable changes to the [commercetools-project-sync project](https://github.c
 
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+### 5.9.1 - Jan 15, 2026
+[Commits](https://github.com/commercetools/commercetools-project-sync/compare/5.9.0...5.9.1)
+
+- 🐞 **Bug Fixes** (1)
+  - update to use the version 10.5.0 from commercetools-java-sync.
+
+---
+
 ### 5.9.0 - Jan 8, 2026
 [Commits](https://github.com/commercetools/commercetools-project-sync/compare/5.8.0...5.9.0)
 

src/test/java/com/commercetools/project/sync/customer/CustomerSyncerTest.java

@@ -142,6 +142,59 @@ void syncWithWarning_ShouldCallWarningCallback() {
             "Customer with key: \"customerKey\" has already a customer number: \"2\", once it's set it cannot be changed. Hereby, the update action is not created.");
   }
 
+  @Test
+  void transform_WithAdditionalAddressInfoAndState_ShouldPreserveAddressFields() {
+    // preparation
+    final ProjectApiRoot sourceClient = mock(ProjectApiRoot.class);
+    final CustomerSyncer customerSyncer =
+        CustomerSyncer.of(sourceClient, mock(ProjectApiRoot.class), mock(Clock.class));
+    final List<Customer> customers =
+        Collections.singletonList(
+            readObjectFromResource("customer-with-state-reference.json", Customer.class));
+
+    // test
+    final CompletionStage<List<CustomerDraft>> draftsFromPageStage =
+        customerSyncer.transform(customers);
+
+    // assertion
+    final List<CustomerDraft> customerDrafts = draftsFromPageStage.toCompletableFuture().join();
+    assertThat(customerDrafts).isNotEmpty();
+    assertThat(customerDrafts.get(0).getAddresses()).isNotEmpty();
+    assertThat(customerDrafts.get(0).getAddresses().get(0).getState()).isEqualTo("New York");
+    assertThat(customerDrafts.get(0).getAddresses().get(0).getAdditionalAddressInfo())
+        .isEqualTo("Building B, Floor 5");
+  }
+
+  @Test
+  void transform_WithMultipleAddressesWithStateAndAdditionalInfo_ShouldPreserveAllAddressFields() {
+    // preparation
+    final ProjectApiRoot sourceClient = mock(ProjectApiRoot.class);
+    final CustomerSyncer customerSyncer =
+        CustomerSyncer.of(sourceClient, mock(ProjectApiRoot.class), mock(Clock.class));
+    final List<Customer> customers =
+        Collections.singletonList(
+            readObjectFromResource("customer-with-multiple-addresses.json", Customer.class));
+
+    // test
+    final CompletionStage<List<CustomerDraft>> draftsFromPageStage =
+        customerSyncer.transform(customers);
+
+    // assertion
+    final List<CustomerDraft> customerDrafts = draftsFromPageStage.toCompletableFuture().join();
+    assertThat(customerDrafts).isNotEmpty();
+    assertThat(customerDrafts.get(0).getAddresses()).hasSize(2);
+
+    // Verify first address
+    assertThat(customerDrafts.get(0).getAddresses().get(0).getState()).isEqualTo("California");
+    assertThat(customerDrafts.get(0).getAddresses().get(0).getAdditionalAddressInfo())
+        .isEqualTo("Ring doorbell twice");
+
+    // Verify second address
+    assertThat(customerDrafts.get(0).getAddresses().get(1).getState()).isEqualTo("California");
+    assertThat(customerDrafts.get(0).getAddresses().get(1).getAdditionalAddressInfo())
+        .isEqualTo("Suite 300, Reception on 3rd floor");
+  }
+
   private void mockProjectApiRootGetRequest(
       final ProjectApiRoot projectApiRoot, final List<Customer> results) {
     final ByProjectKeyCustomersRequestBuilder byProjectKeyCustomersRequestBuilder = mock();

src/test/java/com/commercetools/project/sync/shoppinglist/ShoppingListSyncerTest.java

@@ -139,4 +139,57 @@ void syncWithError_ShouldCallErrorCallback() {
                     + ".",
                 shoppingLists.get(0).getName().toString()));
   }
+
+  @Test
+  void transform_WithStoreReference_ShouldReplaceStoreReferenceIdsWithKeys() {
+    // preparation
+    final ProjectApiRoot sourceClient = mock(ProjectApiRoot.class);
+    final ShoppingListSyncer shoppingListSyncer =
+        ShoppingListSyncer.of(sourceClient, mock(ProjectApiRoot.class), mock(Clock.class));
+    final List<ShoppingList> shoppingLists =
+        List.of(readObjectFromResource("shopping-list-with-store.json", ShoppingList.class));
+
+    // Mock the store reference resolution
+    mockResourceIdsGraphQlRequest(sourceClient, "stores", "store-id-456", "store-key-456");
+    mockResourceIdsGraphQlRequest(
+        sourceClient, "shoppingLists", "5ebfa80e-f4aa-4c0b-be64-e348e09a855a", "customTypeKey");
+
+    // test
+    final CompletionStage<List<ShoppingListDraft>> draftsFromPageStage =
+        shoppingListSyncer.transform(shoppingLists);
+
+    // assertion
+    assertThat(draftsFromPageStage)
+        .isCompletedWithValue(
+            ShoppingListTransformUtils.toShoppingListDrafts(
+                    sourceClient, referenceIdToKeyCache, shoppingLists)
+                .join());
+  }
+
+  @Test
+  void transform_WithMultipleStoreReferences_ShouldResolveAllStoreReferences() {
+    // preparation
+    final ProjectApiRoot sourceClient = mock(ProjectApiRoot.class);
+    final ShoppingListSyncer shoppingListSyncer =
+        ShoppingListSyncer.of(sourceClient, mock(ProjectApiRoot.class), mock(Clock.class));
+    final List<ShoppingList> shoppingLists =
+        List.of(
+            readObjectFromResource("shopping-list-with-multiple-stores.json", ShoppingList.class));
+
+    // Mock multiple store reference resolutions
+    mockResourceIdsGraphQlRequest(sourceClient, "stores", "store-id-1", "store-key-1");
+    mockResourceIdsGraphQlRequest(sourceClient, "stores", "store-id-2", "store-key-2");
+    mockResourceIdsGraphQlRequest(
+        sourceClient, "shoppingLists", "5ebfa80e-f4aa-4c0b-be64-e348e09a855a", "customTypeKey");
+
+    // test
+    final CompletionStage<List<ShoppingListDraft>> draftsFromPageStage =
+        shoppingListSyncer.transform(shoppingLists);
+
+    // assertion
+    final List<ShoppingListDraft> shoppingListDrafts =
+        draftsFromPageStage.toCompletableFuture().join();
+    assertThat(shoppingListDrafts).isNotEmpty();
+    assertThat(shoppingListDrafts.get(0).getStore()).isNotNull();
+  }
 }

src/test/resources/customer-with-multiple-addresses.json

@@ -0,0 +1,42 @@
+{
+  "key": "customerMultipleAddresses",
+  "customerNumber": "2",
+  "email": "customer2@example.com",
+  "firstName": "Jane",
+  "lastName": "Smith",
+  "password": "xxx",
+  "addresses": [
+    {
+      "key": "homeAddress",
+      "id": "addr001",
+      "firstName": "Jane",
+      "lastName": "Smith",
+      "streetName": "Oak Avenue",
+      "streetNumber": "456",
+      "postalCode": "67890",
+      "city": "Los Angeles",
+      "region": "CA",
+      "state": "California",
+      "country": "US",
+      "additionalAddressInfo": "Ring doorbell twice"
+    },
+    {
+      "key": "officeAddress",
+      "id": "addr002",
+      "firstName": "Jane",
+      "lastName": "Smith",
+      "streetName": "Business Blvd",
+      "streetNumber": "789",
+      "postalCode": "11111",
+      "city": "San Francisco",
+      "region": "CA",
+      "state": "California",
+      "country": "US",
+      "additionalAddressInfo": "Suite 300, Reception on 3rd floor"
+    }
+  ],
+  "shippingAddressIds": ["addr001"],
+  "billingAddressIds": ["addr002"],
+  "isEmailVerified": true,
+  "stores": []
+}

src/test/resources/customer-with-state-reference.json

@@ -0,0 +1,28 @@
+{
+  "key": "customerWithAdditionalAddressInfo",
+  "customerNumber": "1",
+  "email": "customer@example.com",
+  "firstName": "John",
+  "lastName": "Doe",
+  "password": "xxx",
+  "addresses": [
+    {
+      "key": "addressKey",
+      "id": "addr123",
+      "firstName": "John",
+      "lastName": "Doe",
+      "streetName": "Main Street",
+      "streetNumber": "123",
+      "postalCode": "12345",
+      "city": "New York",
+      "region": "NY",
+      "state": "New York",
+      "country": "US",
+      "additionalAddressInfo": "Building B, Floor 5"
+    }
+  ],
+  "shippingAddressIds": [],
+  "billingAddressIds": [],
+  "isEmailVerified": false,
+  "stores": []
+}

src/test/resources/shopping-list-with-multiple-stores.json

@@ -0,0 +1,69 @@
+{
+  "key": "shoppingListMultipleStores",
+  "slug": {
+    "en": "shopping-list-multi-store"
+  },
+  "name": {
+    "en": "Shopping List with Multiple Store References"
+  },
+  "description": {
+    "en": "A shopping list with store reference"
+  },
+  "store": {
+    "typeId": "store",
+    "id": "store-id-1"
+  },
+  "customer": {
+    "typeId": "customer",
+    "id": "customer-id-789"
+  },
+  "lineItems": [
+    {
+      "id": "line-item-1",
+      "productId": "product-id-1",
+      "name": {
+        "en": "Product One"
+      },
+      "productType": {
+        "typeId": "product-type",
+        "id": "product-type-id-1"
+      },
+      "variantId": 1,
+      "quantity": 3,
+      "addedAt": "2020-10-16T07:52:56.960Z"
+    },
+    {
+      "id": "line-item-2",
+      "productId": "product-id-2",
+      "name": {
+        "en": "Product Two"
+      },
+      "productType": {
+        "typeId": "product-type",
+        "id": "product-type-id-2"
+      },
+      "variantId": 1,
+      "quantity": 2,
+      "addedAt": "2020-10-16T08:00:00.000Z"
+    }
+  ],
+  "textLineItems": [
+    {
+      "id": "text-line-item-1",
+      "name": {
+        "en": "Additional Note"
+      },
+      "quantity": 1,
+      "addedAt": "2020-10-16T09:57:12.335Z"
+    }
+  ],
+  "custom": {
+    "type": {
+      "typeId": "type",
+      "id": "5ebfa80e-f4aa-4c0b-be64-e348e09a855a"
+    },
+    "fields": {
+      "textField": "multi-store shopping list"
+    }
+  }
+}