francescoalbano/tripweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔥 utils date

Browse Source
This commit is contained in:
itskovacs 2025-11-01 19:31:33 +01:00
parent 04f64cf059
commit bd8e0c2578
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/trip/routers/trips.py
View File

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

5
backend/trip/utils/utils.py
View File

@ -1,5 +1,4 @@
import base64 import base64
from datetime import UTC, datetime
from io import BytesIO from io import BytesIO
from pathlib import Path from pathlib import Path
from secrets import token_urlsafe from secrets import token_urlsafe
@ -75,10 +74,6 @@ def remove_image(filename: str):
pass pass
def utc_now():
return datetime.now(UTC)
async def httpx_get(link: str) -> str: async def httpx_get(link: str) -> str:
headers = { 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", "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",

7
backend/trip/utils/zip.py
View File

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