From 8d38f230cbb35825700f7a65f7fe05b56b122ec0 Mon Sep 17 00:00:00 2001 From: MingxuanGame Date: Sun, 24 Aug 2025 14:25:17 +0000 Subject: [PATCH] refactor(room): remove duplicated multiplayer event model --- .../multiplayer_realtime_room_event.py | 33 ------------------- app/database/room.py | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 app/database/multiplayer_realtime_room_event.py diff --git a/app/database/multiplayer_realtime_room_event.py b/app/database/multiplayer_realtime_room_event.py deleted file mode 100644 index 361432b..0000000 --- a/app/database/multiplayer_realtime_room_event.py +++ /dev/null @@ -1,33 +0,0 @@ -from datetime import datetime -from typing import ClassVar - -from app.models.model import UTCBaseModel -from app.utils import utcnow - -from sqlalchemy import Text -from sqlalchemy.ext.asyncio import AsyncAttrs -from sqlmodel import BigInteger, Column, DateTime, Field, ForeignKey, SQLModel - - -class MultiplayerRealtimeRoomEventBase(SQLModel, UTCBaseModel): - event_type: str = Field(index=True) - event_detail: str | None = Field(default=None, sa_column=Column(Text)) - - -class MultiplayerRealtimeRoomEvent(AsyncAttrs, MultiplayerRealtimeRoomEventBase, table=True): - __tablename__: ClassVar[str] = "multiplayer_realtime_room_event" - - id: int | None = Field(default=None, primary_key=True, index=True) - - room_id: int = Field(sa_column=Column(ForeignKey("rooms.id"), index=True, nullable=False)) - playlist_item_id: int | None = Field( - default=None, - sa_column=Column(ForeignKey("playlists.id"), index=True, nullable=True), - ) - user_id: int | None = Field( - default=None, - sa_column=Column(BigInteger, ForeignKey("lazer_users.id"), index=True, nullable=True), - ) - - created_at: datetime = Field(sa_column=Column(DateTime(timezone=True)), default_factory=utcnow) - updated_at: datetime = Field(sa_column=Column(DateTime(timezone=True)), default_factory=utcnow) diff --git a/app/database/room.py b/app/database/room.py index 2fffab0..c777a52 100644 --- a/app/database/room.py +++ b/app/database/room.py @@ -56,13 +56,13 @@ class RoomBase(SQLModel, UTCBaseModel): auto_start_duration: int status: RoomStatus channel_id: int | None = None - password: str | None = Field(default=None) class Room(AsyncAttrs, RoomBase, table=True): __tablename__: str = "rooms" id: int = Field(default=None, primary_key=True, index=True) host_id: int = Field(sa_column=Column(BigInteger, ForeignKey("lazer_users.id"), index=True)) + password: str | None = Field(default=None) host: User = Relationship() playlist: list[Playlist] = Relationship(