kompetenzinventar/ki-backend
5
6
Fork 7
Code Issues Pull Requests 13 Packages Projects Releases 1 Activity

Klarnamen in der Suche berücksichtigen #68

Merged
jaschop merged 3 commits from zeitschlag/ki-backend:feature/48-search-address-name into main 2023-10-19 14:28:59 +02:00
Conversation 1 Commits 3 Files Changed 3 +29 -11
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ki/actions/seed.py
View File

@ -59,6 +59,8 @@ def seed_user(nickname,
db.session.add(profile) db.session.add(profile)
return profile
def seed(dev: bool): def seed(dev: bool):
seed_contacttypes() seed_contacttypes()
@ -145,7 +147,7 @@ def seed(dev: bool):
for i in range(1, 20): for i in range(1, 20):
seed_user(f"babsi{i}", visible=True) seed_user(f"babsi{i}", visible=True)
seed_user("dirtydieter", dieter = seed_user("dirtydieter",
visible=True, visible=True,
volunteerwork="Müll sammeln", volunteerwork="Müll sammeln",
availability_status=True, availability_status=True,
@ -154,6 +156,9 @@ def seed(dev: bool):
freetext="1001010010111!!!", freetext="1001010010111!!!",
skills=[(Skill.skill_id_php, 5)]) skills=[(Skill.skill_id_php, 5)])
dieters_address = Address(name="Friedrich Witzig", profile=dieter)
zeitschlag marked this conversation as resolved Outdated
jaschop commented 2023-10-13 21:22:02 +02:00
Outdated
Review
Copy Link

Diese Verwendung bricht das existierende Pattern von seed_user und vermischt Abstraktionslevel.
Die Adresse könnte wie die Skills als Parameter übergeben werden.

Diese Verwendung bricht das existierende Pattern von `seed_user` und vermischt Abstraktionslevel. Die Adresse könnte wie die Skills als Parameter übergeben werden.
zeitschlag commented 2023-10-14 21:12:45 +02:00
Outdated
Review
Copy Link

Wie besprochen sollten wir die Erstellung von Profilen refactoren.

Wie besprochen sollten wir die Erstellung von Profilen refactoren.
db.session.add(dieters_address)
all_skills = Skill.query.all() all_skills = Skill.query.all()
all_profile_skills = [] all_profile_skills = []
for skill in all_skills: for skill in all_skills:

11
ki/handlers/find_profiles.py
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")

8
ki/test/test_find_profiles_endpoint.py
View File

@ -99,6 +99,14 @@ class TestFindProfilesEndpoint(ApiTest):
self.assertDictContainsSubset({"nickname": "jutta"}, response.json["profiles"][0]) self.assertDictContainsSubset({"nickname": "jutta"}, response.json["profiles"][0])
self.assertDictContainsSubset({"nickname": "monique"}, response.json["profiles"][1]) self.assertDictContainsSubset({"nickname": "monique"}, response.json["profiles"][1])
def test_find_dieter_by_name(self):
token = self.login("peter", "geheim")["token"]
response = self.client.get("/users/profiles?search=friedrich", headers={"Authorization": "Bearer " + token})
self.assertEqual(response.status_code, 200)
self.assertDictContainsSubset({"total": 1}, response.json)
self.assertDictContainsSubset({"nickname": "dirtydieter"}, response.json["profiles"][0])
if __name__ == "main": if __name__ == "main":
unittest.main() unittest.main()