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 89c957eef7ee49746e079d91ac3db3fa8d178760..776658e14aa6f7f488eeda7546eb8612c2f50ee0 100644 (file)
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -16,6 +16,11 @@ def date_valid(date: str):
     return result
 
 
+def todays_date():
+    """Return current date in DATE_FORMAT."""
+    return str(datetime.now())[:10]
+
+
 class Day:
     """Individual days defined by their dates."""
 
@@ -41,8 +46,16 @@ class Day:
     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'
+        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)):