Bennett/g0v0-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(playlist): duplicated item in list

Browse Source
This commit is contained in:
MingxuanGame
2025-08-09 05:59:26 +00:00
parent e4d883bf81
commit 99f2b3db2a
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/database/room.py
View File

@@ -67,7 +67,7 @@ class Room(AsyncAttrs, RoomBase, table=True):
host: User = Relationship() host: User = Relationship()
playlist: list[Playlist] = Relationship( playlist: list[Playlist] = Relationship(
sa_relationship_kwargs={ sa_relationship_kwargs={
"lazy": "joined", "lazy": "selectin",
"cascade": "all, delete-orphan", "cascade": "all, delete-orphan",
"overlaps": "room", "overlaps": "room",
} }

16
app/router/room.py
View File

@@ -8,7 +8,7 @@ from app.database.beatmapset import BeatmapsetResp
from app.database.lazer_user import User, UserResp from app.database.lazer_user import User, UserResp
from app.database.multiplayer_event import MultiplayerEvent, MultiplayerEventResp from app.database.multiplayer_event import MultiplayerEvent, MultiplayerEventResp
from app.database.playlist_attempts import ItemAttemptsCount, ItemAttemptsResp from app.database.playlist_attempts import ItemAttemptsCount, ItemAttemptsResp
from app.database.playlists import Playlist, PlaylistResp from app.database.playlists import Playlist, PlaylistBase, PlaylistResp
from app.database.room import Room, RoomBase, RoomResp from app.database.room import Room, RoomBase, RoomResp
from app.database.room_participated_user import RoomParticipatedUser from app.database.room_participated_user import RoomParticipatedUser
from app.database.score import Score from app.database.score import Score
@@ -71,7 +71,7 @@ class APIUploadedRoom(RoomBase):
id: int | None id: int | None
host_id: int | None = None host_id: int | None = None
playlist: list[Playlist] playlist: list[PlaylistBase] = Field(default_factory=list)
async def _participate_room( async def _participate_room(
@@ -118,19 +118,12 @@ async def create_room(
await db.refresh(db_room) await db.refresh(db_room)
await _participate_room(db_room.id, user_id, db_room, db) await _participate_room(db_room.id, user_id, db_room, db)
playlist: list[Playlist] = []
# 处理 APIUploadedRoom 里的 playlist 字段
for item in room.playlist: for item in room.playlist:
# 确保 room_id 正确赋值
item.id = await Playlist.get_next_id_for_room(db_room.id, db) item.id = await Playlist.get_next_id_for_room(db_room.id, db)
item.room_id = db_room.id item.room_id = db_room.id
item.owner_id = user_id if user_id else 1 item.owner_id = user_id if user_id else 1
db.add(item) db.add(item)
await db.commit() await db.commit()
await db.refresh(item)
playlist.append(item)
await db.refresh(db_room)
db_room.playlist = playlist
await db.refresh(db_room) await db.refresh(db_room)
created_room = APICreatedRoom.model_validate(await RoomResp.from_db(db_room, db)) created_room = APICreatedRoom.model_validate(await RoomResp.from_db(db_room, db))
created_room.error = "" created_room.error = ""
@@ -174,9 +167,6 @@ async def add_user_to_room(room: int, user: int, db: AsyncSession = Depends(get_
await db.commit() await db.commit()
await db.refresh(db_room) await db.refresh(db_room)
resp = await RoomResp.from_db(db_room, db) resp = await RoomResp.from_db(db_room, db)
await db.refresh(db_room)
for item in db_room.playlist:
resp.playlist.append(await PlaylistResp.from_db(item, ["beatmap"]))
return resp return resp
else: else:
raise HTTPException(404, "room not found0") raise HTTPException(404, "room not found0")