🔥 utils date

backend/trip/routers/trips.py

@@ -20,9 +20,10 @@ from ..models.models import (Image, Place, Trip, TripAttachment,
                              TripPackingListItemRead,
                              TripPackingListItemUpdate, TripRead, TripReadBase,
                              TripShare, TripShareURL, TripUpdate, User)
+from ..utils.date import dt_utc
 from ..utils.utils import (attachments_trip_folder_path, b64img_decode,
                            generate_urlsafe, save_attachment,
-                           save_image_to_file, utc_now)
+                           save_image_to_file)
 
 router = APIRouter(prefix="/api/trips", tags=["trips"])
 
@@ -891,7 +892,7 @@ def accept_invite(
         raise HTTPException(status_code=404, detail="Not found")
     if db_member.joined_at:
         raise HTTPException(status_code=409, detail="Already a member")
-    db_member.joined_at = utc_now()
+    db_member.joined_at = dt_utc()
     session.add(db_member)
     session.commit()
     return {}

backend/trip/utils/utils.py

@@ -1,5 +1,4 @@
 import base64
-from datetime import UTC, datetime
 from io import BytesIO
 from pathlib import Path
 from secrets import token_urlsafe
@@ -75,10 +74,6 @@ def remove_image(filename: str):
         pass
 
 
-def utc_now():
-    return datetime.now(UTC)
-
-
 async def httpx_get(link: str) -> str:
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36",

backend/trip/utils/zip.py

@@ -16,8 +16,9 @@ from ..models.models import (Backup, BackupStatus, Category, CategoryRead,
                              TripChecklistItem, TripChecklistItemRead, TripDay,
                              TripItem, TripPackingListItem,
                              TripPackingListItemRead, TripRead, User, UserRead)
+from .date import dt_utc
 from .utils import (assets_folder_path, attachments_trip_folder_path,
-                    b64img_decode, save_image_to_file, utc_now)
+                    b64img_decode, save_image_to_file)
 
 
 def process_backup_export(session: SessionDep, backup_id: int):
@@ -59,7 +60,7 @@ def process_backup_export(session: SessionDep, backup_id: int):
         trips = session.exec(trips_query).all()
         images = session.exec(select(Image).where(Image.user == db_backup.user)).all()
 
-        backup_datetime = utc_now()
+        backup_datetime = dt_utc()
         iso_date = backup_datetime.strftime("%Y-%m-%d")
         filename = f"TRIP_{iso_date}_{db_backup.user}_backup.zip"
         zip_fp = Path(settings.BACKUPS_FOLDER) / filename
@@ -116,7 +117,7 @@ def process_backup_export(session: SessionDep, backup_id: int):
 
         db_backup.file_size = zip_fp.stat().st_size
         db_backup.status = BackupStatus.COMPLETED
-        db_backup.completed_at = utc_now()
+        db_backup.completed_at = dt_utc()
         db_backup.filename = filename
         session.commit()
     except Exception as exc: