X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomtask%2Fdays.py;h=a924bbfeadd2bd895d2f21ac4b7487305fbe771f;hb=e3bfd84f9061d5f03ec5f5764f75e4137505ea45;hp=afdea33760b41df3149c857b306c6e2b447b7df8;hpb=8ae8877e3e2588db76285e7e3ddfb8c7b9948a96;p=plomtask
diff --git a/plomtask/days.py b/plomtask/days.py
index afdea33..a924bbf 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -1,64 +1,77 @@
"""Collecting Day and date-related items."""
from __future__ import annotations
-from datetime import datetime, timedelta
+from typing import Any
from sqlite3 import Row
-from plomtask.exceptions import BadFormatException, NotFoundException
-from plomtask.db import DatabaseConnection
-
-DATE_FORMAT = '%Y-%m-%d'
-
-
-def valid_date(date_str: str) -> str:
- """Validate date against DATE_FORMAT or 'today', return in DATE_FORMAT."""
- if date_str == 'today':
- date_str = todays_date()
- try:
- dt = datetime.strptime(date_str, DATE_FORMAT)
- except (ValueError, TypeError) as e:
- msg = f'Given date of wrong format: {date_str}'
- raise BadFormatException(msg) from e
- return dt.strftime(DATE_FORMAT)
-
-
-def todays_date() -> str:
- """Return current date in DATE_FORMAT."""
- return datetime.now().strftime(DATE_FORMAT)
+from datetime import datetime, timedelta
+from plomtask.db import DatabaseConnection, BaseModel
+from plomtask.todos import Todo
+from plomtask.dating import (DATE_FORMAT, valid_date)
-class Day:
+class Day(BaseModel[str]):
"""Individual days defined by their dates."""
+ table_name = 'days'
+ to_save = ['comment']
def __init__(self, date: str, comment: str = '') -> None:
- self.date = valid_date(date)
+ id_ = valid_date(date)
+ super().__init__(id_)
self.datetime = datetime.strptime(self.date, DATE_FORMAT)
self.comment = comment
-
- def __eq__(self, other: object) -> bool:
- return isinstance(other, self.__class__) and self.date == other.date
+ 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."""
+ day = super().from_table_row(db_conn, row)
+ assert isinstance(day.id_, str)
+ day.todos = Todo.by_date(db_conn, day.id_)
+ return day
+
@classmethod
- def from_table_row(cls, row: Row) -> Day:
- """Make Day from database row."""
- return cls(row[0], row[1])
+ def by_id(cls,
+ db_conn: DatabaseConnection, id_: str | None,
+ create: bool = False,
+ ) -> Day:
+ """Extend BaseModel.by_id checking for new/lost .todos."""
+ day = super().by_id(db_conn, id_, create)
+ 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
- def all(cls, db_conn: DatabaseConnection,
- date_range: tuple[str, str] = ('', ''),
- fill_gaps: bool = False) -> list[Day]:
- """Return list of Days in database within date_range."""
- min_date = '2024-01-01'
- max_date = '2030-12-31'
- start_date = valid_date(date_range[0] if date_range[0] else min_date)
- end_date = valid_date(date_range[1] if date_range[1] else max_date)
- days = []
- sql = 'SELECT * FROM days WHERE date >= ? AND date <= ?'
- for row in db_conn.exec(sql, (start_date, end_date)):
- days += [cls.from_table_row(row)]
+ def by_date_range_filled(cls, db_conn: DatabaseConnection,
+ start: str, end: str) -> list[Day]:
+ """Return days existing and non-existing between dates start/end."""
+ ret = cls.by_date_range_with_limits(db_conn, (start, end), 'id')
+ days, start_date, end_date = ret
+ return cls.with_filled_gaps(days, start_date, end_date)
+
+ @classmethod
+ def with_filled_gaps(cls, days: list[Day], start_date: str, end_date: str
+ ) -> list[Day]:
+ """In days, fill with (un-saved) Days gaps between start/end_date."""
+ if start_date > end_date:
+ return days
days.sort()
- if fill_gaps and len(days) > 1:
+ if start_date not in [d.date for d in days]:
+ days[:] = [Day(start_date)] + days
+ if end_date not in [d.date for d in days]:
+ days += [Day(end_date)]
+ if len(days) > 1:
gapless_days = []
for i, day in enumerate(days):
gapless_days += [day]
@@ -66,18 +79,25 @@ class Day:
while day.next_date != days[i+1].date:
day = Day(day.next_date)
gapless_days += [day]
- days = gapless_days
+ days[:] = gapless_days
return days
- @classmethod
- def by_date(cls, db_conn: DatabaseConnection,
- date: str, create: bool = False) -> Day:
- """Retrieve Day by date if in DB, else return None."""
- for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
- return cls.from_table_row(row)
- if not create:
- raise NotFoundException(f'Day not found for date: {date}')
- return cls(date)
+ @property
+ def date(self) -> str:
+ """Return self.id_ under the assumption it's a date string."""
+ assert isinstance(self.id_, str)
+ return self.id_
+
+ @property
+ def first_of_month(self) -> bool:
+ """Return what month self.date is part of."""
+ assert isinstance(self.id_, str)
+ return self.id_[-2:] == '01'
+
+ @property
+ def month_name(self) -> str:
+ """Return what month self.date is part of."""
+ return self.datetime.strftime('%B')
@property
def weekday(self) -> str:
@@ -96,7 +116,15 @@ class Day:
next_datetime = self.datetime + timedelta(days=1)
return next_datetime.strftime(DATE_FORMAT)
- def save(self, db_conn: DatabaseConnection) -> None:
- """Add (or re-write) self to database."""
- db_conn.exec('REPLACE INTO days VALUES (?, ?)',
- (self.date, self.comment))
+ @property
+ def calendarized_todos(self) -> list[Todo]:
+ """Return only those of self.todos that have .calendarize set."""
+ 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