Fix text-based users search

VedaWebProject · Sep 18, 2024 · 3b6fab0 · 3b6fab0
1 parent 953bf05
commit 3b6fab0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/Tekst-API/tekst/models/user.py b/Tekst-API/tekst/models/user.py
@@ -1,8 +1,6 @@
 from datetime import datetime
 from typing import Annotated, Literal, get_args
 
-import pymongo
-
 from beanie import Document, PydanticObjectId
 from fastapi_users import (
     schemas,
@@ -151,13 +149,6 @@ class Settings(BeanieBaseUser.Settings):
         name = "users"
         indexes = BeanieBaseUser.Settings.indexes + [
             IndexModel("username", unique=True),
-            IndexModel(
-                [
-                    ("username", pymongo.TEXT),
-                    ("name", pymongo.TEXT),
-                    ("affiliation", pymongo.TEXT),
-                ],
-            ),
         ]
 
     is_active: bool = _cfg.security.users_active_by_default

diff --git a/Tekst-API/tekst/routers/users.py b/Tekst-API/tekst/routers/users.py
@@ -1,7 +1,9 @@
+import re
+
 from typing import Annotated
 
 from beanie import PydanticObjectId
-from beanie.operators import NE, Eq, Or, Text
+from beanie.operators import NE, Eq, Or, RegEx
 from fastapi import APIRouter, Depends, Path, Query, Request, status
 
 from tekst import errors
@@ -21,6 +23,26 @@
 from tekst.utils import validators as val
 
 
+def _get_user_text_query(
+    query_str: str,
+    *,
+    min_q_length: int = 1,
+    empty_q_matches_all: bool = True,
+) -> dict:
+    q = re.sub(r"\W", "", query_str or "").strip()
+    if not q or len(q) < min_q_length:
+        if empty_q_matches_all:
+            return {}
+        else:
+            return Eq(UserDocument.id, 0)
+    else:
+        return Or(
+            RegEx(UserDocument.username, q, "i"),
+            RegEx(UserDocument.name, q, "i"),
+            RegEx(UserDocument.affiliation, q, "i"),
+        )
+
+
 router = APIRouter(
     prefix="/users",
     tags=["users"],
@@ -126,7 +148,7 @@ async def find_users(
 ) -> UsersSearchResult:
     # construct DB query
     db_query = [
-        Text(query) if query else {},
+        _get_user_text_query(query),
         Or(
             Eq(UserDocument.is_active, is_active)
             if is_active
@@ -259,19 +281,20 @@ async def find_public_users(
 
     # construct DB query
     db_query = [
-        Text(query) if query else {},
+        _get_user_text_query(query),
         Eq(UserDocument.is_active, True),
     ]
 
     # count total possible hits
+    # (yeah, MongoDB doesn't give us the total for a skipped query)
     total = await UserDocument.find(*db_query).count()
 
     # return actual paginated, sorted restults
     pgn = PaginationSettings(page=page, page_size=page_size)
     return PublicUsersSearchResult(
         users=(
             await UserDocument.find(*db_query)
-            .sort(+UserDocument.name)
+            .sort(+UserDocument.name, +UserDocument.username)
             .skip(pgn.mongo_skip())
             .limit(pgn.mongo_limit())
             .to_list()