Skip to content

Commit 3255360

Browse files
authored
Изменил trust_level в get admin full_name (#54)
* changed trust_level get full_name * trust_level * trust_level
1 parent 82d1f3d commit 3255360

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

userdata_api/utils/admin.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from fastapi_sqlalchemy import db
44

55
from userdata_api.exceptions import ObjectNotFound
6-
from userdata_api.models.db import Info, Param
6+
from userdata_api.models.db import Info, Param, Source
77
from userdata_api.schemas.admin import UserCardGet, UserCardUpdate
88
from userdata_api.schemas.user import UserInfo, UserInfoUpdate
99

@@ -55,26 +55,38 @@ async def get_user_info(user_id: int, user: dict[str, int | list[dict[str, str |
5555
full_name = (
5656
db.session.query(Info)
5757
.join(Info.param)
58+
.join(Info.source)
5859
.filter(Info.owner_id == user_id, Param.name == "Полное имя")
59-
.one_or_none()
60+
.order_by(Source.trust_level.desc())
61+
.order_by(Info.create_ts.desc())
62+
.first()
6063
)
6164
is_union_member = (
6265
db.session.query(Info)
6366
.join(Info.param)
67+
.join(Info.source)
6468
.filter(Info.owner_id == user_id, Param.name == "Членство в профсоюзе")
65-
.one_or_none()
69+
.order_by(Source.trust_level.desc())
70+
.order_by(Info.create_ts.desc())
71+
.first()
6672
)
6773
student_card_number = (
6874
db.session.query(Info)
6975
.join(Info.param)
76+
.join(Info.source)
7077
.filter(Info.owner_id == user_id, Param.name == "Номер студенческого билета")
71-
.one_or_none()
78+
.order_by(Source.trust_level.desc())
79+
.order_by(Info.create_ts.desc())
80+
.first()
7281
)
7382
union_card_number = (
7483
db.session.query(Info)
7584
.join(Info.param)
85+
.join(Info.source)
7686
.filter(Info.owner_id == user_id, Param.name == "Номер профсоюзного билета")
77-
.one_or_none()
87+
.order_by(Source.trust_level.desc())
88+
.order_by(Info.create_ts.desc())
89+
.first()
7890
)
7991
result = {
8092
"user_id": user_id,

0 commit comments

Comments
 (0)