Refactor from_table_row methods of core DB models.

[plomtask] / plomtask / days.py

diff --git a/plomtask/days.py b/plomtask/days.py
index 553579e35ee694989433cab6cc0d01310847b180..a21b4ef5535d81597a4b04d2662f6969313c5e9f 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
 
@@ -29,6 +28,7 @@ class Day(BaseModel):
     """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] = ('', ''),
@@ -82,7 +75,9 @@ class Day(BaseModel):
             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)
+            day = cls.from_table_row(db_conn, row)
+            assert isinstance(day, Day)
+            return day
         if not create:
             raise NotFoundException(f'Day not found for date: {date}')
         day = cls(date)