everything is using datetime now naive

api/src/firstrun.py

@@ -1,6 +1,6 @@
 import argparse
 import random
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from getpass import getpass
 from typing import Any, Dict, Generic, Literal, Optional, Tuple, TypeVar, cast
 
@@ -452,7 +452,12 @@ def create_shop_transactions() -> None:
     transaction = get_or_create(
         Transaction,
         id=index,
-        defaults=dict(member_id=1, amount=membership_prod.price, status="completed", created_at=datetime.now()),
+        defaults=dict(
+            member_id=1,
+            amount=membership_prod.price,
+            status="completed",
+            created_at=datetime.now(timezone.utc).replace(tzinfo=None),
+        ),
     )
     transaction_content = get_or_create(
         TransactionContent,
@@ -472,7 +477,7 @@ def create_shop_transactions() -> None:
             action_type="add_labaccess_days",
             value=10,
             status="completed",
-            completed_at=datetime.now(),
+            completed_at=datetime.now(timezone.utc).replace(tzinfo=None),
         ),
     )
     index += 1
@@ -485,7 +490,7 @@ def create_shop_transactions() -> None:
             member_id=None,
             amount=100,
             status="completed",
-            created_at=datetime.now(),
+            created_at=datetime.now(timezone.utc).replace(tzinfo=None),
         ),
     )
 

api/src/member/member.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, List
 from urllib.parse import quote_plus
@@ -30,7 +30,7 @@ def send_access_token_email(redirect, user_identification, ip, browser):
         MessageTemplate.LOGIN_LINK,
         member,
         url=url,
-        now=format_datetime(datetime.now()),
+        now=format_datetime(datetime.now(timezone.utc).replace(tzinfo=None)),
     )
 
     return {"status": "sent"}
@@ -47,7 +47,7 @@ def send_updated_member_info_email(member_id: int, msg_swe: str, msg_en: str):
     send_message(
         MessageTemplate.UPDATED_MEMBER_INFO,
         member,
-        now=format_datetime(datetime.now()),
+        now=format_datetime(datetime.now(timezone.utc).replace(tzinfo=None)),
         message_swe=msg_swe,
         message_en=msg_en,
     )

api/src/multiaccessy/accessy.py

@@ -3,7 +3,7 @@
 import time
 from collections.abc import Iterable
 from dataclasses import dataclass, field
-from datetime import date, datetime, timedelta
+from datetime import date, datetime, timedelta, timezone
 from enum import Enum
 from logging import getLogger
 from random import random
@@ -361,9 +361,9 @@ def __ensure_token(self) -> None:
             if (
                 not self.session_token
                 or self.session_token_token_expires_at is None
-                or datetime.now() > self.session_token_token_expires_at
+                or datetime.now(timezone.utc).replace(tzinfo=None) > self.session_token_token_expires_at
             ):
-                now = datetime.now()
+                now = datetime.now(timezone.utc).replace(tzinfo=None)
                 data = request(
                     "post",
                     "/auth/oauth/token",

api/src/shop/accounting/sie_file.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from decimal import Decimal
 from logging import getLogger
 from typing import Dict, List, Tuple
@@ -35,7 +35,7 @@ def date_format(dt: datetime) -> str:
 
 def get_header(signer: str, start_date: datetime, end_date: datetime) -> str:
     return HEADER_TEMPLATE.format(
-        date=date_format(datetime.now()),
+        date=date_format(datetime.now(timezone.utc).replace(tzinfo=None)),
         signer=signer,
         date_start=date_format(start_date),
         date_end=date_format(end_date),

api/src/shop/accounting/test/export_test.py

@@ -175,7 +175,7 @@ def test_export_accounting(self, get_payments_from_stripe: Mock) -> None:
             row = sie_rows.pop(0)
 
             if row.startswith("#GEN"):
-                assert datetime.now().strftime("%Y%m%d") in row
+                assert datetime.now(timezone.utc).replace(tzinfo=None).strftime("%Y%m%d") in row
                 assert self.member.firstname in row
                 assert self.member.lastname in row
 

api/src/shop/accounting/test/sie_file_test.py

@@ -157,7 +157,7 @@ def test_get_sie_string(self) -> None:
             row = sie_rows.pop(0)
 
             if row.startswith("#GEN"):
-                assert datetime.now().strftime("%Y%m%d") in row
+                assert datetime.now(timezone.utc).replace(tzinfo=None).strftime("%Y%m%d") in row
                 assert signer in row
 
             if row.startswith("#DIM"):

api/src/statistics/maker_statistics.py

@@ -2,7 +2,7 @@
 import math
 import time
 from dataclasses import dataclass
-from datetime import date, datetime, timedelta
+from datetime import date, datetime, timedelta, timezone
 from typing import Any, Dict, List, Optional, Tuple
 
 from membership.membership import get_members_and_membership, get_membership_summaries
@@ -138,7 +138,7 @@ def membership_number_months2(membership_type: str, startdate: date, enddate: da
 
 
 def membership_number_months_default():
-    now = datetime.now()
+    now = datetime.now(timezone.utc).replace(tzinfo=None)
     starttime = now - timedelta(days=30 * 12)
     return {
         "membership": membership_number_months("membership", starttime.date(), now.date()),
@@ -147,7 +147,7 @@ def membership_number_months_default():
 
 
 def membership_number_months2_default():
-    now = datetime.now()
+    now = datetime.now(timezone.utc).replace(tzinfo=None)
     starttime = now - timedelta(days=30 * 12)
     return {
         "membership": membership_number_months2("membership", starttime.date(), now.date()),
@@ -212,7 +212,7 @@ def shop_statistics() -> ShopStatistics:
     def mapify(rows: List[Tuple[Any, Any]]) -> Dict[Any, Any]:
         return {r[0]: r[1] for r in rows}
 
-    date_lower_limit = datetime.now() - timedelta(days=365)
+    date_lower_limit = datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(days=365)
 
     sales_by_product: Dict[int, float] = mapify(
         db_session.query(TransactionContent.product_id, func.sum(TransactionContent.amount))

api/src/test_aid/obj.py

@@ -1,5 +1,5 @@
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from decimal import Decimal
 from logging import getLogger
 from random import choice, randint, seed
@@ -81,7 +81,7 @@ def create_phone_request(self, **kwargs):
             phone=random_phone_number(),
             validation_code=randint(1, 999999),
             completed=False,
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc).replace(tzinfo=None),
         )
         obj.update(kwargs)
         self.phone_request = obj

devel_data.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import json
 import random
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from pprint import pprint
 
 import requests
@@ -80,8 +80,8 @@ def create_span(member_id, startdate, enddate, span_type, creation_reason=None):
         member = create_user("test user", "blah", f"test_user_{random.randrange(0, 100000)}", "user", None)
 
     delete_all_spans(member["member_id"])
-    startTime = datetime.now() + timedelta(days=random.randrange(-300, 0))
-    endTime = datetime.now() + timedelta(days=random.randrange(-300, 100))
+    startTime = datetime.now(timezone.utc).replace(tzinfo=None) + timedelta(days=random.randrange(-300, 0))
+    endTime = datetime.now(timezone.utc).replace(tzinfo=None) + timedelta(days=random.randrange(-300, 100))
     startTime = startTime.strftime("%Y-%m-%d")
     endTime = endTime.strftime("%Y-%m-%d")
     create_span(member["member_id"], startTime, endTime, "membership", str(random.randrange(0, 100000)))