More refactor of junction

api/s2_junctions.py

@@ -1,10 +1,9 @@
-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 *
-from .utility import *
+import utility
 
 
 def add_junction(name: str, id: str, x: float, y: float, elevation: float) -> ChangeSet:
@@ -14,7 +13,7 @@ def add_junction(name: str, id: str, x: float, y: float, elevation: float) -> Ch
 
 
 def _get_junction(name: str, id: str) -> Row | None:
-    return query(f"select elevation, demand, pattern from junctions where id = '{id}'")
+    return utility.query(name, f"select elevation, demand, pattern from junctions where id = '{id}'")
 
 
 def delete_junction(name: str, id: str) -> ChangeSet:
@@ -69,15 +68,7 @@ def _set_junction(name: str, id: str, key: str, key_type: str, value: str, optio
     if row == None:
         return
 
-    old = decorate(row[key])
-
-    sql = f"update junctions set {key} = {value} where id = '{id}'"
-    undo = f'update junctions set {key} = {old} where id = "{id}"'
-    update(name, sql, undo)
-
-    change = ChangeSet()
-    change.update('junction', id, key, key_type, value)
-    return change
+    return utility.update(name, JUNCTION, 'junctions', 'id', id, key, key_type, row[key], value, optional)
 
 
 def set_junction_elevation(name: str, id: str, elevation: float) -> ChangeSet: