backend変更マージ

backend/app/db/crud.py

@@ -239,14 +239,16 @@ def delete_flow(db: Session, flowid: str):
 
 
 def edit_flow(
-    db: Session, flow: schemas.FlowIn,userid:int
+    db: Session, domainurl: str, flow: schemas.FlowIn,userid:int
 ) -> schemas.Flow:
     db_flow = get_flow(db, flow.flowid)
     if not db_flow:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Flow not found")
+        #見つからない時新規作成
+        return create_flow(db,domainurl,flow,userid)
+    
     db_flow.appid =flow.appid,
     db_flow.eventid=flow.eventid,
-    db_flow.domainurl=flow.domainurl,
+    db_flow.domainurl=domainurl,
     db_flow.name=flow.name,
     db_flow.content=flow.content,
     db_flow.updateuserid = userid,
@@ -266,8 +268,8 @@ def get_flows(db: Session, flowid: str):
 
 def get_flow(db: Session, flowid: str):
     flow = db.query(models.Flow).filter(models.Flow.flowid == flowid).first()
-    if not flow:
-        raise HTTPException(status_code=404, detail="Data not found")
+    # if not flow:
+    #     raise HTTPException(status_code=404, detail="Data not found")
     return flow
 
 def get_flows_by_app(db: Session,domainurl: str, appid: str):

backend/app/db/schemas.py

@@ -67,6 +67,7 @@ class AppList(Base):
     domainurl: str
     appname: str
     appid:str
+    updateuser: UserOut
     version:int
     
 class AppVersion(BaseModel):
@@ -75,6 +76,7 @@ class AppVersion(BaseModel):
     versionname: str
     comment:str
     appid:str
+ 
 
 class TokenData(BaseModel):
     id:int = 0
@@ -122,7 +124,7 @@ class Action(BaseModel):
 
 class FlowIn(BaseModel):
     flowid: str 
-    domainurl:str
+    # domainurl:str
     appid: str 
     appname:str
     eventid: str