Require timezone in ISO8601 intervals, and require non-negative durat…

…ions
dnstapir · Jan 15, 2025 · 9898b4e · 9898b4e
1 parent 91434df
commit 9898b4e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/aggrec/helpers.py b/aggrec/helpers.py
@@ -119,4 +119,13 @@ def parse_iso8601_interval(interval: str) -> tuple[datetime, timedelta]:
     t1, t2 = aniso8601.parse_interval(interval)
     if not isinstance(t1, datetime) or not isinstance(t2, datetime):
         raise ValueError("Invalid interval format")
-    return t1, timedelta(seconds=(t2 - t1).total_seconds())
+    if t1.tzinfo is None:
+        raise ValueError("Start time must include timezone")
+    if t2.tzinfo is None:
+        raise ValueError("End time must include timezone")
+    t1 = t1.astimezone(timezone.utc)
+    t2 = t2.astimezone(timezone.utc)
+    duration = timedelta(seconds=(t2 - t1).total_seconds())
+    if duration.total_seconds() < 0:
+        raise ValueError("Duration cannot be negative")
+    return t1, duration