X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=5901571d6e2e52c1539e48587d6e8ea7590fb1d1;hb=7eb81e526c45118a295dbfc12be01f92dc809974;hp=ed78ca947b359286456e7dcc4c664fcb32961c12;hpb=e825a876e82ffbedf0234f4dfb6d6055d9e29241;p=plomtask

diff --git a/plomtask/todos.py b/plomtask/todos.py
index ed78ca9..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
@@ -130,12 +130,11 @@ class Todo(BaseModel, ConditionsRelations):
     @property
     def unsatisfied_dependencies(self) -> list[int]:
         """Return Process IDs of .process.explicit_steps not in .children."""
-        child_process_ids = {c.process.id_ for c in self.children}
-        unsatisfied: list[int] = []
-        for process_id in [s.step_process_id
-                           for s in self.process.explicit_steps]:
-            if process_id not in child_process_ids:
-                unsatisfied += [process_id]
+        unsatisfied = [s.step_process_id for s in self.process.explicit_steps
+                       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:
+                unsatisfied.remove(child_process_id)
         return unsatisfied
 
     @property
@@ -158,10 +157,19 @@ class Todo(BaseModel, ConditionsRelations):
     def adopt_from(self, todos: list[Todo]) -> None:
         """As far as possible, fill unsatisfied dependencies from todos."""
         for process_id in self.unsatisfied_dependencies:
-            for todo in [t for t in todos if t.process.id_ == process_id]:
+            for todo in [t for t in todos if t.process.id_ == process_id
+                         and t not in self.children]:
                 self.add_child(todo)
                 break
 
+    def make_missing_children(self, db_conn: DatabaseConnection) -> None:
+        """Fill unsatisfied dependencies with new Todos."""
+        for process_id in self.unsatisfied_dependencies:
+            process = Process.by_id(db_conn, process_id)
+            todo = self.__class__(None, process, False, self.date)
+            todo.save(db_conn)
+            self.add_child(todo)
+
     def get_step_tree(self, seen_todos: set[int],
                       seen_conditions: set[int]) -> TodoStepsNode:
         """Return tree of depended-on Todos and Conditions."""
@@ -184,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)
@@ -224,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_,