Skip to content

Fix subject search #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Temmmmmo merged 1 commit into from
Nov 10, 2024
Merged

Fix subject search #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions rating_api/routes/lecturer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,11 @@ async def get_lecturers(
`name`
Поле для ФИО. Если передано `name` - возвращает всех преподователей, для которых нашлись совпадения с переданной строкой
"""
lecturers = (
Lecturer.query(session=db.session)
.join(Lecturer.comments)
.filter(Lecturer.search_by_name(name))
.filter(Lecturer.search_by_subject(subject))
.all()
)
lecturers_query = Lecturer.query(session=db.session)
if subject:
lecturers_query = lecturers_query.join(Lecturer.comments).filter(Lecturer.search_by_subject(subject))
lecturers_query = lecturers_query.filter(Lecturer.search_by_name(name))
lecturers = lecturers_query.all()
if not lecturers:
raise ObjectNotFound(Lecturer, 'all')
result = LecturerGetAll(limit=limit, offset=offset, total=len(lecturers))
Expand Down