X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=bffa23ae8c46ae02004344e7c206a4e7104050a0;hb=3346c7fab2fda82b290d245798f4537b43abb012;hp=0fea23445ac1881a18ea87eca95cba7f03510f95;hpb=e150bee233a648950061b716dc1780581105ede6;p=plomtask

diff --git a/plomtask/todos.py b/plomtask/todos.py
index 0fea234..bffa23a 100644
--- a/plomtask/todos.py
+++ b/plomtask/todos.py
@@ -26,6 +26,7 @@ class Todo(BaseModel[int], ConditionsRelations):
     to_save = ['process_id', 'is_done', 'date', 'comment', 'effort',
                'calendarize']
     to_save_relations = [('todo_conditions', 'todo', 'conditions'),
+                         ('todo_blockers', 'todo', 'blockers'),
                          ('todo_enables', 'todo', 'enables'),
                          ('todo_disables', 'todo', 'disables'),
                          ('todo_children', 'parent', 'children'),
@@ -38,7 +39,8 @@ class Todo(BaseModel[int], ConditionsRelations):
                  date: str, comment: str = '',
                  effort: None | float = None,
                  calendarize: bool = False) -> None:
-        super().__init__(id_)
+        BaseModel.__init__(self, id_)
+        ConditionsRelations.__init__(self)
         if process.id_ is None:
             raise NotFoundException('Process of Todo without ID (not saved?)')
         self.process = process
@@ -49,15 +51,34 @@ class Todo(BaseModel[int], ConditionsRelations):
         self.children: list[Todo] = []
         self.parents: list[Todo] = []
         self.calendarize = calendarize
-        self.conditions: list[Condition] = []
-        self.enables: list[Condition] = []
-        self.disables: list[Condition] = []
         if not self.id_:
             self.calendarize = self.process.calendarize
             self.conditions = self.process.conditions[:]
+            self.blockers = self.process.blockers[:]
             self.enables = self.process.enables[:]
             self.disables = self.process.disables[:]
 
+    @classmethod
+    def create_with_children(cls, db_conn: DatabaseConnection, date: str,
+                             process_ids: list[int]) -> list[Todo]:
+        """Create Todos of process_ids for date, ensure children."""
+        new_todos = []
+        for process_id in process_ids:
+            process = Process.by_id(db_conn, process_id)
+            todo = Todo(None, process, False, date)
+            todo.save(db_conn)
+            new_todos += [todo]
+        nothing_to_adopt = False
+        while not nothing_to_adopt:
+            nothing_to_adopt = True
+            existing_todos = Todo.by_date(db_conn, date)
+            for todo in new_todos:
+                if todo.adopt_from(existing_todos):
+                    nothing_to_adopt = False
+                todo.make_missing_children(db_conn)
+                todo.save(db_conn)
+        return new_todos
+
     @classmethod
     def from_table_row(cls, db_conn: DatabaseConnection,
                        row: Row | list[Any]) -> Todo:
@@ -77,7 +98,7 @@ class Todo(BaseModel[int], ConditionsRelations):
                                          'child', todo.id_):
             # pylint: disable=no-member
             todo.parents += [cls.by_id(db_conn, t_id)]
-        for name in ('conditions', 'enables', 'disables'):
+        for name in ('conditions', 'blockers', 'enables', 'disables'):
             table = f'todo_{name}'
             assert isinstance(todo.id_, int)
             for cond_id in db_conn.column_where(table, 'condition',
@@ -103,6 +124,18 @@ class Todo(BaseModel[int], ConditionsRelations):
         for condition in self.conditions:
             if not condition.is_active:
                 return False
+        for condition in self.blockers:
+            if condition.is_active:
+                return False
+        return True
+
+    @property
+    def is_deletable(self) -> bool:
+        """Decide whether self be deletable (not if preserve-worthy values)."""
+        if self.comment:
+            return False
+        if self.effort and self.effort >= 0:
+            return False
         return True
 
     @property
@@ -155,10 +188,9 @@ class Todo(BaseModel[int], ConditionsRelations):
 
     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)
+        new_todos = self.__class__.create_with_children(
+                db_conn, self.date, self.unsatisfied_dependencies)
+        for todo in new_todos:
             self.add_child(todo)
 
     def get_step_tree(self, seen_todos: set[int]) -> TodoNode:
@@ -201,8 +233,17 @@ class Todo(BaseModel[int], ConditionsRelations):
         self.children.remove(child)
         child.parents.remove(self)
 
+    def save(self, db_conn: DatabaseConnection) -> None:
+        """On save calls, also check if auto-deletion by effort < 0."""
+        if self.effort and self.effort < 0 and self.is_deletable:
+            self.remove(db_conn)
+            return
+        super().save(db_conn)
+
     def remove(self, db_conn: DatabaseConnection) -> None:
         """Remove from DB, including relations."""
+        if not self.is_deletable:
+            raise HandledException('Cannot remove non-deletable Todo.')
         children_to_remove = self.children[:]
         parents_to_remove = self.parents[:]
         for child in children_to_remove: