diff --git a/backend/app/api/api_v1/routers/kintone.py b/backend/app/api/api_v1/routers/kintone.py index b12af80..5f91e21 100644 --- a/backend/app/api/api_v1/routers/kintone.py +++ b/backend/app/api/api_v1/routers/kintone.py @@ -24,7 +24,7 @@ def getkintoneenv(user = Depends(get_current_user),db = Depends(get_db)): return kintoneevn -def getkintoneformat(user = Depends(get_current_user),db = Depends(get_db)): +def getkintoneformat(db,user = Depends(get_current_user)): #db = SessionLocal() formats = get_kintoneformat(db) #db.close() @@ -627,9 +627,9 @@ async def createapp(request:Request,name:str,env:config.KINTONE_ENV=Depends(getk @r.post("/createappfromexcel",) -async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...),format:int = 0,env = Depends(getkintoneenv)): +async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...),format:int = 0,env = Depends(getkintoneenv),db = Depends(get_db)): try: - mapping = getkintoneformat()[format] + mapping = getkintoneformat(db)[format] except Exception as e: raise APIException('kintone:createappfromexcel',request.url._url, f"Error occurred while get kintone format:",e) @@ -666,9 +666,9 @@ async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(... @r.post("/updateappfromexcel") -async def updateappfromexcel(request:Request,app:str,files:t.List[UploadFile] = File(...),format:int = 0,env = Depends(getkintoneenv)): +async def updateappfromexcel(request:Request,app:str,files:t.List[UploadFile] = File(...),format:int = 0,env = Depends(getkintoneenv),db = Depends(get_db)): try: - mapping = getkintoneformat()[format] + mapping = getkintoneformat(db)[format] except Exception as e: raise APIException('kintone:updateappfromexcel',request.url._url, f"Error occurred while get kintone format:",e)