X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=5901571d6e2e52c1539e48587d6e8ea7590fb1d1;hb=7b6b8d0b93b1d4dd85152e49e7105aacc647327c;hp=80dc97c25ac481089b5760a0c8072af5f755ef08;hpb=696aed8a590fa9c67a6b9c723e2134b2663bd769;p=plomtask

diff --git a/plomtask/todos.py b/plomtask/todos.py
index 80dc97c..5901571 100644
--- a/plomtask/todos.py
+++ b/plomtask/todos.py
@@ -19,7 +19,7 @@ class TodoStepsNode:
     seen: bool
 
 
-class Todo(BaseModel, ConditionsRelations):
+class Todo(BaseModel[int], ConditionsRelations):
     """Individual actionable."""
 
     # pylint: disable=too-many-instance-attributes
@@ -71,11 +71,11 @@ class Todo(BaseModel, ConditionsRelations):
                 todo.parents += [cls.by_id(db_conn, t_id)]
             for name in ('conditions', 'enables', 'disables'):
                 table = f'todo_{name}'
+                assert isinstance(todo.id_, int)
                 for cond_id in db_conn.column_where(table, 'condition',
                                                     'todo', todo.id_):
                     target = getattr(todo, name)
                     target += [Condition.by_id(db_conn, cond_id)]
-        assert isinstance(todo, Todo)
         return todo
 
     @classmethod
@@ -134,7 +134,6 @@ class Todo(BaseModel, ConditionsRelations):
                        if s.parent_step_id is None]
         for child_process_id in [c.process.id_ for c in self.children]:
             if child_process_id in unsatisfied:
-                assert isinstance(child_process_id, int)
                 unsatisfied.remove(child_process_id)
         return unsatisfied
 
@@ -193,7 +192,6 @@ class Todo(BaseModel, ConditionsRelations):
                                   and (c not in potentially_enabled)]:
                     children += [make_node(condition)]
             else:
-                assert isinstance(step, Condition)
                 seen = step.id_ in seen_conditions
                 seen_conditions.add(step.id_)
             return TodoStepsNode(step, is_todo, children, seen)
@@ -233,7 +231,6 @@ class Todo(BaseModel, ConditionsRelations):
             raise NotFoundException('Process of Todo without ID (not saved?)')
         self.save_core(db_conn)
         assert isinstance(self.id_, int)
-        db_conn.cached_todos[self.id_] = self
         db_conn.rewrite_relations('todo_children', 'parent', self.id_,
                                   [[c.id_] for c in self.children])
         db_conn.rewrite_relations('todo_conditions', 'todo', self.id_,