refactor

cleydyr · Jun 1, 2024 · d2b2b35 · d2b2b35
1 parent 14fce39
commit d2b2b35
Showing 1 changed file with 33 additions and 15 deletions.
diff --git a/src/main/java/biblivre/circulation/user/IndexableUserDAO.java b/src/main/java/biblivre/circulation/user/IndexableUserDAO.java
@@ -73,13 +73,43 @@ public class IndexableUserDAO extends UserDAOImpl {
     }
 
     private List<Query> getFilterQueries(UserSearchDTO dto) {
-        List<Query> baseFilterQuries = buildBaseQueries(dto);
+        var baseFilterTermQueries = buildBaseQueries(dto);
 
+        var textQueries = buildTextQueries(dto);
+
+        var advancedOptionsQueries = buildAdvancedOptionsQueries(dto);
+
+        var filterTermQueries = new ArrayList<>(baseFilterTermQueries);
+
+        filterTermQueries.addAll(textQueries);
+
+        filterTermQueries.addAll(advancedOptionsQueries);
+
+        return Collections.unmodifiableList(filterTermQueries);
+    }
+
+    private List<Query> buildTextQueries(UserSearchDTO dto) {
+        if (dto.isSearchById()) {
+            return Collections.singletonList(buildLongTermQuery(dto));
+        }
+
+        return Collections.emptyList();
+    }
+
+    private List<Query> buildBaseQueries(UserSearchDTO dto) {
+        Query schemaQ = buildStringTermQuery("schema", SchemaThreadLocal.get());
+
+        Query tenantQ = buildStringTermQuery("tenant", tenant);
+
+        return List.of(schemaQ, tenantQ);
+    }
+
+    private static List<Query> buildAdvancedOptionsQueries(UserSearchDTO dto) {
         if (dto.isSimpleSearch()) {
-            return baseFilterQuries;
+            return Collections.emptyList();
         }
 
-        List<Query> filterQueries = new ArrayList<>(baseFilterQuries);
+        List<Query> filterQueries = new ArrayList<>();
 
         if (dto.isUserCardNeverPrinted()) {
             filterQueries.add(buildBooleanTermQuery("userCardPrinted", false));
@@ -117,21 +147,9 @@ private List<Query> getFilterQueries(UserSearchDTO dto) {
             filterQueries.add(buildRangeLteQuery("modified", dto.getModifiedEndDate()));
         }
 
-        if (dto.isSearchById()) {
-            filterQueries.add(buildLongTermQuery(dto));
-        }
-
         return Collections.unmodifiableList(filterQueries);
     }
 
-    private List<Query> buildBaseQueries(UserSearchDTO dto) {
-        Query schemaQ = buildStringTermQuery("schema", SchemaThreadLocal.get());
-
-        Query tenantQ = buildStringTermQuery("tenant", tenant);
-
-        return List.of(schemaQ, tenantQ);
-    }
-
     private static List<Query> getMustQueries(UserSearchDTO dto) {
         return dto.isListAll() ? Collections.emptyList() : List.of(getMustQueryForName(dto));
     }