Clean junction and reservoir

api/s2_junctions.py

@@ -1,6 +1,5 @@
 from psycopg.rows import Row
 from .s0_base import *
-from .operation import *
 from .change_set import ChangeSet
 from .s24_coordinates import *
 import utility
@@ -79,6 +78,9 @@ def set_junction_demand(name: str, id: str, demand: float) -> ChangeSet:
 
 
 def set_junction_pattern(name: str, id: str, pattern: str) -> ChangeSet:
+    if not is_pattern(name, pattern):
+        return ChangeSet()
+
     return _set_junction(name, id, 'pattern', 'str', pattern, True)
 
 

api/s3_reservoirs.py

@@ -1,7 +1,5 @@
-from psycopg.rows import dict_row, Row
-from .connection import g_conn_dict as conn
+from psycopg.rows import Row
 from .s0_base import *
-from .operation import *
 from .change_set import ChangeSet
 from .s24_coordinates import *
 import utility
@@ -14,7 +12,7 @@ def add_reservoir(name: str, id: str, x: float, y: float, head: float) -> Change
 
 
 def _get_reservoir(name: str, id: str) -> Row | None:
-    return utility.query(f"select head, pattern from reservoirs where id = '{id}'")
+    return utility.query(name, f"select head, pattern from reservoirs where id = '{id}'")
 
 
 def delete_reservoir(name: str, id: str) -> ChangeSet:
@@ -67,6 +65,9 @@ def set_reservoir_head(name: str, id: str, head: float) -> ChangeSet:
 
 
 def set_reservoir_pattern(name: str, id: str, pattern: str) -> ChangeSet:
+    if not is_pattern(name, id):
+        return ChangeSet()
+
     return _set_reservoir(name, id, 'pattern', 'str', pattern, True)