Consider real name when searching (kompetenzinventar/ki-doku#48)

This commit is contained in:
zeitschlag 2023-04-20 17:33:19 +02:00
parent da46d01765
commit f3840f18b7
1 changed files with 8 additions and 3 deletions

View File

@ -4,7 +4,7 @@
from flask import make_response, request from flask import make_response, request
from ki.models import Profile, ProfileSkill, Skill, ProfileLanguage, Language from ki.models import Profile, ProfileSkill, Skill, ProfileLanguage, Language, Address
def find_profiles(): def find_profiles():
@ -25,13 +25,18 @@ def find_profiles():
.order_by(Profile.nickname) \ .order_by(Profile.nickname) \
.filter(Profile.visible.is_(True)) \ .filter(Profile.visible.is_(True)) \
.join(Profile.skills, isouter=True).join(ProfileSkill.skill, isouter=True) \ .join(Profile.skills, isouter=True).join(ProfileSkill.skill, isouter=True) \
.join(Profile.languages, isouter=True).join(ProfileLanguage.language, isouter=True) .join(Profile.languages, isouter=True).join(ProfileLanguage.language, isouter=True) \
.join(Address, isouter=True)
if "search" in request.args: if "search" in request.args:
terms = request.args["search"].split(" ") terms = request.args["search"].split(" ")
for term in terms: for term in terms:
query = query.filter( query = query.filter(
Profile.nickname.like(f"%{term}%") | Skill.name.like(f"%{term}%") | Language.name.like(f"%{term}%")) Profile.nickname.like(f"%{term}%") | # noqa: W504
Skill.name.like(f"%{term}%") | # noqa: W504
Language.name.like(f"%{term}%") | # noqa: W504
Address.name.like(f"%{term}%"))
if "nickname" in request.args: if "nickname" in request.args:
nickname = request.args.get("nickname") nickname = request.args.get("nickname")