From 9c9b5aca95da0e25701bfc00a062996415eab8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Fri, 24 Jan 2025 16:56:40 +0900 Subject: [PATCH 1/2] bugfix kintone createappjs --- backend/app/db/cruddb/dbapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/db/cruddb/dbapp.py b/backend/app/db/cruddb/dbapp.py index 512ed77..d741886 100644 --- a/backend/app/db/cruddb/dbapp.py +++ b/backend/app/db/cruddb/dbapp.py @@ -182,7 +182,7 @@ 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): + def get_flow(self,db: Session, domainurl: str, appid:str): return dbflow.get_flows_by_appid(db,domainurl,appid) def create_flow(self,db: Session, domainurl: str, flow: schemas.FlowIn,userid:int): From 3eedbf75649aea0b33ca8a3cbeab886cd188e9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Fri, 24 Jan 2025 16:57:24 +0900 Subject: [PATCH 2/2] bugfix kintone createappjs --- backend/app/api/api_v1/routers/kintone.py | 10 +++++----- backend/app/api/api_v1/routers/platform.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/app/api/api_v1/routers/kintone.py b/backend/app/api/api_v1/routers/kintone.py index 5fe0622..af1349d 100644 --- a/backend/app/api/api_v1/routers/kintone.py +++ b/backend/app/api/api_v1/routers/kintone.py @@ -12,7 +12,7 @@ from app.core.dbmanager import get_db from app.db.crud import get_flows_by_app,get_kintoneformat from app.core.auth import get_current_active_user,get_current_user from app.core.apiexception import APIException -from app.db.cruddb import domainService +from app.db.cruddb import domainService,appService kinton_router = r = APIRouter() @@ -452,10 +452,10 @@ def getTempPath(filename): fpath = os.path.join(rootdir,"Temp",filename) return fpath -def createappjs(domain_url,app): - db = SessionLocal() - flows = get_flows_by_app(db,domain_url,app) - db.close() +def createappjs(domain_url,app,db = Depends(get_db)): + #db = SessionLocal() + flows = appService.get_flow(domain_url,app) #get_flows_by_app(db,domain_url,app) + #db.close() content={} for flow in flows: content[flow.eventid] = {'flowid':flow.flowid,'name':flow.name,'content':flow.content} diff --git a/backend/app/api/api_v1/routers/platform.py b/backend/app/api/api_v1/routers/platform.py index 91a5ebd..01f1fde 100644 --- a/backend/app/api/api_v1/routers/platform.py +++ b/backend/app/api/api_v1/routers/platform.py @@ -251,7 +251,7 @@ async def flow_details( domainurl = domainCacheService.get_default_domainurl(db,user.id) if not domainurl: return ApiReturnModel(data = None) - return ApiReturnModel(data = appService.get_flow(db, domainurl, appid,user.id)) + return ApiReturnModel(data = appService.get_flow(db, domainurl, appid)) except Exception as e: raise APIException('platform:flow',request.url._url,f"Error occurred while get flow by flowid:",e) @@ -271,7 +271,7 @@ async def flow_list( if not domainurl: return [] #flows = get_flows_by_app(db, domainurl, appid) - flows = appService.get_flow(db,domainurl,appid,user.id) + flows = appService.get_flow(db,domainurl,appid) return flows except Exception as e: raise APIException('platform:flow',request.url._url,f"Error occurred while get flow by appid:",e)