X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fdays.py;h=8dd384349bd1419a16b19971ee4d9aa81deff796;hb=a0244482692edf794960f3c2af9461be2ad15e8a;hp=78340e2d13000e7ef49bff1bdc24f27e561993c1;hpb=8570f4ce4d44b813a1f02b72c5c45a57d2003bae;p=plomtask
diff --git a/plomtask/days.py b/plomtask/days.py
index 78340e2..8dd3843 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -5,6 +5,8 @@ from plomtask.exceptions import BadFormatException
from plomtask.db import DatabaseConnection, BaseModel
DATE_FORMAT = '%Y-%m-%d'
+MIN_RANGE_DATE = '2024-01-01'
+MAX_RANGE_DATE = '2030-12-31'
def valid_date(date_str: str) -> str:
@@ -30,14 +32,11 @@ class Day(BaseModel[str]):
to_save = ['comment']
def __init__(self, date: str, comment: str = '') -> None:
- super().__init__(date)
- self.id_: str = 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
-
def __lt__(self, other: Day) -> bool:
return self.date < other.date
@@ -45,7 +44,14 @@ class Day(BaseModel[str]):
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."""
+ """Return list of Days in database within (open) date_range interval.
+
+ If no range values provided, defaults them to MIN_RANGE_DATE and
+ MAX_RANGE_DATE. Also knows to properly interpret 'today' as value.
+
+ On fill_gaps=True, will instantiate (without saving) Days of all dates
+ within the date range that don't exist yet.
+ """
min_date = '2024-01-01'
max_date = '2030-12-31'
start_date = valid_date(date_range[0] if date_range[0] else min_date)
@@ -69,6 +75,7 @@ class Day(BaseModel[str]):
@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
@@ -90,4 +97,4 @@ class Day(BaseModel[str]):
def save(self, db_conn: DatabaseConnection) -> None:
"""Add (or re-write) self to DB and cache."""
- self.save_core(db_conn, update_with_lastrowid=False)
+ self.save_core(db_conn)