Add Day.comment field.

[plomtask] / plomtask / days.py

diff --git a/plomtask/days.py b/plomtask/days.py
index 17bb46329760beb078a6497d68bd7b0a39a05e3e..ba466b52c792f81029a94f4bc9fcc21718dd500b 100644 (file)
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -19,36 +19,50 @@ def date_valid(date: str):
 class Day:
     """Individual days defined by their dates."""
 
-    def __init__(self, date: str):
+    def __init__(self, date: str, comment: str = ''):
         self.date = date
         self.datetime = date_valid(self.date)
         if not self.datetime:
             raise HandledException(f'Given date of wrong format: {self.date}')
+        self.comment = comment
 
-    def save(self, db_conn: DatabaseConnection):
-        """Add (or re-write) self to database."""
-        db_conn.exec('REPLACE INTO days VALUES (?)', (self.date,))
+    def __eq__(self, other: object):
+        return isinstance(other, self.__class__) and self.date == other.date
+
+    def __lt__(self, other):
+        return self.date < other.date
 
     @classmethod
     def from_table_row(cls, row: Row):
         """Make new Day from database row."""
-        return cls(row[0])
+        return cls(row[0], row[1])
 
     @classmethod
-    def all(cls, db_conn: DatabaseConnection):
-        """Return list of all Days in database."""
+    def all(cls, db_conn: DatabaseConnection,
+            date_range: tuple[str, str] = ('', '')):
+        """Return list of Days in database within date_range."""
+        start_date = date_range[0] if date_range[0] else '2024-01-01'
+        end_date = date_range[1] if date_range[1] else '2030-12-31'
         days = []
-        for row in db_conn.exec('SELECT * FROM days'):
+        sql = 'SELECT * FROM days WHERE date >= ? AND date <= ?'
+        for row in db_conn.exec(sql, (start_date, end_date)):
             days += [cls.from_table_row(row)]
+        days.sort()
         return days
 
+    @classmethod
+    def by_date(cls, db_conn: DatabaseConnection, date: str):
+        """Retrieve Day by date if in DB, else return None."""
+        for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
+            return cls.from_table_row(row)
+        return None
+
     @property
     def weekday(self):
         """Return what weekday matches self.date."""
         return self.datetime.strftime('%A')
 
-    def __eq__(self, other: object):
-        return isinstance(other, self.__class__) and self.date == other.date
-
-    def __lt__(self, other):
-        return self.date < other.date
+    def save(self, db_conn: DatabaseConnection):
+        """Add (or re-write) self to database."""
+        db_conn.exec('REPLACE INTO days VALUES (?, ?)',
+                     (self.date, self.comment))