Refactor from_table_row methods of core DB models.

[plomtask] / plomtask / todos.py

diff --git a/plomtask/todos.py b/plomtask/todos.py
index 5d46b30d93640e40ba39f6e0cd1ba4b114241396..cfac5b536e91514f02d938fc760818d3d7278129 100644 (file)
--- a/plomtask/todos.py
+++ b/plomtask/todos.py
@@ -1,8 +1,6 @@
 """Actionables."""
 from __future__ import annotations
-from sqlite3 import Row
 from plomtask.db import DatabaseConnection, BaseModel
-from plomtask.days import Day
 from plomtask.processes import Process
 from plomtask.conditions import Condition
 from plomtask.exceptions import (NotFoundException, BadFormatException,
@@ -14,16 +12,15 @@ class Todo(BaseModel):
 
     # pylint: disable=too-many-instance-attributes
 
-    name = 'Todo'
     table_name = 'todos'
     to_save = ['process_id', 'is_done', 'date']
 
     def __init__(self, id_: int | None, process: Process,
-                 is_done: bool, day: Day) -> None:
+                 is_done: bool, date: str) -> None:
         self.set_int_id(id_)
         self.process = process
         self._is_done = is_done
-        self.day = day
+        self.date = date
         self.children: list[Todo] = []
         self.parents: list[Todo] = []
         self.conditions: list[Condition] = []
@@ -34,17 +31,6 @@ class Todo(BaseModel):
             self.fulfills = process.fulfills[:]
             self.undoes = process.undoes[:]
 
-    @classmethod
-    def from_table_row(cls, db_conn: DatabaseConnection, row: Row) -> Todo:
-        """Make Todo from database row, write to DB cache."""
-        todo = cls(id_=row[0],
-                   process=Process.by_id(db_conn, row[1]),
-                   is_done=bool(row[2]),
-                   day=Day.by_date(db_conn, row[3]))
-        assert isinstance(todo.id_, int)
-        db_conn.cached_todos[todo.id_] = todo
-        return todo
-
     @classmethod
     def by_id(cls, db_conn: DatabaseConnection, id_: int | None) -> Todo:
         """Get Todo of .id_=id_ and children (from DB cache if possible)."""
@@ -54,6 +40,11 @@ class Todo(BaseModel):
             todo = None
             for row in db_conn.exec('SELECT * FROM todos WHERE id = ?',
                                     (id_,)):
+                row = list(row)
+                if row[1] == 0:
+                    raise NotFoundException('calling Todo of '
+                                            'unsaved Process')
+                row[1] = Process.by_id(db_conn, row[1])
                 todo = cls.from_table_row(db_conn, row)
                 break
             if todo is None:
@@ -92,7 +83,7 @@ class Todo(BaseModel):
         for row in db_conn.exec('SELECT todo FROM todo_fulfills '
                                 'WHERE condition = ?', (condition.id_,)):
             todo = cls.by_id(db_conn, row[0])
-            if todo.day.date == date:
+            if todo.date == date:
                 enablers += [todo]
         return enablers
 
@@ -104,7 +95,7 @@ class Todo(BaseModel):
         for row in db_conn.exec('SELECT todo FROM todo_undoes '
                                 'WHERE condition = ?', (condition.id_,)):
             todo = cls.by_id(db_conn, row[0])
-            if todo.day.date == date:
+            if todo.date == date:
                 disablers += [todo]
         return disablers
 
@@ -124,11 +115,6 @@ class Todo(BaseModel):
         """Return ID of tasked Process."""
         return self.process.id_
 
-    @property
-    def date(self) -> str:
-        """Return date of used Day."""
-        return self.day.date
-
     @property
     def is_done(self) -> bool:
         """Wrapper around self._is_done so we can control its setter."""