From 73836d728b4e63fd8fc15443f2244fe97363979f Mon Sep 17 00:00:00 2001
From: DingZQ <zqding@hotmail.com>
Date: Sun, 18 Sep 2022 22:09:14 +0800
Subject: [PATCH] Refine fastapi

---
 .gitignore |  1 +
 main.py    | 85 ++++++++++++++++--------------------------------------
 2 files changed, 26 insertions(+), 60 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6611cc5..0046d56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ __pycache__/
 # epanet
 *.rpt
 *.opt
+.vscode/
diff --git a/main.py b/main.py
index 5c43590..5ff365b 100644
--- a/main.py
+++ b/main.py
@@ -221,41 +221,6 @@ def fastapi_set_reservoir_pattern(name: str, reservoir_id: str, pattern: str) ->
 def fastapi_set_reservoir_coord(name: str, reservoir_id: str, x: float, y: float) -> ChangeSet:
     return set_reservoir_coord(name, reservoir_id, x, y)
 
-############################################################
-# reservoir 3.[RESERVOIRS]
-############################################################
-
-@app.post("/addreservoir/")
-def fastapi_add_reservoir(name: str, reservoir_id: str, x: float, y: float, head: float) -> ChangeSet:
-    return add_reservoir(name, reservoir_id, x, y, head)
-
-@app.post("/deletereservoir/")
-def fastapi_delete_reservoir(name: str, reservoir_id: str) -> ChangeSet:
-    return delete_reservoir(name, reservoir_id)
-
-@app.get("/getreservoirhead/")
-def fastapi_get_reservoir_head(name: str, reservoir_id: str) -> float | None:
-    return get_reservoir_head(name, reservoir_id)
-
-@app.get("/getreservoirpattern/")
-def fastapi_get_reservoir_pattern(name: str, reservoir_id: str) -> str | None:
-    return get_reservoir_pattern(name, reservoir_id)
-
-@app.get("/getreservoircoord/")
-def fastapi_get_reservoir_coord(name: str, reservoir_id: str) -> dict[str, float] | None:
-    return get_reservoir_coord(name, reservoir_id)
-
-@app.get("/getreservoirhead/")
-def fastapi_get_reservoir_head(name: str, reservoir_id: str, head: float) -> ChangeSet:
-    return set_reservoir_head(name, reservoir_id, head)
-
-@app.get("/getreservoirpattern/")
-def fastapi_get_reservoir_pattern(name: str, reservoir_id: str, pattern: str) -> ChangeSet:
-    return set_reservoir_pattern(name, reservoir_id, pattern)
-
-@app.get("/getreservoircoord/")
-def fastapi_get_reservoir_coord(name: str, reservoir_id: str, x: float, y: float) -> ChangeSet:
-    return set_reservoir_coord(name, reservoir_id, x, y)
 
 ############################################################
 # tank 4.[TANKS]
@@ -415,27 +380,27 @@ def fastapi_set_pipe_status(name: str, pipe_id: str, status: float) -> ChangeSet
 ############################################################
 
 @app.post("/addpump/")
-def add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet:
+def fastapi_add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet:
     return add_pump(name, pump_id, node1, node2)
 
 @app.post("/deletepump/")
-def delete_pump(name: str, pump_id: str) -> ChangeSet:
+def fastapi_delete_pump(name: str, pump_id: str) -> ChangeSet:
     return delete_pump(name, pump_id)
 
 @app.get("/getpumpnode1/")
-def get_pump_node1(name: str, pump_id: str) -> str | None:
+def fastapi_get_pump_node1(name: str, pump_id: str) -> str | None:
     return get_pump_node1(name, pump_id)
 
 @app.get("/getpumpnode2/")
-def get_pump_node2(name: str, pump_id: str) -> str | None:
+def fastapi_get_pump_node2(name: str, pump_id: str) -> str | None:
     return get_pump_node2(name, pump_id)
 
 @app.post("/setpumpnode1/")
-def set_pump_node1(name: str, pump_id: str, node1: str) -> ChangeSet:
+def fastapi_set_pump_node1(name: str, pump_id: str, node1: str) -> ChangeSet:
     return set_pump_node1(name, pump_id, node1)
 
 @app.post("/setpumpnode2/")
-def set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet:
+def fastapi_set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet:
     return set_pump_node2(name, pump_id, node2)
 
 
@@ -444,55 +409,55 @@ def set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet:
 ############################################################
 
 @app.post("/addvalve/")
-def add_valve(name: str, valve_id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet:
+def fastapi_add_valve(name: str, valve_id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet:
     return add_valve(name, valve_id, node1, node2, diameter, type, setting, minor_loss)
 
 @app.post("/deletevalve/")
-def delete_valve(name: str, valve_id: str) -> ChangeSet:
+def fastapi_delete_valve(name: str, valve_id: str) -> ChangeSet:
     return delete_valve(name, valve_id)
 
 @app.get("/getvalvenode1/")
-def get_valve_node1(name: str, valve_id: str) -> str | None:
+def fastapi_get_valve_node1(name: str, valve_id: str) -> str | None:
     return get_valve_node1(name, valve_id)
 
 @app.get("/getvalvenode2/")
-def get_valve_node2(name: str, valve_id: str) -> str | None:
+def fastapi_get_valve_node2(name: str, valve_id: str) -> str | None:
     return get_valve_node2(name, valve_id)
 
 @app.get("/getvalvediameter/")
-def get_valve_diameter(name: str, valve_id: str) -> float | None:
+def fastapi_get_valve_diameter(name: str, valve_id: str) -> float | None:
     return get_valve_diameter(name, valve_id)
 
 @app.get("/getvalvetype/")
-def get_valve_type(name: str, valve_id: str) -> str | None:
+def fastapi_get_valve_type(name: str, valve_id: str) -> str | None:
     return get_valve_type(name, valve_id)
 
 @app.get("/getvalvesetting/")
-def get_valve_setting(name: str, valve_id: str) -> float | None:
+def fastapi_get_valve_setting(name: str, valve_id: str) -> float | None:
     return get_valve_setting(name, valve_id)
 
-@app.get("/getvalvesetting/")
-def get_valve_minor_loss(name: str, valve_id: str) -> float | None:
+@app.get("/getvalveminorloss/")
+def fastapi_get_valve_minor_loss(name: str, valve_id: str) -> float | None:
     return get_valve_minor_loss(name, valve_id)
 
-@app.get("/getvalvesetting/")
-def set_valve_node1(name: str, valve_id: str, node1: str) -> ChangeSet:
+@app.post("/setvalvenode1/")
+def fastapi_set_valve_node1(name: str, valve_id: str, node1: str) -> ChangeSet:
     return set_valve_node1(name, valve_id, node1)
 
-@app.get("/getvalvesetting/")
-def set_valve_node2(name: str, valve_id: str, node2: str) -> ChangeSet:
+@app.post("/setvalvenode2/")
+def fastapi_set_valve_node2(name: str, valve_id: str, node2: str) -> ChangeSet:
     return set_valve_node2(name, valve_id, node2)
 
-@app.get("/setvalvediameter/")
-def set_valve_diameter(name: str, valve_id: str, diameter: float) -> ChangeSet:
+@app.post("/setvalvenodediameter/")
+def fastapi_set_valve_diameter(name: str, valve_id: str, diameter: float) -> ChangeSet:
     return set_valve_diameter(name, valve_id, diameter)
 
-@app.get("/setvalvetype/")
-def set_valve_type(name: str, valve_id: str, type: str) -> ChangeSet:
+@app.post("/setvalvetype/")
+def fastapi_set_valve_type(name: str, valve_id: str, type: str) -> ChangeSet:
     return set_valve_type(name, valve_id, type)
 
-@app.get("/setvalvesetting/")
-def set_valve_setting(name: str, valve_id: str, setting: float) -> ChangeSet:
+@app.post("/setvalvesetting/")
+def fastapi_set_valve_setting(name: str, valve_id: str, setting: float) -> ChangeSet:
     return set_valve_setting(name, valve_id, setting)