X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fdays.py;h=23201301bbe792042a361d3f970415c622d80627;hb=HEAD;hp=7e6a5cce9177e2450107a111262482b8e5c23c3a;hpb=ef4dfff9ff3002c11ccfef4190999a5e4e513606;p=plomtask diff --git a/plomtask/days.py b/plomtask/days.py index 7e6a5cc..2320130 100644 --- a/plomtask/days.py +++ b/plomtask/days.py @@ -34,17 +34,17 @@ class Day(BaseModel[str]): day.todos = Todo.by_date(db_conn, day.id_) return day - @classmethod - def by_id_or_create(cls, db_conn: DatabaseConnection, id_: str | None - ) -> Day: - """Extend BaseModel.by_id to ensure date name translation.""" - assert isinstance(id_, str) - return super().by_id_or_create(db_conn, valid_date(id_)) - @classmethod def by_id(cls, db_conn: DatabaseConnection, id_: str) -> Day: - """Extend BaseModel.by_id checking for new/lost .todos.""" - day = super().by_id(db_conn, id_) + """Extend BaseModel.by_id + + Checks Todo.days_to_update if we need to a retrieved Day's .todos, + and also ensures we're looking for proper dates and not strings like + "yesterday" by enforcing the valid_date translation. + """ + assert isinstance(id_, str) + possibly_translated_date = valid_date(id_) + day = super().by_id(db_conn, possibly_translated_date) if day.id_ in Todo.days_to_update: Todo.days_to_update.remove(day.id_) day.todos = Todo.by_date(db_conn, day.id_)