Commit 497217c1 authored by deepdey's avatar deepdey

feat: update logic getuser api

parent 045c73c4
......@@ -18,4 +18,6 @@ class RoleType(db.Model, CustomSerializerMixin):
created_at = db.Column(db.DATETIME, default=datetime.now)
updated_at = db.Column(db.DATETIME, onupdate=datetime.now)
is_deleted = db.Column(db.Boolean, default=False)
\ No newline at end of file
is_deleted = db.Column(db.Boolean, default=False)
serialize_rules = ('-created_at', '-updated_at')
\ No newline at end of file
......@@ -32,24 +32,11 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
raise Exception('You do not have permission to view user details')
else:
# return all user data for project admin for his specific project
subquery = (
ORM.db.session.query(ORM.Role.project_id)
.join(ORM.UserRoleMap)
.filter(ORM.UserRoleMap.user_id == admin_id)
.subquery()
)
return (
ORM.db.session.query(ORM.User)
.join(ORM.UserRoleMap)
.join(ORM.Role)
.filter(
ORM.Role.project_id == subquery,
ORM.User.id == user_id,
ORM.User.is_deleted == False,
)
.first()
)
return ORM.User.query.filter(
ORM.User.is_deleted == False,
ORM.User.id == user_id,
ORM.User.project_id == admin_user.project_id
).first()
else:
# return all user data for super admin
return ORM.User.query.filter(
......@@ -74,23 +61,10 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
raise Exception('You do not have permission to view user list')
else:
# return all user data for project admin for his specific project
subquery = (
ORM.db.session.query(ORM.Role.project_id)
.join(ORM.UserRoleMap)
.filter(ORM.UserRoleMap.user_id == admin_id)
.subquery()
)
return (
ORM.db.session.query(ORM.User)
.join(ORM.UserRoleMap)
.join(ORM.Role)
.filter(
ORM.Role.project_id == subquery,
ORM.User.is_deleted == False,
)
.all()
)
return ORM.User.query.filter(
ORM.User.is_deleted == False,
ORM.User.project_id == admin_user.project_id
).all()
else:
# return all user data for super admin
return ORM.User.query.filter(ORM.User.is_deleted == False).all()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment