From 500d770ced29360b68e4474415f3aa49c46313b9 Mon Sep 17 00:00:00 2001 From: SaintShit Date: Mon, 15 Jul 2024 21:30:13 +0330 Subject: [PATCH] fix: add admin arg to crud.get_users --- app/__init__.py | 2 +- app/db/crud.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 87791058..2e7c2995 100755 --- a/app/__init__.py +++ b/app/__init__.py @@ -11,7 +11,7 @@ from config import DOCS, XRAY_SUBSCRIPTION_PATH -__version__ = "0.5.1" +__version__ = "0.5.2" app = FastAPI( diff --git a/app/db/crud.py b/app/db/crud.py index 8a533c10..89759737 100644 --- a/app/db/crud.py +++ b/app/db/crud.py @@ -128,6 +128,7 @@ def get_users(db: Session, search: Optional[str] = None, status: Optional[Union[UserStatus, list]] = None, sort: Optional[List[UsersSortingOptions]] = None, + admin: Optional[Admin] = None, admins: Optional[List[str]] = None, reset_strategy: Optional[Union[UserDataLimitResetStrategy, list]] = None, return_with_count: bool = False) -> Union[List[User], Tuple[List[User], int]]: @@ -151,6 +152,9 @@ def get_users(db: Session, else: query = query.filter(User.data_limit_reset_strategy == reset_strategy) + if admin: + query = query.filter(User.admin == admin) + if admins: query = query.filter(User.admin.has(Admin.username.in_(admins)))