fix several bugs

cleydyr · Jun 2, 2024 · 156d0b3 · 156d0b3
1 parent b6b4c92
commit 156d0b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/biblivre/circulation/user/IndexableUserDAO.java b/src/main/java/biblivre/circulation/user/IndexableUserDAO.java
@@ -190,11 +190,11 @@ private static List<Query> buildAdvancedOptionsQueries(UserSearchDTO dto) {
     }
 
     private static List<Query> getMustQueries(UserSearchDTO dto) {
-        if (dto.isNameOrIdSearch() && !dto.isListAll()) {
-            return List.of(getMustQueryForName(dto));
+        if (dto.isSearchById() || dto.isListAll()) {
+            return Collections.emptyList();
         }
 
-        return Collections.emptyList();
+        return List.of(getMustQueryForName(dto));
     }
 
     private static Query getMustQueryForName(UserSearchDTO dto) {
@@ -203,8 +203,8 @@ private static Query getMustQueryForName(UserSearchDTO dto) {
                 .build();
     }
 
-    private static Query buildLongTermQuery(UserSearchDTO dto) {
-        return buildTermQuery("id", value -> value.longValue(Long.parseLong(dto.getQuery())));
+    private static Query buildUserIdTermQuery(UserSearchDTO dto) {
+        return buildTermQuery("userId", value -> value.longValue(Long.parseLong(dto.getQuery())));
     }
 
     private static Query buildRangeGteQuery(String field, Date value) {
@@ -303,7 +303,7 @@ private IndexableUser getIndexableUser(UserDTO user) {
         String schema = SchemaThreadLocal.get();
 
         return new IndexableUser(
-                STR."\{schema}:\{userId}",
+                STR."\{tenant}:\{schema}:\{userId}",
                 userId,
                 user.getName(),
                 user.getType(),

diff --git a/src/main/java/biblivre/search/user/IndexableUser.java b/src/main/java/biblivre/search/user/IndexableUser.java
@@ -78,6 +78,6 @@ public boolean isNew() {
 
     @Override
     public String getId() {
-        return STR."\{schema}:\{userId}";
+        return id;
     }
 }