X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomtask%2Fdays.py;h=a924bbfeadd2bd895d2f21ac4b7487305fbe771f;hb=e3bfd84f9061d5f03ec5f5764f75e4137505ea45;hp=155ed03aabdbddacdf481267c04aa9d5a0fc29c0;hpb=344d6c234e50953b36ac9fed2cfce8d4ba64a5b3;p=plomtask
diff --git a/plomtask/days.py b/plomtask/days.py
index 155ed03..a924bbf 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)
@@ -14,43 +13,43 @@ class Day(BaseModel[str]):
table_name = 'days'
to_save = ['comment']
- 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
+ @property
+ def as_dict(self) -> dict[str, object]:
+ """Return self as (json.dumps-coompatible) dict."""
+ d = super().as_dict
+ d['todos'] = [t.as_dict for t in self.todos]
+ return d
+
@classmethod
def from_table_row(cls, db_conn: DatabaseConnection, row: Row | list[Any]
) -> Day:
"""Make from DB row, with linked Todos."""
- # pylint: disable=protected-access
- # (since on ._todo we're only meddling within cls)
day = super().from_table_row(db_conn, row)
assert isinstance(day.id_, str)
- day._todos = Todo.by_date(db_conn, day.id_)
+ day.todos = Todo.by_date(db_conn, day.id_)
return day
@classmethod
def by_id(cls,
db_conn: DatabaseConnection, id_: str | None,
create: bool = False,
- init_empty_todo_list: bool = False
) -> Day:
- """Extend BaseModel.by_id with init_empty_todo_list flag."""
- # pylint: disable=protected-access
- # (since on ._todo we're only meddling within cls)
+ """Extend BaseModel.by_id checking for new/lost .todos."""
day = super().by_id(db_conn, id_, create)
- if init_empty_todo_list and day._todos is None:
- day._todos = []
+ assert day.id_ is not None
+ 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
@@ -69,16 +68,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
@@ -117,14 +116,6 @@ class Day(BaseModel[str]):
next_datetime = self.datetime + timedelta(days=1)
return next_datetime.strftime(DATE_FORMAT)
- @property
- def todos(self) -> list[Todo]:
- """Return self.todos if initialized, else raise Exception."""
- if self._todos is None:
- msg = 'Trying to return from un-initialized Day.todos.'
- raise HandledException(msg)
- return list(self._todos)
-
@property
def calendarized_todos(self) -> list[Todo]:
"""Return only those of self.todos that have .calendarize set."""