!112 !94: tests commons modules that contains most of the logic + zoneinfo (#113)

!112

Co-authored-by: bkfox <thomas bkfox net>
Reviewed-on: rc/aircox#113

aircox/middleware.py

@@ -1,4 +1,5 @@
-import pytz
+from zoneinfo import ZoneInfo
+
 from django.db.models import Q
 from django.utils import timezone as tz
 
@@ -11,38 +12,36 @@ __all__ = ("AircoxMiddleware",)
 class AircoxMiddleware(object):
     """Middleware used to get default info for the given website.
 
-    Theses
+    It provide following request attributes:
+    - ``station``: current Station
+
     This middleware must be set after the middleware
         'django.contrib.auth.middleware.AuthenticationMiddleware',
     """
 
+    timezone_session_key = "aircox.timezone"
+
     def __init__(self, get_response):
         self.get_response = get_response
 
     def get_station(self, request):
         """Return station for the provided request."""
-        expr = Q(default=True) | Q(hosts__contains=request.get_host())
-        # case = Case(When(hosts__contains=request.get_host(), then=Value(0)),
-        #            When(default=True, then=Value(32)))
+        host = request.get_host()
+        expr = Q(default=True) | Q(hosts=host) | Q(hosts__contains=host + "\n")
         return Station.objects.filter(expr).order_by("default").first()
-        #              .annotate(resolve_priority=case) \
-        # .order_by('resolve_priority').first()
 
     def init_timezone(self, request):
         # note: later we can use http://freegeoip.net/ on user side if
         # required
         timezone = None
         try:
-            timezone = request.session.get("aircox.timezone")
+            timezone = request.session.get(self.timezone_session_key)
             if timezone:
-                timezone = pytz.timezone(timezone)
+                timezone = ZoneInfo(timezone)
+                tz.activate(timezone)
         except Exception:
             pass
 
-        if not timezone:
-            timezone = tz.get_current_timezone()
-            tz.activate(timezone)
-
     def __call__(self, request):
         self.init_timezone(request)
         request.station = self.get_station(request)