From 5a2d97b5342baa9efc4bc7dd678b2e74170a686e Mon Sep 17 00:00:00 2001
From: DingZQ <zqding@hotmail.com>
Date: Wed, 19 Oct 2022 19:23:06 +0800
Subject: [PATCH] Fixed setProperties error

---
 main.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 3ec53f9..c108288 100644
--- a/main.py
+++ b/main.py
@@ -351,7 +351,8 @@ async def fastapi_get_reservoir_properties(network: str, reservoir: str) -> dict
     return get_reservoir(network, reservoir)
 
 @app.post("/setreservoirproperties/")
-async def fastapi_set_reservoir_properties(network: str, reservoir: str, props: dict[str, Any]) -> ChangeSet:
+async def fastapi_set_reservoir_properties(network: str, reservoir: str, req: Request) -> ChangeSet:
+    props = await req.json()
     ps = { 'id' : reservoir } | props
     return set_reservoir(network, ChangeSet(ps))
 
@@ -511,11 +512,11 @@ async def fastapi_get_tank_properties(network: str, tank: str) -> dict[str, Any]
     return get_tank(network, tank)
 
 @app.post("/settankproperties/")
-async def fastapi_set_tank_properties(network: str, tank: str, props: dict[str, Any]) -> ChangeSet:
+async def fastapi_set_tank_properties(network: str, tank: str, req: Request) -> ChangeSet:
+    props = await req.json()
     ps = { 'id' : tank } | props
     return set_tank(network, ChangeSet(ps))
 
-
 ############################################################
 # pipe 4.[PIPES]
 ############################################################
@@ -623,7 +624,8 @@ async def fastapi_get_pipe_properties(network: str, pipe: str) -> dict[str, Any]
     return get_pipe(network, pipe)
 
 @app.post("/setpipeproperties/")
-async def fastapi_set_pipe_properties(network: str, pipe: str, props: dict[str, Any]) -> ChangeSet:
+async def fastapi_set_pipe_properties(network: str, pipe: str, req: Request) -> ChangeSet:
+    props = await req.json()
     ps = { 'id' : pipe } | props
     return set_pipe(network, ChangeSet(ps))
     
@@ -674,7 +676,8 @@ async def fastapi_get_pump_properties(network: str, pump: str) -> dict[str, Any]
     return get_pump(network, pump)
 
 @app.post("/setpumpproperties/")
-async def fastapi_set_pump_properties(network: str, pump: str, props: dict[str, Any]) -> ChangeSet:
+async def fastapi_set_pump_properties(network: str, pump: str, req: Request) -> ChangeSet:
+    props = await req.json()
     ps = { 'id' : pump } | props
     return set_pump(network, ChangeSet(ps)) 
 
@@ -768,7 +771,8 @@ async def fastapi_get_valve_properties(network: str, valve: str) -> dict[str, An
     return get_valve(network, valve)
 
 @app.post("/setvalveproperties/")
-async def fastapi_set_valve_properties(network: str, valve: str, props: dict[str, Any]) -> ChangeSet:
+async def fastapi_set_valve_properties(network: str, valve: str, req: Request) -> ChangeSet:
+    props = await req.json()
     ps = { 'id' : valve } | props
     return set_valve(network, ChangeSet(ps))