X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=plomtask%2Fdays.py;h=9f3aa697a831758d0635109446a35e73428b7181;hb=704c00a101fc1922158a3a71a043562d34b696ad;hp=ce112006042681ba059bc5129d7c45bb3d8c6d21;hpb=23c7ff7f9833ff5b0e547c19a4ad85325a5d3400;p=plomtask diff --git a/plomtask/days.py b/plomtask/days.py index ce11200..9f3aa69 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' @@ -28,16 +28,13 @@ 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: - 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 @@ -66,22 +63,10 @@ class Day(BaseModel[str]): 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: - return day - if not create: - raise NotFoundException(f'Day not found for date: {date}') - day = cls(date) - day.cache() - return day - @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 @@ -103,4 +88,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)