From b56b36ab192b6acce6e2d2ccc6109c8a71109cd4 Mon Sep 17 00:00:00 2001 From: TenzDelek Date: Thu, 26 Mar 2026 10:37:22 +0530 Subject: [PATCH] fix --- api/Assistant/assistant_repository.py | 4 +++- api/Assistant/assistant_service.py | 5 +++-- api/Assistant/assistant_view.py | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/api/Assistant/assistant_repository.py b/api/Assistant/assistant_repository.py index 3825543..91bc250 100644 --- a/api/Assistant/assistant_repository.py +++ b/api/Assistant/assistant_repository.py @@ -7,7 +7,7 @@ import logging from api.error_constant import ErrorConstants -def get_all_assistants(db: Session, skip: int, limit: int) -> Tuple[List[Assistant], int]: +def get_all_assistants(db: Session, skip: int, limit: int, user_email: str) -> Tuple[List[Assistant], int]: db_query = db.query(Assistant).options( load_only( Assistant.id, @@ -18,6 +18,8 @@ def get_all_assistants(db: Session, skip: int, limit: int) -> Tuple[List[Assista Assistant.created_by, Assistant.system_assistance ) + ).filter( + (Assistant.created_by == user_email) | (Assistant.system_assistance == True) ) total = db_query.count() assistants = db_query.offset(skip).limit(limit).all() diff --git a/api/Assistant/assistant_service.py b/api/Assistant/assistant_service.py index 7a5cc7a..845c378 100644 --- a/api/Assistant/assistant_service.py +++ b/api/Assistant/assistant_service.py @@ -70,9 +70,10 @@ def _build_assistant_info_response(assistant) -> AssistantInfoResponse: ) -def get_assistants(skip: 0, limit: 20) -> AssistantResponse: +def get_assistants(token: str, skip: int = 0, limit: int = 20) -> AssistantResponse: + current_user_email = validate_and_extract_user_email(token=token) with SessionLocal() as db_session: - assistants, total = get_all_assistants(db=db_session, skip=skip, limit=limit) + assistants, total = get_all_assistants(db=db_session, skip=skip, limit=limit, user_email=current_user_email) assistants_response = [ _build_assistant_list_item_response(assistant) for assistant in assistants diff --git a/api/Assistant/assistant_view.py b/api/Assistant/assistant_view.py index 21d6ccf..f72aa49 100644 --- a/api/Assistant/assistant_view.py +++ b/api/Assistant/assistant_view.py @@ -16,10 +16,11 @@ ) @assistant_router.get("", status_code=status.HTTP_200_OK) -async def get_all_assistants( +async def get_all_assistants( + authentication_credential: Annotated[HTTPAuthorizationCredentials, Depends(oauth2_scheme)], skip: int = Query(default=0), limit: int = Query(default=10)) -> AssistantResponse: - return get_assistants(skip=skip, limit=limit) + return get_assistants(token=authentication_credential.credentials, skip=skip, limit=limit) @assistant_router.post("", status_code=status.HTTP_201_CREATED) async def create_assistant(