Skip to content

Изменил trust_level в get admin full_name #54

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
morozov-tech merged 3 commits into from
Dec 22, 2025
+17 −5
Merged

Изменил trust_level в get admin full_name #54

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08451e5
changed trust_level get full_name
petrCher Dec 21, 2025
9bfdcf3
trust_level
petrCher Dec 21, 2025
18ae0d8
trust_level
petrCher Dec 21, 2025
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
22 changes: 17 additions & 5 deletions userdata_api/utils/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from fastapi_sqlalchemy import db

from userdata_api.exceptions import ObjectNotFound
from userdata_api.models.db import Info, Param
from userdata_api.models.db import Info, Param, Source
from userdata_api.schemas.admin import UserCardGet, UserCardUpdate
from userdata_api.schemas.user import UserInfo, UserInfoUpdate

Expand Down Expand Up @@ -55,26 +55,38 @@ async def get_user_info(user_id: int, user: dict[str, int | list[dict[str, str |
full_name = (
db.session.query(Info)
.join(Info.param)
.join(Info.source)
.filter(Info.owner_id == user_id, Param.name == "Полное имя")
.one_or_none()
.order_by(Source.trust_level.desc())
.order_by(Info.create_ts.desc())
.first()
)
is_union_member = (
db.session.query(Info)
.join(Info.param)
.join(Info.source)
.filter(Info.owner_id == user_id, Param.name == "Членство в профсоюзе")
.one_or_none()
.order_by(Source.trust_level.desc())
.order_by(Info.create_ts.desc())
.first()
)
student_card_number = (
db.session.query(Info)
.join(Info.param)
.join(Info.source)
.filter(Info.owner_id == user_id, Param.name == "Номер студенческого билета")
.one_or_none()
.order_by(Source.trust_level.desc())
.order_by(Info.create_ts.desc())
.first()
)
union_card_number = (
db.session.query(Info)
.join(Info.param)
.join(Info.source)
.filter(Info.owner_id == user_id, Param.name == "Номер профсоюзного билета")
.one_or_none()
.order_by(Source.trust_level.desc())
.order_by(Info.create_ts.desc())
.first()
)
result = {
"user_id": user_id,
Expand Down