work on timezone bug -- still need run checks

aircox/utils.py

@@ -2,25 +2,51 @@ import datetime
 import django.utils.timezone as tz
 
 
-def as_date(date, as_datetime = True):
+def date_range(date):
     """
-    If as_datetime, return the date with time info set to 0; else, return
-    a date with date informations of the given date/time.
+    Return a range of datetime for a given day, such as:
+        [date, 0:0:0:0; date, 23:59:59:999]
+
+    Ensure timezone awareness.
     """
-    if as_datetime:
-        return date.replace(hour = 0, minute = 0, second = 0, microsecond = 0)
+    date = date_or_default(date)
+    range = (
+        date.replace(hour = 0, minute = 0, second = 0), \
+        date.replace(hour = 23, minute = 59, second = 59, microsecond = 999)
+    )
+    return range
+
+def cast_date(date, to_datetime = True):
+    """
+    Given a date reset its time information and
+    return it as a date or datetime object.
+
+    Ensure timezone awareness.
+    """
+    if to_datetime:
+        return tz.make_aware(
+            tz.datetime(date.year, date.month, date.day, 0, 0, 0, 0)
+        )
     return datetime.date(date.year, date.month, date.day)
 
-def date_or_default(date, no_time = False):
+def date_or_default(date, reset_time = False, keep_type = False, to_datetime = True):
     """
-    Return date or default value (now) if not defined, and remove time info
-    if date_only is True
+    Return datetime or default value (now) if not defined, and remove time info
+    if reset_time is True.
+
+    \param reset_time   reset time info to 0
+    \param keep_type    keep the same type of the given date if not None
+    \param to_datetime  force conversion to datetime if not keep_type
+
+    Ensure timezone awareness.
     """
     date = date or tz.now()
-    if no_time:
-        return as_date(date)
+    to_datetime = isinstance(date, tz.datetime) if keep_type else to_datetime
 
-    if isinstance(date, datetime.datetime) and not tz.is_aware(date):
+    if reset_time or not isinstance(date, tz.datetime):
+        return cast_date(date, to_datetime)
+
+    if not tz.is_aware(date):
         date = tz.make_aware(date)
     return date