X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fdays.py;h=a924bbfeadd2bd895d2f21ac4b7487305fbe771f;hb=HEAD;hp=2531a011f1875a4819337adcd7e59c7a08355af4;hpb=5ced0155ad11f5fb87aaa0848402e95f8ff49acd;p=plomtask

diff --git a/plomtask/days.py b/plomtask/days.py
index 2531a01..2320130 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import Any
 from sqlite3 import Row
 from datetime import datetime, timedelta
-from plomtask.exceptions import HandledException
 from plomtask.db import DatabaseConnection, BaseModel
 from plomtask.todos import Todo
 from plomtask.dating import (DATE_FORMAT, valid_date)
@@ -13,17 +12,15 @@ class Day(BaseModel[str]):
     """Individual days defined by their dates."""
     table_name = 'days'
     to_save = ['comment']
+    add_to_dict = ['todos']
+    can_create_by_id = True
 
-    def __init__(self,
-                 date: str,
-                 comment: str = '',
-                 init_empty_todo_list: bool = False
-                 ) -> None:
+    def __init__(self, date: str, comment: str = '') -> None:
         id_ = valid_date(date)
         super().__init__(id_)
         self.datetime = datetime.strptime(self.date, DATE_FORMAT)
         self.comment = comment
-        self.todos: list[Todo] | None = [] if init_empty_todo_list else None
+        self.todos: list[Todo] = []
 
     def __lt__(self, other: Day) -> bool:
         return self.date < other.date
@@ -37,6 +34,22 @@ class Day(BaseModel[str]):
         day.todos = Todo.by_date(db_conn, day.id_)
         return day
 
+    @classmethod
+    def by_id(cls, db_conn: DatabaseConnection, id_: str) -> Day:
+        """Extend BaseModel.by_id
+
+        Checks Todo.days_to_update if we need to a retrieved Day's .todos,
+        and also ensures we're looking for proper dates and not strings like
+        "yesterday" by enforcing the valid_date translation.
+        """
+        assert isinstance(id_, str)
+        possibly_translated_date = valid_date(id_)
+        day = super().by_id(db_conn, possibly_translated_date)
+        if day.id_ in Todo.days_to_update:
+            Todo.days_to_update.remove(day.id_)
+            day.todos = Todo.by_date(db_conn, day.id_)
+        return day
+
     @classmethod
     def by_date_range_filled(cls, db_conn: DatabaseConnection,
                              start: str, end: str) -> list[Day]:
@@ -53,16 +66,16 @@ class Day(BaseModel[str]):
             return days
         days.sort()
         if start_date not in [d.date for d in days]:
-            days[:] = [Day(start_date, init_empty_todo_list=True)] + days
+            days[:] = [Day(start_date)] + days
         if end_date not in [d.date for d in days]:
-            days += [Day(end_date, init_empty_todo_list=True)]
+            days += [Day(end_date)]
         if len(days) > 1:
             gapless_days = []
             for i, day in enumerate(days):
                 gapless_days += [day]
                 if i < len(days) - 1:
                     while day.next_date != days[i+1].date:
-                        day = Day(day.next_date, init_empty_todo_list=True)
+                        day = Day(day.next_date)
                         gapless_days += [day]
             days[:] = gapless_days
         return days
@@ -104,9 +117,12 @@ class Day(BaseModel[str]):
     @property
     def calendarized_todos(self) -> list[Todo]:
         """Return only those of self.todos that have .calendarize set."""
-        if self.todos is None:
-            msg = 'Trying to return from un-initialized Day.todos.'
-            raise HandledException(msg)
-        # pylint: disable=not-an-iterable
-        # (after the above is-None test, self.todos _should_ be iterable!)
         return [t for t in self.todos if t.calendarize]
+
+    @property
+    def total_effort(self) -> float:
+        """"Sum all .performed_effort of self.todos."""
+        total_effort = 0.0
+        for todo in self.todos:
+            total_effort += todo.performed_effort
+        return total_effort