Fix issue with collection attributes not being recognized and using a…

… join instead of exsits query by default
croz-ltd · Sep 20, 2024 · 588bc34 · 588bc34
1 parent 0e0a54d
commit 588bc34
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/nrich-search/src/main/java/net/croz/nrich/search/parser/SearchDataParser.java b/nrich-search/src/main/java/net/croz/nrich/search/parser/SearchDataParser.java
@@ -92,7 +92,7 @@ private Set<Restriction> resolveRestrictionListInternal(MapSupportingDirectField
                 }
 
                 // element collections have null managed type but should be treated as plural attributes
-                boolean isCurrentAttributePlural = attributeHolder.isElementCollection() || isPluralAttribute;
+                boolean isCurrentAttributePlural = attributeHolder.isPlural() || attributeHolder.isElementCollection() || isPluralAttribute;
 
                 restrictionList.add(createAttributeRestriction(attributeHolder.getAttribute().getJavaType(), originalFieldName, currentPath, value, isCurrentAttributePlural));
             }

diff --git a/nrich-search/src/test/java/net/croz/nrich/search/repository/support/JpaQueryBuilderTest.java b/nrich-search/src/test/java/net/croz/nrich/search/repository/support/JpaQueryBuilderTest.java
@@ -55,6 +55,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static net.croz.nrich.search.repository.testutil.JpaSearchRepositoryExecutorGeneratingUtil.createTestEntityForCollectionSearch;
 import static net.croz.nrich.search.repository.testutil.JpaSearchRepositoryExecutorGeneratingUtil.createTestEntitySearchRequestJoin;
 import static net.croz.nrich.search.repository.testutil.JpaSearchRepositoryExecutorGeneratingUtil.generateListForSearch;
 import static net.croz.nrich.search.repository.testutil.JpaSearchRepositoryExecutorGeneratingUtil.generateTestEntityWithCustomIdList;
@@ -872,11 +873,28 @@ void shouldSupportSubclassAttributeSearch() {
         assertThat(results).hasSize(1);
     }
 
+    @Test
+    void shouldCountCorrectlyWhenSearchingByCollection() {
+        // given
+        TestEntity entity = createTestEntityForCollectionSearch(entityManager);
+        Map<String, Object> requestMap = Map.of("name", entity.getName(), "collectionEntityList.name", "collection");
+
+        // when
+        Long result = executeCountQuery(requestMap, SearchConfiguration.emptyConfigurationWithDefaultMappingResolve());
+
+        // then
+        assertThat(result).isEqualTo(1L);
+    }
+
     private <P, R> List<P> executeQuery(R request, SearchConfiguration<TestEntity, P, R> searchConfiguration) {
         return executeQuery(request, searchConfiguration, Sort.unsorted());
     }
 
     private <P, R> List<P> executeQuery(R request, SearchConfiguration<TestEntity, P, R> searchConfiguration, Sort sort) {
         return entityManager.createQuery(jpaQueryBuilder.buildQuery(request, searchConfiguration, sort)).getResultList();
     }
+
+    private <P, R> Long executeCountQuery(R request, SearchConfiguration<TestEntity, P, R> searchConfiguration) {
+        return entityManager.createQuery(jpaQueryBuilder.buildCountQuery(request, searchConfiguration)).getSingleResult();
+    }
 }
diff --git a/.../net/croz/nrich/search/repository/testutil/JpaSearchRepositoryExecutorGeneratingUtil.java b/.../net/croz/nrich/search/repository/testutil/JpaSearchRepositoryExecutorGeneratingUtil.java
@@ -35,7 +35,6 @@
 import jakarta.persistence.criteria.JoinType;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -137,6 +136,16 @@ public static void generateTestSubEntityList(EntityManager entityManager) {
         });
     }
 
+    public static TestEntity createTestEntityForCollectionSearch(EntityManager entityManager) {
+        TestEntity testEntity = createTestEntity(1, 3);
+
+        testEntity.setName("CollectionSearchEntity");
+
+        entityManager.persist(testEntity);
+
+        return testEntity;
+    }
+
     private static TestEntity createTestEntity(Integer value, Integer numberOfCollectionEntities) {
         TestNestedEntity nestedEntity = createTestNestedEntity(value);
         List<TestCollectionEntity> collectionEntityList = IntStream.range(0, numberOfCollectionEntities)