V2アプリ一覧バッグ修正

backend/app/api/api_v1/routers/platform.py

@@ -1,5 +1,7 @@
+from http import HTTPStatus
 from fastapi import Query, Request,Depends, APIRouter, UploadFile,HTTPException,File
-from app.core.operation import log_operation
+from fastapi.responses import JSONResponse
+# from app.core.operation import log_operation
 from app.db import Base,engine
 from app.db.session import get_db
 from app.db.crud import *
@@ -25,9 +27,9 @@ async def apps_list(
     db=Depends(get_db),
 ):
     try:
-        platformapps = get_apps(db)
-        domain = get_activedomain(db, user.id)
        
+        domain = get_activedomain(db, user.id)
+        platformapps = get_apps(db,domain.url)
         kintoneevn = config.KINTONE_ENV(domain)
         headers={config.API_V1_AUTH_KEY:kintoneevn.API_V1_AUTH_VALUE}
         url = f"{kintoneevn.BASE_URL}{config.API_V1_STR}/apps.json"
@@ -44,17 +46,13 @@ async def apps_list(
                 break
             offset += limit
         
-        tempapps = platformapps.copy()
-        for papp in  tempapps:
-           exist = False
-           for kapp in  all_apps:
-               if kapp['appId'] == papp.appid:
-                   exist = True
-                   break
-           if not exist:
-              platformapps.remove(papp)
-
-        return platformapps
+        kintone_apps_dict = {app['appId']: app for app in all_apps}
+        filtered_apps = []
+        for papp in platformapps:
+            if papp.appid in kintone_apps_dict:
+                papp.appname = kintone_apps_dict[papp.appid]["name"]
+                filtered_apps.append(papp)
+        return filtered_apps
     except Exception as e:
         raise APIException('platform:apps',request.url._url,f"Error occurred while get apps:",e)
 
@@ -258,10 +256,11 @@ async def domain_details(
 async def domain_create(
     request: Request,
     domain: DomainBase,
+    user=Depends(get_current_user),
     db=Depends(get_db),
 ):
     try:
-        return create_domain(db, domain)
+        return create_domain(db, domain,user.id)
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while create domain:",e)
 
@@ -354,8 +353,9 @@ async def get_useractivedomain(
 ):
     try:
         # domain = get_activedomain(db, user.id)
-
         domain = get_activedomain(db, userId if userId is not None else user.id)
+        if domain is None:
+            return JSONResponse(content=None,status_code=HTTPStatus.OK)
         return domain
     except Exception as e:
         raise APIException('platform:activedomain',request.url._url,f"Error occurred while get user({user.id}) activedomain:",e)