runfoo-org/elmeg-demo
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove user search from global search - irrelevant for music archive

Browse source
This commit is contained in:
fullsizemalt 2025-12-24 21:57:11 -08:00
parent 8990063837
commit 3de9a7cb3f
1 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
backend/routers/search.py
View file

@ -3,8 +3,8 @@ from fastapi import APIRouter, Depends, HTTPException, Query
from sqlmodel import Session, select, col from sqlmodel import Session, select, col
from sqlalchemy.orm import selectinload from sqlalchemy.orm import selectinload
from database import get_session from database import get_session
from models import Show, Song, Venue, Tour, User, Group, Performance, PerformanceNickname, Comment, Review from models import Show, Song, Venue, Tour, Group, Performance, PerformanceNickname, Comment, Review
from schemas import ShowRead, SongRead, VenueRead, TourRead, UserRead, GroupRead from schemas import ShowRead, SongRead, VenueRead, TourRead, GroupRead
router = APIRouter(prefix="/search", tags=["search"]) router = APIRouter(prefix="/search", tags=["search"])
@ -47,29 +47,6 @@ def global_search(
.limit(limit) .limit(limit)
).all() ).all()
# Search Users (by email or profile username)
users = session.exec(
select(User)
.where(col(User.email).ilike(q_str))
.limit(limit)
).all()
# Also search Profiles for username matches
from models import Profile
profile_matches = session.exec(
select(Profile)
.where(col(Profile.username).ilike(q_str))
.limit(limit)
).all()
# Add unique users from profile matches
existing_user_ids = {u.id for u in users}
for p in profile_matches:
if p.user_id not in existing_user_ids:
user = session.get(User, p.user_id)
if user:
users.append(user)
existing_user_ids.add(user.id)
# Search Nicknames # Search Nicknames
nicknames = session.exec( nicknames = session.exec(
select(PerformanceNickname) select(PerformanceNickname)
@ -79,7 +56,7 @@ def global_search(
.limit(limit) .limit(limit)
).all() ).all()
# Search Performances # Search Performances by notes
performances = session.exec( performances = session.exec(
select(Performance) select(Performance)
.options(selectinload(Performance.song), selectinload(Performance.show)) .options(selectinload(Performance.song), selectinload(Performance.show))
@ -109,7 +86,6 @@ def global_search(
"venues": venues, "venues": venues,
"tours": tours, "tours": tours,
"groups": groups, "groups": groups,
"users": users,
"nicknames": nicknames, "nicknames": nicknames,
"performances": performances, "performances": performances,
"reviews": reviews, "reviews": reviews,