X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=5901571d6e2e52c1539e48587d6e8ea7590fb1d1;hb=23c7ff7f9833ff5b0e547c19a4ad85325a5d3400;hp=336ec0350830ce5dfbdf5e85a92b3945608835d9;hpb=54e6c8bccace28583cf9926aa00917a796628a00;p=plomtask

diff --git a/plomtask/todos.py b/plomtask/todos.py
index 336ec03..5901571 100644
--- a/plomtask/todos.py
+++ b/plomtask/todos.py
@@ -1,6 +1,6 @@
 """Actionables."""
 from __future__ import annotations
-from collections import namedtuple
+from dataclasses import dataclass
 from typing import Any
 from sqlite3 import Row
 from plomtask.db import DatabaseConnection, BaseModel
@@ -10,11 +10,16 @@ from plomtask.exceptions import (NotFoundException, BadFormatException,
                                  HandledException)
 
 
-TodoStepsNode = namedtuple('TodoStepsNode',
-                           ('item', 'is_todo', 'children', 'seen'))
+@dataclass
+class TodoStepsNode:
+    """Collects what's useful to know for Todo/Condition tree display."""
+    item: Todo | Condition
+    is_todo: bool
+    children: list[TodoStepsNode]
+    seen: bool
 
 
-class Todo(BaseModel, ConditionsRelations):
+class Todo(BaseModel[int], ConditionsRelations):
     """Individual actionable."""
 
     # pylint: disable=too-many-instance-attributes
@@ -34,9 +39,9 @@ class Todo(BaseModel, ConditionsRelations):
         self.enables: list[Condition] = []
         self.disables: list[Condition] = []
         if not self.id_:
-            self.conditions = process.conditions[:]
-            self.enables = process.enables[:]
-            self.disables = process.disables[:]
+            self.conditions = self.process.conditions[:]
+            self.enables = self.process.enables[:]
+            self.disables = self.process.disables[:]
 
     @classmethod
     def from_table_row(cls, db_conn: DatabaseConnection,
@@ -66,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
@@ -122,6 +127,16 @@ class Todo(BaseModel, ConditionsRelations):
         """Return ID of tasked Process."""
         return self.process.id_
 
+    @property
+    def unsatisfied_dependencies(self) -> list[int]:
+        """Return Process IDs of .process.explicit_steps not in .children."""
+        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
     def is_done(self) -> bool:
         """Wrapper around self._is_done so we can control its setter."""
@@ -139,6 +154,22 @@ class Todo(BaseModel, ConditionsRelations):
                 for condition in self.disables:
                     condition.is_active = False
 
+    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
+                         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."""
@@ -161,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)
@@ -170,12 +200,14 @@ class Todo(BaseModel, ConditionsRelations):
         return node
 
     def add_child(self, child: Todo) -> None:
-        """Add child to self.children, guard against recursion"""
+        """Add child to self.children, avoid recursion, update parenthoods."""
+
         def walk_steps(node: Todo) -> None:
             if node.id_ == self.id_:
                 raise BadFormatException('bad child choice causes recursion')
             for child in node.children:
                 walk_steps(child)
+
         if self.id_ is None:
             raise HandledException('Can only add children to saved Todos.')
         if child.id_ is None:
@@ -186,13 +218,19 @@ class Todo(BaseModel, ConditionsRelations):
         self.children += [child]
         child.parents += [self]
 
+    def remove_child(self, child: Todo) -> None:
+        """Remove child from self.children, update counter relations."""
+        if child not in self.children:
+            raise HandledException('Cannot remove un-parented child.')
+        self.children.remove(child)
+        child.parents.remove(self)
+
     def save(self, db_conn: DatabaseConnection) -> None:
         """Write self and children to DB and its cache."""
         if self.process.id_ is None:
             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_,