Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions routes/user_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from pathlib import Path
from typing import Annotated, Optional
from fastapi.responses import FileResponse
from sqlalchemy import ColumnElement, and_, or_
from sqlalchemy import ColumnElement, and_, or_, func
from fastapi import APIRouter, Depends, File, HTTPException, Query, Response, UploadFile, status
from database import DB_dependency
from db_models.user_model import User_DB
Expand Down Expand Up @@ -138,10 +138,17 @@ def search_users(
):
users = db.query(User_DB)

# The idea is to not get one million results before you have even typed anything useful.
# However, in special cases with very short names you do get results if you type them excactly.
if name:
name_filters: list[ColumnElement[bool]] = []
for term in name.split(" "):
name_filters.append(or_(User_DB.first_name.ilike(f"%{term}%"), User_DB.last_name.ilike(f"%{term}%")))
if len(name) < 3:
name_filters.append(
or_(func.lower(User_DB.first_name) == name.lower(), func.lower(User_DB.last_name) == name.lower())
)
else:
for term in name.split(" "):
name_filters.append(or_(User_DB.first_name.ilike(f"%{term}%"), User_DB.last_name.ilike(f"%{term}%")))
users = users.filter(and_(*name_filters))

if program:
Expand Down