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

Clean code

Browse Source
This commit is contained in:
WQY\qiong
2023-04-29 15:01:11 +08:00
parent a0166193ef
commit 35d2ce08e1
29 changed files with 133 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/s3_reservoirs.py
View File

@@ -48,7 +48,7 @@ class Reservoir(object):
return { 'type': self.type, 'id': self.id }
def set_reservoir_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _set_reservoir(name: str, cs: ChangeSet) -> DbChangeSet:
old = Reservoir(get_reservoir(name, cs.operations[0]['id']))
raw_new = get_reservoir(name, cs.operations[0]['id'])
@@ -76,10 +76,10 @@ def set_reservoir(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_reservoir(name, cs.operations[0]['id']) == {}:
return ChangeSet()
return execute_command(name, set_reservoir_cmd(name, cs))
return execute_command(name, _set_reservoir(name, cs))
def add_reservoir_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _add_reservoir(name: str, cs: ChangeSet) -> DbChangeSet:
new = Reservoir(cs.operations[0])
redo_sql = f"insert into _node (id, type) values ({new.f_id}, {new.f_type});"
@@ -101,10 +101,10 @@ def add_reservoir(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_reservoir(name, cs.operations[0]['id']) != {}:
return ChangeSet()
return execute_command(name, add_reservoir_cmd(name, cs))
return execute_command(name, _add_reservoir(name, cs))
def delete_reservoir_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _delete_reservoir(name: str, cs: ChangeSet) -> DbChangeSet:
old = Reservoir(get_reservoir(name, cs.operations[0]['id']))
redo_sql = sql_delete_coord(old.id)
@@ -126,7 +126,7 @@ def delete_reservoir(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_reservoir(name, cs.operations[0]['id']) == {}:
return ChangeSet()
return execute_command(name, delete_reservoir_cmd(name, cs))
return execute_command(name, _delete_reservoir(name, cs))
#--------------------------------------------------------------