OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code refactor for change set

Browse Source
This commit is contained in:
WQY\qiong
2022-12-17 09:23:08 +08:00
parent f6c14f1c81
commit b715f330dd
25 changed files with 131 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/s2_junctions.py
View File

@@ -51,7 +51,7 @@ class Junction(object):
return { 'type': self.type, 'id': self.id }
def set_junction_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
def set_junction_cache(name: str, cs: ChangeSet) -> DbChangeSet:
old = Junction(get_junction(name, cs.operations[0]['id']))
raw_new = get_junction(name, cs.operations[0]['id'])
@@ -71,14 +71,14 @@ def set_junction_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
redo_cs = g_update_prefix | new.as_dict()
undo_cs = g_update_prefix | old.as_dict()
return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs])
def set_junction(name: str, cs: ChangeSet) -> ChangeSet:
return execute_command(name, set_junction_cache(name, cs))
def add_junction_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
def add_junction_cache(name: str, cs: ChangeSet) -> DbChangeSet:
new = Junction(cs.operations[0])
redo_sql = f"insert into _node (id, type) values ({new.f_id}, {new.f_type});"
@@ -92,14 +92,14 @@ def add_junction_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
redo_cs = g_add_prefix | new.as_dict()
undo_cs = g_delete_prefix | new.as_id_dict()
return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs])
def add_junction(name: str, cs: ChangeSet) -> ChangeSet:
return execute_command(name, add_junction_cache(name, cs))
def delete_junction_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
def delete_junction_cache(name: str, cs: ChangeSet) -> DbChangeSet:
old = Junction(get_junction(name, cs.operations[0]['id']))
redo_sql = f"delete from coordinates where node = {old.f_id};"
@@ -113,7 +113,7 @@ def delete_junction_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
redo_cs = g_delete_prefix | old.as_id_dict()
undo_cs = g_add_prefix | old.as_dict()
return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs])
def delete_junction(name: str, cs: ChangeSet) -> ChangeSet: