feat:ボタンをスペースに配置

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

@@ -217,7 +217,9 @@ def deoployappfromkintone(app:str,revision:str,c:config.KINTONE_ENV):
     data = {"apps":[{"app":app,"revision":revision}],"revert": False}
     r = httpx.post(url,headers=headers,data=json.dumps(data))
     return r.json
-    
+
+# 既定項目に含めるアプリのフィールドのみ取得する
+# スペース、枠線、ラベルを含まない    
 def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
     headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
     params = {"app":app}
@@ -225,6 +227,44 @@ def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
 
+# フォームに配置するフィールドのみ取得する
+# スペース、枠線、ラベルも含める
+def getformfromkintone(app:str,c:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+    params = {"app":app}
+    url = f"{c.BASE_URL}{config.API_V1_STR}/form.json"
+    r = httpx.get(url,headers=headers,params=params)
+    return r.json()
+
+
+def merge_kintone_fields(fields_response: dict, form_response: dict) -> dict:
+    fields_properties = fields_response.get('properties', {})
+    form_properties = form_response.get('properties', [])
+
+    merged_properties = {k: v for k, v in fields_properties.items()}
+
+    for index, form_field in enumerate(form_properties):
+        code = form_field.get('code')
+        if code:
+            if code and code not in merged_properties:
+                merged_properties[code] = form_field
+        else:
+            element_id = form_field.get('elementId')
+            if element_id:
+                key = element_id
+                form_field['code']=element_id
+                form_field['label']=form_field.get('type')
+            # else:
+            #     key = f"{form_field.get('type')}_{index}"
+                merged_properties[key] = form_field 
+
+    merged_response = {
+        'revision': fields_response.get('revision', ''),
+        'properties': merged_properties
+    }
+    
+    return merged_response
+
 def analysefields(excel,kintone):
     updatefields={}
     addfields={}
@@ -482,6 +522,15 @@ async def appfields(request:Request,app:str,env = Depends(getkintoneenv)):
     except Exception as e:
        raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAM}->{app}):",e) 
 
+@r.get("/allfields")
+async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
+    try:
+        field_resp = getfieldsfromkintone(app,env)
+        form_resp = getformfromkintone(app,env)
+        return merge_kintone_fields(field_resp,form_resp)
+    except Exception as e:
+       raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAM}->{app}):",e) 
+
 @r.get("/appprocess")
 async def appprocess(request:Request,app:str,env = Depends(getkintoneenv)):
     try: