Allow 'today' as calendar range limit, and default to today in GET /day of empty...

[plomtask] / plomtask / days.py

diff --git a/plomtask/days.py b/plomtask/days.py
index 071b0b1b27d76b676d02ee4d4530563a5ba547b5..776658e14aa6f7f488eeda7546eb8612c2f50ee0 100644 (file)
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -1,23 +1,84 @@
 """Collecting Day and date-related items."""
 from datetime import datetime
+from sqlite3 import Row
+from plomtask.misc import HandledException
+from plomtask.db import DatabaseConnection
 
 DATE_FORMAT = '%Y-%m-%d'
 
 
+def date_valid(date: str):
+    """Validate date against DATE_FORMAT, return Datetime or None."""
+    try:
+        result = datetime.strptime(date, DATE_FORMAT)
+    except (ValueError, TypeError):
+        return None
+    return result
+
+
+def todays_date():
+    """Return current date in DATE_FORMAT."""
+    return str(datetime.now())[:10]
+
+
 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 = datetime.strptime(date, DATE_FORMAT)
-
-    @property
-    def weekday(self):
-        """Return what weekday matches self.date."""
-        return self.datetime.strftime('%A')
+        self.datetime = date_valid(self.date)
+        if not self.datetime:
+            raise HandledException(f'Given date of wrong format: {self.date}')
+        self.comment = comment
 
     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], row[1])
+
+    @classmethod
+    def all(cls, db_conn: DatabaseConnection,
+            date_range: tuple[str, str] = ('', '')):
+        """Return list of Days in database within date_range."""
+        def date_from_range_element(date_str: str, default: str):
+            if date_str == '':
+                date_str = default
+            elif date_str == 'today':
+                date_str = todays_date()
+            elif not date_valid(date_str):
+                raise HandledException(f'Bad date: {date_str}')
+            return date_str
+        start_date = date_from_range_element(date_range[0], '2024-01-01')
+        end_date = date_from_range_element(date_range[1], '2030-01-01')
+        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, create: bool = False):
+        """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)
+        if create:
+            return cls(date)
+        return None
+
+    @property
+    def weekday(self):
+        """Return what weekday matches self.date."""
+        return self.datetime.strftime('%A')
+
+    def save(self, db_conn: DatabaseConnection):
+        """Add (or re-write) self to database."""
+        db_conn.exec('REPLACE INTO days VALUES (?, ?)',
+                     (self.date, self.comment))