Fix issue when loading associations for EmbeddedId, the assocation pa…

…th was not calculated correctly

nrich-registry/src/main/java/net/croz/nrich/registry/core/support/ManagedTypeWrapper.java

@@ -123,7 +123,7 @@ private void resolveSingularAssociationList(ManagedType<?> managedType, Boolean
             }
 
             if (!association.getJavaType().equals(managedType.getJavaType())) {
-                resolveSingularAssociationList((ManagedType<?>) association.getType(), association.isOptional(), association.getName(), singularAssociationMap);
+                resolveSingularAssociationList((ManagedType<?>) association.getType(), association.isOptional(), associationName, singularAssociationMap);
             }
         }
     }

nrich-registry/src/test/java/net/croz/nrich/registry/data/controller/RegistryDataControllerTest.java

@@ -35,12 +35,12 @@
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 
+import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createAndSaveRegistryTestEmbeddedUserGroup;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createBulkListRegistryRequest;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createDeleteEmbeddedUserGroupRequest;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createDeleteRegistryRequest;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createListRegistryRequest;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createRegistryRequest;
-import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createRegistryTestEmbeddedUserGroup;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createRegistryTestEntity;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createRegistryTestEntityList;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createRegistryTestEntityWithParent;
@@ -216,7 +216,7 @@ void shouldDeleteRegistryEntity() throws Exception {
     @Test
     void shouldDeleteRegistryEntityWithEmbeddedId() throws Exception {
         // given
-        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = executeInTransaction(platformTransactionManager, () -> createRegistryTestEmbeddedUserGroup(entityManager));
+        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = executeInTransaction(platformTransactionManager, () -> createAndSaveRegistryTestEmbeddedUserGroup(entityManager));
 
         String requestUrl = fullUrl("delete");
         DeleteRegistryRequest request = createDeleteEmbeddedUserGroupRequest(registryTestEmbeddedUserGroup.getUserGroupId());
@@ -233,7 +233,7 @@ void shouldDeleteRegistryEntityWithEmbeddedId() throws Exception {
     @Test
     void shouldNotFailListingRegistryWithLazyAssociationsInEmbeddedId() throws Exception {
         // given
-        executeInTransaction(platformTransactionManager, () -> createRegistryTestEmbeddedUserGroup(entityManager));
+        executeInTransaction(platformTransactionManager, () -> createAndSaveRegistryTestEmbeddedUserGroup(entityManager));
 
         String requestUrl = fullUrl("list");
         ListRegistryRequest request = createListRegistryRequest(RegistryTestEmbeddedUserGroup.class.getName(), "%");
@@ -248,7 +248,7 @@ void shouldNotFailListingRegistryWithLazyAssociationsInEmbeddedId() throws Excep
     @Test
     void shouldNotFailUpdatingRegistryWithLazyAssociationsInEmbeddedId() throws Exception {
         // given
-        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = executeInTransaction(platformTransactionManager, () -> createRegistryTestEmbeddedUserGroup(entityManager));
+        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = executeInTransaction(platformTransactionManager, () -> createAndSaveRegistryTestEmbeddedUserGroup(entityManager));
 
         String requestUrl = fullUrl("update");
         UpdateRegistryRequest request = createUpdateEmbeddedUserGroupRequest(objectMapper, registryTestEmbeddedUserGroup);

nrich-registry/src/test/java/net/croz/nrich/registry/data/service/DefaultRegistryDataServiceTest.java

@@ -40,6 +40,7 @@
 import jakarta.persistence.PersistenceContext;
 import java.util.Map;
 
+import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createAndSaveRegistryTestEmbeddedUserGroup;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createBulkListRegistryRequest;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createListRegistryRequest;
 import static net.croz.nrich.registry.data.testutil.RegistryDataGeneratingUtil.createRegistryTestEmbeddedUserGroup;
@@ -143,6 +144,19 @@ void shouldReturnAllElementsOnEmptySearchParameters() {
         assertThat(result).hasSize(5);
     }
 
+    @Test
+    void shouldListRegistryDataWithEmbeddedId() {
+        // given
+        createAndSaveRegistryTestEmbeddedUserGroup(entityManager);
+        ListRegistryRequest request = createListRegistryRequest(RegistryTestEmbeddedUserGroup.class.getName(), null);
+
+        // when
+        Page<RegistryTestEmbeddedUserGroup> result = registryDataService.list(request);
+
+        // then
+        assertThat(result).isNotEmpty();
+    }
+
     @Test
     void shouldCreateRegistryEntity() {
         // when
@@ -227,7 +241,7 @@ void shouldUpdateRegistryEntityWithoutAssociations() {
     void shouldUpdateRegistryEntityWithEmbeddedObjectId() {
         // given
         String joinedPropertyUpdateValue = "updated joined property";
-        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = createRegistryTestEmbeddedUserGroup(entityManager);
+        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = createAndSaveRegistryTestEmbeddedUserGroup(entityManager);
         RegistryTestEmbeddedUserGroupId registryUpdateGroupId = createRegistryTestEmbeddedUserGroupId(entityManager);
         RegistryTestEmbeddedUserGroup entityData = createRegistryTestEmbeddedUserGroup(registryUpdateGroupId, joinedPropertyUpdateValue);
 
@@ -261,7 +275,7 @@ void shouldDeleteRegistryEntity() {
     @Test
     void shouldDeleteRegistryEntityWithEmbeddedObjectId() {
         // given
-        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = createRegistryTestEmbeddedUserGroup(entityManager);
+        RegistryTestEmbeddedUserGroup registryTestEmbeddedUserGroup = createAndSaveRegistryTestEmbeddedUserGroup(entityManager);
 
         // when
         RegistryTestEmbeddedUserGroup result = registryDataService.delete(RegistryTestEmbeddedUserGroup.class.getName(), registryTestEmbeddedUserGroup.getUserGroupId());
@@ -299,7 +313,7 @@ void shouldDeleteRegistryEntityWithEmbeddedId() {
     @Test
     void shouldThrowExceptionOnInvalidPrimaryKey() {
         // given
-        createRegistryTestEmbeddedUserGroup(entityManager);
+        createAndSaveRegistryTestEmbeddedUserGroup(entityManager);
 
         // when
         Throwable thrown = catchThrowable(() -> registryDataService.delete(RegistryTestEmbeddedUserGroup.class.getName(), new Object()));

nrich-registry/src/test/java/net/croz/nrich/registry/data/stub/RegistryTestGroupType.java

@@ -21,12 +21,13 @@
 import lombok.Setter;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
 
-
 @Setter
 @Getter
 @Entity
@@ -39,4 +40,7 @@ public class RegistryTestGroupType {
     @NotNull
     private String name;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    private RegistryTestGroupType parent;
+
 }

nrich-registry/src/test/java/net/croz/nrich/registry/data/testutil/RegistryDataGeneratingUtil.java

@@ -212,7 +212,7 @@ public static UpdateRegistryRequest updateRegistryRequestWithId(ObjectMapper obj
         return request;
     }
 
-    public static RegistryTestEmbeddedUserGroup createRegistryTestEmbeddedUserGroup(EntityManager entityManager) {
+    public static RegistryTestEmbeddedUserGroup createAndSaveRegistryTestEmbeddedUserGroup(EntityManager entityManager) {
         RegistryTestEmbeddedUser user = createRegistryTestEmbeddedUser(entityManager);
         RegistryTestEmbeddedGroup group = createRegistryTestEmbeddedGroup(entityManager);