Commit 5f6ba5f1 authored by deepdey's avatar deepdey

chore: remove is_delete from user orm

parent fd35a3ca
...@@ -5,15 +5,15 @@ from app.app_config.constant import RoleTypeEnum ...@@ -5,15 +5,15 @@ from app.app_config.constant import RoleTypeEnum
def get_user_by_username(username: str) -> ORM.User | None: def get_user_by_username(username: str) -> ORM.User | None:
return ORM.User.query.filter_by(username=username, is_deleted=False).first() return ORM.User.query.filter_by(username=username).first()
def get_user_by_email(email: str) -> ORM.User | None: def get_user_by_email(email: str) -> ORM.User | None:
return ORM.User.query.filter_by(email=email, is_deleted=False).first() return ORM.User.query.filter_by(email=email).first()
def get_user_by_id(id: int) -> ORM.User | None: def get_user_by_id(id: int) -> ORM.User | None:
return ORM.User.query.filter_by(id=id, is_deleted=False).first() return ORM.User.query.filter_by(id=id).first()
def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None: def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
...@@ -24,14 +24,13 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None: ...@@ -24,14 +24,13 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value: if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
return ORM.User.query.filter( return ORM.User.query.filter(
ORM.User.is_deleted == False,
ORM.User.id == user_id, ORM.User.id == user_id,
ORM.User.project_id == admin_user.project_id, ORM.User.project_id == admin_user.project_id,
).first() ).first()
else: else:
# return all user data for super admin # return all user data for super admin
return ORM.User.query.filter( return ORM.User.query.filter(
ORM.User.is_deleted == False, ORM.User.id == user_id ORM.User.id == user_id
).first() ).first()
...@@ -43,11 +42,11 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]: ...@@ -43,11 +42,11 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value: if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
return ORM.User.query.filter( return ORM.User.query.filter(
ORM.User.is_deleted == False, ORM.User.project_id == admin_user.project_id ORM.User.project_id == admin_user.project_id
).all() ).all()
else: else:
# return all user data for super admin # return all user data for super admin
return ORM.User.query.filter(ORM.User.is_deleted == False).all() return ORM.User.query.all()
def map_user_role(admin_id: int, user_id: int, role_id: int) -> None: def map_user_role(admin_id: int, user_id: int, role_id: int) -> None:
......
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