From 01efc2136cfcb9c6b9567fa1b6460609722802c2 Mon Sep 17 00:00:00 2001
From: DingZQ <zqding@hotmail.com>
Date: Sun, 16 Oct 2022 11:36:22 +0800
Subject: [PATCH] add valve

---
 main.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index 20b0a3c..54738fc 100644
--- a/main.py
+++ b/main.py
@@ -6,6 +6,7 @@ import json
 from platform import node
 from typing import *
 from urllib.request import Request
+from xml.dom import minicompat
 from fastapi import FastAPI, File, UploadFile
 from pydantic import BaseModel
 from starlette.responses import FileResponse, JSONResponse
@@ -526,7 +527,12 @@ async def fast_get_pipe_schema(network: str) -> dict[str, dict[str, Any]]:
 async def fastapi_add_pipe(network: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minor_loss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet:
     ps = { 'id' : pipe,
            'node1' : node1,
-           'node2' : node2
+           'node2' : node2,
+           'length' : length,
+           'diameter' : diameter,
+           'roughness' : roughness,
+           'minor_loss' : minor_loss,
+           'status' : status 
          }   
     return add_pipe(network, ChangeSet(ps))
 
@@ -682,7 +688,15 @@ async def fast_get_valve_schema(network: str) -> dict[str, dict[str, Any]]:
 
 @app.post("/addvalve/")
 async def fastapi_add_valve(network: str, valve: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet:
-    return add_valve(network, valve, node1, node2, diameter, type, setting, minor_loss)
+    ps = { 'id' : valve,
+           'node1' : node1,
+           'node2' : node2,
+           'diameter' : diameter,
+           'type' : type,
+           'setting' : setting,
+           'minor_loss' : minor_loss }
+           
+    return add_valve(network, ChangeSet(ps)) 
 
 @app.post("/deletevalve/")
 async def fastapi_delete_valve(network: str, valve: str) -> ChangeSet: