Merge pull request #1151 from frankrousseau/allow-future-day-offs

[persons] Let datetime validate interval helper inputs

Author: frankrousseau

tests/utils/test_utils.py

@@ -118,6 +118,24 @@ def test_date(self):
         self.assertEqual(start.strftime("%Y-%m-%d"), "2021-02-10")
         self.assertEqual(end.strftime("%Y-%m-%d"), "2021-02-11")
 
+    def test_interval_allows_future_years(self):
+        from zou.app.services.exception import WrongDateFormatException
+
+        next_year = date_helpers.get_utc_now_datetime().year + 1
+        start, _ = date_helpers.get_month_interval(next_year, 1)
+        self.assertEqual(start.year, next_year)
+        start, _ = date_helpers.get_month_interval(2500, 12)
+        self.assertEqual(start.year, 2500)
+
+        with pytest.raises(WrongDateFormatException):
+            date_helpers.get_month_interval(2026, 13)
+        with pytest.raises(WrongDateFormatException):
+            date_helpers.get_day_interval(2026, 2, 30)
+        with pytest.raises(WrongDateFormatException):
+            date_helpers.get_week_interval(2026, 60)
+        with pytest.raises(WrongDateFormatException):
+            date_helpers.get_month_interval("abc", 1)
+
     def test_get_redis_url(self):
         db_index = 0
         self.assertEqual(

zou/app/utils/date_helpers.py

@@ -80,70 +80,47 @@ def get_year_interval(year):
     """
     Get a tuple containing start date and end date for given year.
     """
-    year = int(year)
-    if year > get_utc_now_datetime().year or year < 2010:
+    try:
+        start = datetime.datetime(int(year), 1, 1)
+        end = start + relativedelta.relativedelta(years=1)
+    except (ValueError, OverflowError):
         raise WrongDateFormatException
-
-    start = datetime.datetime(year, 1, 1)
-    end = start + relativedelta.relativedelta(years=1)
     return start, end
 
 
 def get_month_interval(year, month):
     """
     Get a tuple containing start date and end date for given year and month.
     """
-    year = int(year)
-    month = int(month)
-    if (
-        year > get_utc_now_datetime().year
-        or year < 2010
-        or month < 1
-        or month > 12
-    ):
+    try:
+        start = datetime.datetime(int(year), int(month), 1)
+        end = start + relativedelta.relativedelta(months=1)
+    except (ValueError, OverflowError):
         raise WrongDateFormatException
-
-    start = datetime.datetime(year, month, 1)
-    end = start + relativedelta.relativedelta(months=1)
     return start, end
 
 
 def get_week_interval(year, week):
     """
     Get a tuple containing start date and end date for given year and week.
     """
-    year = int(year)
-    week = int(week)
-    if (
-        year > get_utc_now_datetime().year
-        or year < 2010
-        or week < 1
-        or week > 52
-    ):
+    try:
+        start = datetime.date.fromisocalendar(int(year), int(week), 1)
+        end = start + relativedelta.relativedelta(days=7)
+    except (ValueError, OverflowError):
         raise WrongDateFormatException
-    start = datetime.date.fromisocalendar(year, week, 1)
-    end = start + relativedelta.relativedelta(days=7)
     return start, end
 
 
 def get_day_interval(year, month, day):
     """
     Get a tuple containing start date and end date for given day.
     """
-    year = int(year)
-    month = int(month)
-    day = int(day)
-    if (
-        year > get_utc_now_datetime().year
-        or year < 2010
-        or month < 1
-        or month > 12
-        or day < 1
-        or day > 31
-    ):
+    try:
+        start = datetime.datetime(int(year), int(month), int(day))
+        end = start + relativedelta.relativedelta(days=1)
+    except (ValueError, OverflowError):
         raise WrongDateFormatException
-    start = datetime.datetime(year, month, day)
-    end = start + relativedelta.relativedelta(days=1)
     return start, end