diff --git a/backend/endpoints/responses/assets.py b/backend/endpoints/responses/assets.py index def6a753d..5a326c80f 100644 --- a/backend/endpoints/responses/assets.py +++ b/backend/endpoints/responses/assets.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import TypedDict -from pydantic import BaseModel +from .base import BaseModel class BaseAsset(BaseModel): diff --git a/backend/endpoints/responses/collection.py b/backend/endpoints/responses/collection.py index 0ad5be05a..da8d6ee70 100644 --- a/backend/endpoints/responses/collection.py +++ b/backend/endpoints/responses/collection.py @@ -1,7 +1,8 @@ from datetime import datetime from models.collection import Collection -from pydantic import BaseModel + +from .base import BaseModel class CollectionSchema(BaseModel): diff --git a/backend/endpoints/responses/firmware.py b/backend/endpoints/responses/firmware.py index b4a19cd60..9c6c403ff 100644 --- a/backend/endpoints/responses/firmware.py +++ b/backend/endpoints/responses/firmware.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import TypedDict -from pydantic import BaseModel +from .base import BaseModel class FirmwareSchema(BaseModel): diff --git a/backend/endpoints/responses/identity.py b/backend/endpoints/responses/identity.py index ac43eb2be..c45bbe778 100644 --- a/backend/endpoints/responses/identity.py +++ b/backend/endpoints/responses/identity.py @@ -1,7 +1,8 @@ from datetime import datetime from models.user import Role -from pydantic import BaseModel + +from .base import BaseModel class UserSchema(BaseModel): diff --git a/backend/endpoints/responses/platform.py b/backend/endpoints/responses/platform.py index c19300312..6ca60452e 100644 --- a/backend/endpoints/responses/platform.py +++ b/backend/endpoints/responses/platform.py @@ -1,8 +1,9 @@ from datetime import datetime from models.platform import DEFAULT_COVER_ASPECT_RATIO -from pydantic import BaseModel, Field, computed_field +from pydantic import Field, computed_field +from .base import BaseModel from .firmware import FirmwareSchema diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py index d4108afd4..971893cbf 100644 --- a/backend/endpoints/responses/rom.py +++ b/backend/endpoints/responses/rom.py @@ -10,7 +10,9 @@ from handler.metadata.igdb_handler import IGDBMetadata from handler.metadata.moby_handler import MobyMetadata from models.rom import Rom, RomFile, RomUserStatus -from pydantic import BaseModel, computed_field +from pydantic import computed_field + +from .base import BaseModel SORT_COMPARE_REGEX = re.compile(r"^([Tt]he|[Aa]|[Aa]nd)\s") diff --git a/backend/endpoints/responses/search.py b/backend/endpoints/responses/search.py index 7f1de633d..43b264753 100644 --- a/backend/endpoints/responses/search.py +++ b/backend/endpoints/responses/search.py @@ -1,4 +1,4 @@ -from pydantic import BaseModel +from .base import BaseModel class SearchRomSchema(BaseModel): diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py index f9fab79d3..61f8040cc 100644 --- a/backend/endpoints/rom.py +++ b/backend/endpoints/rom.py @@ -1,5 +1,6 @@ import binascii from base64 import b64encode +from datetime import datetime, timezone from io import BytesIO from shutil import rmtree from typing import Annotated @@ -27,7 +28,6 @@ from logger.logger import log from models.rom import Rom, RomUser from PIL import Image -from sqlalchemy import func from starlette.requests import ClientDisconnect from starlette.responses import FileResponse from streaming_form_data import StreamingFormDataParser @@ -584,6 +584,6 @@ async def update_rom_user(request: Request, id: int) -> RomUserSchema: cleaned_data = {field: data[field] for field in fields_to_update if field in data} if data.get("update_last_played", False): - cleaned_data.update({"last_played": func.now()}) + cleaned_data.update({"last_played": datetime.now(timezone.utc)}) return db_rom_handler.update_rom_user(db_rom_user.id, cleaned_data)