From a3df6c4b379542ea5bfd9c46551f72969de7eb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Mon, 9 Dec 2024 16:54:51 +0900 Subject: [PATCH] bugfix get flow -> get flow by appid --- backend/app/api/api_v1/routers/platform.py | 14 ++++++++------ backend/app/db/cruddb/dbapp.py | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/backend/app/api/api_v1/routers/platform.py b/backend/app/api/api_v1/routers/platform.py index 8895520..c6dac46 100644 --- a/backend/app/api/api_v1/routers/platform.py +++ b/backend/app/api/api_v1/routers/platform.py @@ -236,22 +236,24 @@ async def action_data( raise APIException('platform:actions',request.url._url,f"Error occurred while get actions:",e) @r.get( - "/flow/{flowid}", - response_model=Flow, + "/flow/{appid}",tags=["App"], + response_model=ApiReturnModel[List[Flow|None]], response_model_exclude_none=True, ) async def flow_details( request: Request, - flowid: str, + appid: str, + user=Depends(get_current_active_user), db=Depends(get_db), ): try: - app = get_flow(db, flowid) - return app + domain = domainService.get_default_domain(db, user.id) + if not domain: + return ApiReturnModel(data = None) + return ApiReturnModel(data = appService.get_flow(db, domain.url, appid,user.id)) except Exception as e: raise APIException('platform:flow',request.url._url,f"Error occurred while get flow by flowid:",e) - @r.get( "/flows/{appid}", response_model=List[Flow|None], diff --git a/backend/app/db/cruddb/dbapp.py b/backend/app/db/cruddb/dbapp.py index 6c2751e..ac8f47b 100644 --- a/backend/app/db/cruddb/dbapp.py +++ b/backend/app/db/cruddb/dbapp.py @@ -153,7 +153,7 @@ class dbapp(crudbase): updateuserid = userid, createuserid = userid ) - db.add(flow) + db.add(db_flow) db.commit() db.refresh(db_app) @@ -174,6 +174,9 @@ class dbapp(crudbase): def get_appversions(self,db: Session, domainurl:str,appid:str): return paginate(db,dbappversion.get_appversions(domainurl,appid)) + def get_flow(self,db: Session, domainurl: str, appid:str,userid:int): + return dbflow.get_flows_by_appid(db,domainurl,appid) + def create_flow(self,db: Session, domainurl: str, flow: schemas.FlowIn,userid:int): return dbflow.create_flow(db,domainurl,flow,userid)