Re-write caching.

[plomtask] / plomtask / days.py

diff --git a/plomtask/days.py b/plomtask/days.py
index 553579e35ee694989433cab6cc0d01310847b180..5fe984b7c49596121246bb7e822c8b4bb1536139 100644 (file)
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -1,7 +1,6 @@
 """Collecting Day and date-related items."""
 from __future__ import annotations
 from datetime import datetime, timedelta
-from sqlite3 import Row
 from plomtask.exceptions import BadFormatException, NotFoundException
 from plomtask.db import DatabaseConnection, BaseModel
 
@@ -25,10 +24,11 @@ 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:
         self.id_: str = valid_date(date)
@@ -41,13 +41,6 @@ class Day(BaseModel):
     def __lt__(self, other: Day) -> bool:
         return self.date < other.date
 
-    @classmethod
-    def from_table_row(cls, db_conn: DatabaseConnection, row: Row) -> Day:
-        """Make Day from database row, write to cache."""
-        day = cls(row[0], row[1])
-        db_conn.cached_days[day.date] = day
-        return day
-
     @classmethod
     def all(cls, db_conn: DatabaseConnection,
             date_range: tuple[str, str] = ('', ''),
@@ -58,9 +51,9 @@ class Day(BaseModel):
         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 date FROM days WHERE date >= ? AND date <= ?'
+        sql = 'SELECT id FROM days WHERE id >= ? AND id <= ?'
         for row in db_conn.exec(sql, (start_date, end_date)):
-            days += [cls.by_date(db_conn, row[0])]
+            days += [cls.by_id(db_conn, row[0])]
         days.sort()
         if fill_gaps and len(days) > 1:
             gapless_days = []
@@ -74,19 +67,17 @@ class Day(BaseModel):
         return days
 
     @classmethod
-    def by_date(cls, db_conn: DatabaseConnection,
-                date: str, create: bool = False) -> Day:
+    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."""
-        if date in db_conn.cached_days.keys():
-            day = db_conn.cached_days[date]
+        day, _ = super()._by_id(db_conn, date)
+        if day:
             assert isinstance(day, Day)
             return day
-        for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
-            return cls.from_table_row(db_conn, row)
         if not create:
             raise NotFoundException(f'Day not found for date: {date}')
         day = cls(date)
-        db_conn.cached_days[date] = day
+        day.cache()
         assert isinstance(day, Day)
         return day