Remove join fetches from entity find query since it causes issues wit…

…h multiple associations and it is not needed for query
croz-ltd · Jul 1, 2024 · 18ae793 · 18ae793
1 parent f91694f
commit 18ae793
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/...registry/src/main/java/net/croz/nrich/registry/core/constants/RegistryQueryConstants.java b/...registry/src/main/java/net/croz/nrich/registry/core/constants/RegistryQueryConstants.java
@@ -31,8 +31,6 @@ public final class RegistryQueryConstants {
 
     public static final String FIND_QUERY_SEPARATOR = " and ";
 
-    public static final String FIND_QUERY_JOIN_FETCH = " left join fetch " + ENTITY_ALIAS + ".%s ";
-
     private RegistryQueryConstants() {
     }
 }
diff --git a/...n/java/net/croz/nrich/registry/core/service/EntityManagerRegistryEntityFinderService.java b/...n/java/net/croz/nrich/registry/core/service/EntityManagerRegistryEntityFinderService.java
@@ -20,7 +20,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.croz.nrich.registry.api.core.service.RegistryEntityFinderService;
-import net.croz.nrich.registry.core.constants.RegistryCoreConstants;
 import net.croz.nrich.registry.core.constants.RegistryQueryConstants;
 import net.croz.nrich.registry.core.support.ManagedTypeWrapper;
 import org.modelmapper.ModelMapper;
@@ -49,13 +48,8 @@ public class EntityManagerRegistryEntityFinderService implements RegistryEntityF
     public <T> T findEntityInstance(Class<T> type, Object id) {
         QueryCondition queryCondition = queryWherePartWithParameterMap(type, id, true);
 
-        String joinFetchQueryPart = classNameManagedTypeWrapperMap.get(type.getName()).getSingularAssociationList().stream()
-            .map(attribute -> String.format(RegistryQueryConstants.FIND_QUERY_JOIN_FETCH, attribute.getPath()))
-            .collect(Collectors.joining(RegistryCoreConstants.SPACE));
-
         String entityWithAlias = String.format(RegistryQueryConstants.PROPERTY_SPACE_FORMAT, type.getName(), RegistryQueryConstants.ENTITY_ALIAS);
-        String querySelectPart = String.format(RegistryQueryConstants.PROPERTY_SPACE_FORMAT, entityWithAlias, joinFetchQueryPart.trim());
-        String fullQuery = String.format(RegistryQueryConstants.FIND_QUERY, querySelectPart, queryCondition.wherePart);
+        String fullQuery = String.format(RegistryQueryConstants.FIND_QUERY, entityWithAlias, queryCondition.wherePart);
 
         @SuppressWarnings("unchecked")
         TypedQuery<T> query = (TypedQuery<T>) entityManager.createQuery(fullQuery);