X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fdays.py;h=78340e2d13000e7ef49bff1bdc24f27e561993c1;hb=23012cd370777b60a25839788d131173d2abee91;hp=d838039a715677ffb3c9022f82715859d80fd652;hpb=5a5d713ce0b223ab2f6ef34c15bb82b614bdda98;p=plomtask
diff --git a/plomtask/days.py b/plomtask/days.py
index d838039..78340e2 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -1,7 +1,7 @@
"""Collecting Day and date-related items."""
from __future__ import annotations
from datetime import datetime, timedelta
-from plomtask.exceptions import BadFormatException, NotFoundException
+from plomtask.exceptions import BadFormatException
from plomtask.db import DatabaseConnection, BaseModel
DATE_FORMAT = '%Y-%m-%d'
@@ -24,13 +24,13 @@ def todays_date() -> str:
return datetime.now().strftime(DATE_FORMAT)
-class Day(BaseModel):
+class Day(BaseModel[str]):
"""Individual days defined by their dates."""
table_name = 'days'
to_save = ['comment']
- id_type = str
def __init__(self, date: str, comment: str = '') -> None:
+ super().__init__(date)
self.id_: str = valid_date(date)
self.datetime = datetime.strptime(self.date, DATE_FORMAT)
self.comment = comment
@@ -66,21 +66,6 @@ class Day(BaseModel):
days = gapless_days
return days
- @classmethod
- def by_id(cls, db_conn: DatabaseConnection,
- date: str, create: bool = False) -> Day:
- """Retrieve Day by date if in DB (prefer cache), else return None."""
- day, _ = super()._by_id(db_conn, date)
- if day:
- assert isinstance(day, Day)
- return day
- if not create:
- raise NotFoundException(f'Day not found for date: {date}')
- day = cls(date)
- db_conn.cached_days[date] = day
- assert isinstance(day, Day)
- return day
-
@property
def date(self) -> str:
"""Return self.id_ under the assumption it's a date string."""