From 39e231663148b96e4c1533b144458fe9f58c9fe2 Mon Sep 17 00:00:00 2001
From: "WQY\\qiong" <qiongyu.wang@outlook.com>
Date: Wed, 22 Mar 2023 21:02:56 +0800
Subject: [PATCH] Guard valve

---
 api/s7_valves.py  | 16 +++++++++++++++-
 test_tjnetwork.py |  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/api/s7_valves.py b/api/s7_valves.py
index 5ab210b..b63955e 100644
--- a/api/s7_valves.py
+++ b/api/s7_valves.py
@@ -21,7 +21,9 @@ def get_valve_schema(name: str) -> dict[str, dict[str, Any]]:
 
 
 def get_valve(name: str, id: str) -> dict[str, Any]:
-    p = read(name, f"select * from valves where id = '{id}'")
+    p = try_read(name, f"select * from valves where id = '{id}'")
+    if p == None:
+        return {}
     d = {}
     d['id'] = str(p['id'])
     d['node1'] = str(p['node1'])
@@ -81,6 +83,10 @@ def set_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
 
 
 def set_valve(name: str, cs: ChangeSet) -> ChangeSet:
+    if 'id' not in cs.operations[0]:
+        return ChangeSet()
+    if get_valve(name, cs.operations[0]['id']) == {}:
+        return ChangeSet()
     return execute_command(name, set_valve_cmd(name, cs))
 
 
@@ -100,6 +106,10 @@ def add_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
 
 
 def add_valve(name: str, cs: ChangeSet) -> ChangeSet:
+    if 'id' not in cs.operations[0]:
+        return ChangeSet()
+    if get_valve(name, cs.operations[0]['id']) != {}:
+        return ChangeSet()
     return execute_command(name, add_valve_cmd(name, cs))
 
 
@@ -119,6 +129,10 @@ def delete_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
 
 
 def delete_valve(name: str, cs: ChangeSet) -> ChangeSet:
+    if 'id' not in cs.operations[0]:
+        return ChangeSet()
+    if get_valve(name, cs.operations[0]['id']) == {}:
+        return ChangeSet()
     return execute_command(name, delete_valve_cmd(name, cs))
 
 
diff --git a/test_tjnetwork.py b/test_tjnetwork.py
index 7f0b9d4..c95e66c 100644
--- a/test_tjnetwork.py
+++ b/test_tjnetwork.py
@@ -1367,6 +1367,8 @@ class TestApi:
         assert is_junction(p, 'j3')
         assert is_junction(p, 'j4')
 
+        assert get_valve(p, 'v0') == {}
+
         add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': '0.1', 'minor_loss': 0.5 }))
         v0 = get_valve(p, 'v0')
         assert v0['node1'] == 'j1'
@@ -1414,6 +1416,8 @@ class TestApi:
         links = get_links(p)
         assert len(links) == 0
 
+        assert get_valve(p, 'v0') == {}
+
         self.leave(p)