home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Overhaul as_dict generation to avoid endless nesting of objects.
[plomtask]
/
plomtask
/
processes.py
diff --git
a/plomtask/processes.py
b/plomtask/processes.py
index 06ee4ba9b9c2a3011019b03b1b0e21633fce780c..ebe781e8fb83e09699e38532c0c2c7b3a9a2e1f2 100644
(file)
--- a/
plomtask/processes.py
+++ b/
plomtask/processes.py
@@
-34,6
+34,7
@@
class Process(BaseModel[int], ConditionsRelations):
('process_step_suppressions', 'process',
'suppressed_steps', 0)]
to_search = ['title.newest', 'description.newest']
('process_step_suppressions', 'process',
'suppressed_steps', 0)]
to_search = ['title.newest', 'description.newest']
+ can_create_by_id = True
def __init__(self, id_: int | None, calendarize: bool = False) -> None:
BaseModel.__init__(self, id_)
def __init__(self, id_: int | None, calendarize: bool = False) -> None:
BaseModel.__init__(self, id_)
@@
-46,16
+47,21
@@
class Process(BaseModel[int], ConditionsRelations):
self.calendarize = calendarize
self.n_owners: int | None = None # only set by from_table_row
self.calendarize = calendarize
self.n_owners: int | None = None # only set by from_table_row
+ @property
+ def as_dict(self) -> dict[str, object]:
+ """Return self as (json.dumps-coompatible) dict."""
+ d = super().as_dict
+ assert isinstance(d['_library'], dict)
+ d['explicit_steps'] = [s.as_dict_into_reference(d['_library'])
+ for s in self.explicit_steps]
+ return d
+
@classmethod
def from_table_row(cls, db_conn: DatabaseConnection,
row: Row | list[Any]) -> Process:
"""Make from DB row, with dependencies."""
process = super().from_table_row(db_conn, row)
@classmethod
def from_table_row(cls, db_conn: DatabaseConnection,
row: Row | list[Any]) -> Process:
"""Make from DB row, with dependencies."""
process = super().from_table_row(db_conn, row)
- assert isinstance(process.id_, int)
- for name in ('title', 'description', 'effort'):
- table = f'process_{name}s'
- for row_ in db_conn.row_where(table, 'parent', process.id_):
- getattr(process, name).history_from_row(row_)
+ assert process.id_ is not None
for name in ('conditions', 'blockers', 'enables', 'disables'):
table = f'process_{name}'
assert isinstance(process.id_, int)
for name in ('conditions', 'blockers', 'enables', 'disables'):
table = f'process_{name}'
assert isinstance(process.id_, int)
@@
-218,7
+224,7
@@
class ProcessStep(BaseModel[int]):
self.parent_step_id = parent_step_id
def save(self, db_conn: DatabaseConnection) -> None:
self.parent_step_id = parent_step_id
def save(self, db_conn: DatabaseConnection) -> None:
- """
Remove from DB
, and owner's .explicit_steps."""
+ """
Update into DB/cache
, and owner's .explicit_steps."""
super().save(db_conn)
owner = Process.by_id(db_conn, self.owner_id)
if self not in owner.explicit_steps:
super().save(db_conn)
owner = Process.by_id(db_conn, self.owner_id)
if self not in owner.explicit_steps: