Fix sketchy datetime.time approach

Author: moznuy

aredis_om/model/encoders.py

@@ -38,31 +38,24 @@
 from pydantic.json import ENCODERS_BY_TYPE
 
 
+# TODO: check if correct
 def date_to_timestamp(t: datetime.date) -> int:
     return calendar.timegm(t.timetuple())
 
 
+# TODO: check if correct
 def datetime_to_timestamp(t: datetime.datetime) -> int:
     return math.floor(t.astimezone(datetime.timezone.utc).timestamp() * 1000)
 
 
-# TODO: Find better / more correct approach!!!!!!!!!!!
+zero_time = datetime.datetime.fromtimestamp(0)
+zero_day = zero_time.date()
+
+
+# TODO: check if correct
 def time_to_timestamp(t: datetime.time) -> int:
-    # TODO: Find better / more correct approach!!!!!!!!!!!
-    offset = t.utcoffset()
-    offset_ms = (
-        math.floor(offset.total_seconds() * 1000) + offset.microseconds // 1000
-        if offset is not None
-        else 0
-    )
-    return (
-        t.hour * 3600 * 1000
-        + t.minute * 60 * 1000
-        + t.second * 1000
-        + t.microsecond // 1000
-        # TODO: Find better / more correct approach!!!!!!!!!!!
-        - offset_ms
-    )
+    time_point = datetime.datetime.combine(zero_day, t, t.tzinfo)
+    return datetime_to_timestamp(time_point)
 
 
 SetIntStr = Set[Union[int, str]]

tests/test_time.py

@@ -149,7 +149,6 @@ class Meta:
     class PostTime(BaseModel):
         created: datetime.time = Field(index=True)
 
-        # TODO: Find better / more correct approach!!!!!!!!!!
         # TODO: Provide our field type instead of date datetime.time?
         # https://pydantic-docs.helpmanual.io/usage/types/#datetime-types
         # datetime.time is parsing only from time obj or iso? str
@@ -158,12 +157,13 @@ def time_validator(cls, value):
             if isinstance(value, str):
                 value = int(value)
             if isinstance(value, int):
-                return datetime.time(
-                    hour=value // 1000 // 3600 % 24,
-                    minute=value // 1000 // 60 % 60,
-                    second=value // 1000 % 60,
-                    microsecond=(value % 1000) * 1000,
-                    tzinfo=datetime.timezone.utc,
+                # TODO: check if correct
+                return (
+                    datetime.datetime.fromtimestamp(
+                        value // 1000, tz=datetime.timezone.utc
+                    )
+                    .time()
+                    .replace(tzinfo=datetime.timezone.utc)
                 )
             return value