Slightly improve and re-organize Condition tests.

[plomtask] / plomtask / dating.py

diff --git a/plomtask/dating.py b/plomtask/dating.py
index e143fb652991780b994ef788b32a23c66b849120..26b3ce3f4c2dae84fb44c8366d4a96882ced76ef 100644 (file)
--- a/plomtask/dating.py
+++ b/plomtask/dating.py
@@ -1,16 +1,21 @@
 """Various utilities for handling dates."""
-from datetime import datetime
+from datetime import datetime, timedelta
 from plomtask.exceptions import BadFormatException
 
 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."""
+    """Validate date against DATE_FORMAT or 'today'/'yesterday'/'tomorrow.
+
+    In any case, returns in DATE_FORMAT.
+    """
     if date_str == 'today':
-        date_str = todays_date()
+        date_str = date_in_n_days(0)
+    elif date_str == 'yesterday':
+        date_str = date_in_n_days(-1)
+    elif date_str == 'tomorrow':
+        date_str = date_in_n_days(1)
     try:
         dt = datetime.strptime(date_str, DATE_FORMAT)
     except (ValueError, TypeError) as e:
@@ -19,6 +24,7 @@ def valid_date(date_str: str) -> str:
     return dt.strftime(DATE_FORMAT)
 
 
-def todays_date() -> str:
-    """Return current date in DATE_FORMAT."""
-    return datetime.now().strftime(DATE_FORMAT)
+def date_in_n_days(n: int) -> str:
+    """Return in DATE_FORMAT date from today + n days."""
+    date = datetime.now() + timedelta(days=n)
+    return date.strftime(DATE_FORMAT)