X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7B%20card_id%20%7D%7D/static/git-favicon.png?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=f5388b58f25ec1237b65b751c8fd5fa352160ddf;hb=HEAD;hp=0125b97809350de3c991d332d80c7adfbaf583ce;hpb=4691a05e64acb2239f9d449b36f4ff5c678a1d6c;p=plomtask diff --git a/plomtask/todos.py b/plomtask/todos.py index 0125b97..cb72640 100644 --- a/plomtask/todos.py +++ b/plomtask/todos.py @@ -1,7 +1,6 @@ """Actionables.""" from __future__ import annotations -from dataclasses import dataclass -from typing import Any +from typing import Any, Set from sqlite3 import Row from plomtask.db import DatabaseConnection, BaseModel from plomtask.processes import Process, ProcessStepsNode @@ -12,20 +11,64 @@ from plomtask.exceptions import (NotFoundException, BadFormatException, from plomtask.dating import valid_date -@dataclass -class TodoNode: +class DictableNode: + """Template for TodoNode, TodoOrStepsNode providing .as_dict_and_refs.""" + # pylint: disable=too-few-public-methods + _to_dict: list[str] = [] + + def __init__(self, *args: Any) -> None: + for i, arg in enumerate(args): + setattr(self, self._to_dict[i], arg) + + @property + def as_dict_and_refs(self) -> tuple[dict[str, object], list[Any]]: + """Return self as json.dumps-ready dict, list of referenced objects.""" + d = {} + refs = [] + for name in self._to_dict: + attr = getattr(self, name) + if hasattr(attr, 'id_'): + d[name] = attr.id_ + continue + if isinstance(attr, list): + d[name] = [] + for item in attr: + item_d, item_refs = item.as_dict_and_refs + d[name] += [item_d] + for item_ref in [r for r in item_refs if r not in refs]: + refs += [item_ref] + continue + d[name] = attr + return d, refs + + +class TodoNode(DictableNode): """Collects what's useful to know for Todo/Condition tree display.""" + # pylint: disable=too-few-public-methods todo: Todo seen: bool children: list[TodoNode] + _to_dict = ['todo', 'seen', 'children'] + + +class TodoOrProcStepNode(DictableNode): + """Collect what's useful for Todo-or-ProcessStep tree display.""" + # pylint: disable=too-few-public-methods + node_id: int + todo: Todo | None + process: Process | None + children: list[TodoOrProcStepNode] # pylint: disable=undefined-variable + fillable: bool = False + _to_dict = ['node_id', 'todo', 'process', 'children', 'fillable'] class Todo(BaseModel[int], ConditionsRelations): """Individual actionable.""" # pylint: disable=too-many-instance-attributes + # pylint: disable=too-many-public-methods table_name = 'todos' - to_save = ['process_id', 'is_done', 'date', 'comment', 'effort', - 'calendarize'] + to_save_simples = ['process_id', 'is_done', 'date', 'comment', 'effort', + 'calendarize'] to_save_relations = [('todo_conditions', 'todo', 'conditions', 0), ('todo_blockers', 'todo', 'blockers', 0), ('todo_enables', 'todo', 'enables', 0), @@ -33,6 +76,13 @@ class Todo(BaseModel[int], ConditionsRelations): ('todo_children', 'parent', 'children', 0), ('todo_children', 'child', 'parents', 1)] to_search = ['comment'] + days_to_update: Set[str] = set() + children: list[Todo] + parents: list[Todo] + sorters = {'doneness': lambda t: t.is_done, + 'title': lambda t: t.title_then, + 'comment': lambda t: t.comment, + 'date': lambda t: t.date} # pylint: disable=too-many-arguments def __init__(self, id_: int | None, @@ -50,8 +100,8 @@ class Todo(BaseModel[int], ConditionsRelations): self.date = valid_date(date) self.comment = comment self.effort = effort - self.children: list[Todo] = [] - self.parents: list[Todo] = [] + self.children = [] + self.parents = [] self.calendarize = calendarize if not self.id_: self.calendarize = self.process.calendarize @@ -70,7 +120,13 @@ class Todo(BaseModel[int], ConditionsRelations): @classmethod def create_with_children(cls, db_conn: DatabaseConnection, process_id: int, date: str) -> Todo: - """Create Todo of process for date, ensure children.""" + """Create Todo of process for date, ensure children demanded by chain. + + At minimum creates Todo of process_id, but checks the respective + Process for its step tree, and walks down that to provide the initial + Todo with all descendants defined there, either adopting existing + Todos, or creating them where necessary. + """ def key_order_func(n: ProcessStepsNode) -> int: assert isinstance(n.process.id_, int) @@ -128,11 +184,9 @@ class Todo(BaseModel[int], ConditionsRelations): assert isinstance(todo.id_, int) for t_id in db_conn.column_where('todo_children', 'child', 'parent', todo.id_): - # pylint: disable=no-member todo.children += [cls.by_id(db_conn, t_id)] for t_id in db_conn.column_where('todo_children', 'parent', 'child', todo.id_): - # pylint: disable=no-member todo.parents += [cls.by_id(db_conn, t_id)] for name in ('conditions', 'blockers', 'enables', 'disables'): table = f'todo_{name}' @@ -211,6 +265,7 @@ class Todo(BaseModel[int], ConditionsRelations): @property def title(self) -> VersionedAttribute: """Shortcut to .process.title.""" + assert isinstance(self.process.title, VersionedAttribute) return self.process.title @property @@ -296,12 +351,17 @@ class Todo(BaseModel[int], ConditionsRelations): if self.effort and self.effort < 0 and self.is_deletable: self.remove(db_conn) return + if self.id_ is None: + self.__class__.days_to_update.add(self.date) super().save(db_conn) + for condition in self.enables + self.disables + self.conditions: + condition.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.') + self.__class__.days_to_update.add(self.date) children_to_remove = self.children[:] parents_to_remove = self.parents[:] for child in children_to_remove: