X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fdays.py;h=d7083b4310bf76c168f6f33d29cf55c8ada7a29f;hb=f92de64d072009c8c4bf96b9eeb9fa245045662b;hp=fe1ba44e80e9a1c4182130b870d6d531dc9c9c06;hpb=e150bee233a648950061b716dc1780581105ede6;p=plomtask

diff --git a/plomtask/days.py b/plomtask/days.py
index fe1ba44..d7083b4 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -1,30 +1,9 @@
 """Collecting Day and date-related items."""
 from __future__ import annotations
 from datetime import datetime, timedelta
-from plomtask.exceptions import BadFormatException
 from plomtask.db import DatabaseConnection, BaseModel
 from plomtask.todos import Todo
-
-DATE_FORMAT = '%Y-%m-%d'
-MIN_RANGE_DATE = '2024-01-01'
-MAX_RANGE_DATE = '2030-12-31'
-
-
-def valid_date(date_str: str) -> str:
-    """Validate date against DATE_FORMAT or 'today', return in DATE_FORMAT."""
-    if date_str == 'today':
-        date_str = todays_date()
-    try:
-        dt = datetime.strptime(date_str, DATE_FORMAT)
-    except (ValueError, TypeError) as e:
-        msg = f'Given date of wrong format: {date_str}'
-        raise BadFormatException(msg) from e
-    return dt.strftime(DATE_FORMAT)
-
-
-def todays_date() -> str:
-    """Return current date in DATE_FORMAT."""
-    return datetime.now().strftime(DATE_FORMAT)
+from plomtask.dating import (DATE_FORMAT, valid_date)
 
 
 class Day(BaseModel[str]):
@@ -48,30 +27,26 @@ class Day(BaseModel[str]):
             fill_gaps: bool = False) -> list[Day]:
         """Return list of Days in database within (open) date_range interval.
 
-        If no range values provided, defaults them to MIN_RANGE_DATE and
-        MAX_RANGE_DATE. Also knows to properly interpret 'today' as value.
-
         On fill_gaps=True, will instantiate (without saving) Days of all dates
         within the date range that don't exist yet.
         """
-        min_date = '2024-01-01'
-        max_date = '2030-12-31'
-        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 id FROM days WHERE id >= ? AND id <= ?'
-        for row in db_conn.exec(sql, (start_date, end_date)):
-            days += [cls.by_id(db_conn, row[0])]
+        ret = cls.by_date_range_with_limits(db_conn, date_range, 'id')
+        days, start_date, end_date = ret
         days.sort()
-        if fill_gaps and len(days) > 1:
-            gapless_days = []
-            for i, day in enumerate(days):
-                gapless_days += [day]
-                if i < len(days) - 1:
-                    while day.next_date != days[i+1].date:
-                        day = Day(day.next_date)
-                        gapless_days += [day]
-            days = gapless_days
+        if fill_gaps:
+            if start_date not in [d.date for d in days]:
+                days = [Day(start_date)] + days
+            if end_date not in [d.date for d in days]:
+                days += [Day(end_date)]
+            if len(days) > 1:
+                gapless_days = []
+                for i, day in enumerate(days):
+                    gapless_days += [day]
+                    if i < len(days) - 1:
+                        while day.next_date != days[i+1].date:
+                            day = Day(day.next_date)
+                            gapless_days += [day]
+                days = gapless_days
         return days
 
     @property