feat(api): 添加API端点/beatmaps/{beatmap}/scores/users/{user}
- 新增路由 /beatmaps/{beatmap}/scores/users/{user} 用于查询用户在特定地图上的得分
- 实现了对用户得分的验证和处理,如果用户没有得分则返回 404 错误
- 修正了之前代码中的一些格式问题,如过长的行进行适当的换行
This commit is contained in:
@@ -32,7 +32,9 @@ async def get_beatmap(
|
|||||||
beatmap = (
|
beatmap = (
|
||||||
await db.exec(
|
await db.exec(
|
||||||
select(Beatmap)
|
select(Beatmap)
|
||||||
.options(joinedload(Beatmap.beatmapset).selectinload(Beatmapset.beatmaps)) # pyright: ignore[reportArgumentType]
|
.options(
|
||||||
|
joinedload(Beatmap.beatmapset).selectinload(Beatmapset.beatmaps) # pyright: ignore[reportArgumentType]
|
||||||
|
)
|
||||||
.where(Beatmap.id == bid)
|
.where(Beatmap.id == bid)
|
||||||
)
|
)
|
||||||
).first()
|
).first()
|
||||||
@@ -70,7 +72,9 @@ async def batch_get_beatmaps(
|
|||||||
await db.exec(
|
await db.exec(
|
||||||
select(Beatmap)
|
select(Beatmap)
|
||||||
.options(
|
.options(
|
||||||
joinedload(Beatmap.beatmapset).selectinload(Beatmapset.beatmaps) # pyright: ignore[reportArgumentType]
|
joinedload(Beatmap.beatmapset).selectinload( # pyright: ignore[reportArgumentType]
|
||||||
|
Beatmapset.beatmaps # pyright: ignore[reportArgumentType]
|
||||||
|
)
|
||||||
)
|
)
|
||||||
.order_by(col(Beatmap.last_updated).desc())
|
.order_by(col(Beatmap.last_updated).desc())
|
||||||
.limit(50)
|
.limit(50)
|
||||||
@@ -81,7 +85,9 @@ async def batch_get_beatmaps(
|
|||||||
await db.exec(
|
await db.exec(
|
||||||
select(Beatmap)
|
select(Beatmap)
|
||||||
.options(
|
.options(
|
||||||
joinedload(Beatmap.beatmapset).selectinload(Beatmapset.beatmaps) # pyright: ignore[reportArgumentType]
|
joinedload(Beatmap.beatmapset).selectinload( # pyright: ignore[reportArgumentType]
|
||||||
|
Beatmapset.beatmaps # pyright: ignore[reportArgumentType]
|
||||||
|
)
|
||||||
)
|
)
|
||||||
.where(col(Beatmap.id).in_(b_ids))
|
.where(col(Beatmap.id).in_(b_ids))
|
||||||
.limit(50)
|
.limit(50)
|
||||||
@@ -97,7 +103,7 @@ class BeatmapScores(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
@router.get(
|
@router.get(
|
||||||
"/beatmaps/{beatmap}/scores", tags=["beatmapset"], response_model=BeatmapScores
|
"/beatmaps/{beatmap}/scores", tags=["beatmap"], response_model=BeatmapScores
|
||||||
)
|
)
|
||||||
async def get_beatmapset_scores(
|
async def get_beatmapset_scores(
|
||||||
beatmap: int,
|
beatmap: int,
|
||||||
@@ -126,7 +132,9 @@ async def get_beatmapset_scores(
|
|||||||
.options(
|
.options(
|
||||||
joinedload(Score.beatmap) # pyright: ignore[reportArgumentType]
|
joinedload(Score.beatmap) # pyright: ignore[reportArgumentType]
|
||||||
.joinedload(Beatmap.beatmapset) # pyright: ignore[reportArgumentType]
|
.joinedload(Beatmap.beatmapset) # pyright: ignore[reportArgumentType]
|
||||||
.selectinload(Beatmapset.beatmaps) # pyright: ignore[reportArgumentType]
|
.selectinload(
|
||||||
|
Beatmapset.beatmaps # pyright: ignore[reportArgumentType]
|
||||||
|
)
|
||||||
)
|
)
|
||||||
.where(Score.beatmap_id == beatmap)
|
.where(Score.beatmap_id == beatmap)
|
||||||
.where(Score.user_id == current_user.id)
|
.where(Score.user_id == current_user.id)
|
||||||
@@ -137,3 +145,51 @@ async def get_beatmapset_scores(
|
|||||||
scores=[ScoreResp.from_db(score) for score in all_scores],
|
scores=[ScoreResp.from_db(score) for score in all_scores],
|
||||||
userScore=ScoreResp.from_db(user_score) if user_score else None,
|
userScore=ScoreResp.from_db(user_score) if user_score else None,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class BeatmapUserScore(BaseModel):
|
||||||
|
position: int
|
||||||
|
score: ScoreResp
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/beatmaps/{beatmap}/scores/users/{user}",
|
||||||
|
tags=["beatmap"],
|
||||||
|
response_model=BeatmapUserScore,
|
||||||
|
)
|
||||||
|
async def get_user_beatmap_score(
|
||||||
|
beatmap: int,
|
||||||
|
user: int,
|
||||||
|
legacy_only: bool = Query(None),
|
||||||
|
mode: str = Query(None),
|
||||||
|
mods: str = Query(None), # TODO:添加mods筛选
|
||||||
|
current_user: DBUser = Depends(get_current_user),
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
):
|
||||||
|
if legacy_only:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=404, detail="This server only contains non-legacy scores"
|
||||||
|
)
|
||||||
|
user_score = (
|
||||||
|
await db.exec(
|
||||||
|
select(Score)
|
||||||
|
.options(
|
||||||
|
joinedload(Score.beatmap) # pyright: ignore[reportArgumentType]
|
||||||
|
.joinedload(Beatmap.beatmapset) # pyright: ignore[reportArgumentType]
|
||||||
|
.selectinload(Beatmapset.beatmaps) # pyright: ignore[reportArgumentType]
|
||||||
|
)
|
||||||
|
.where(Score.beatmap_id == beatmap)
|
||||||
|
.where(Score.user_id == user)
|
||||||
|
.order_by(col(Score.classic_total_score).desc())
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not user_score:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=404, detail="Cannot find user %s's score on this beatmap" % user
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return BeatmapUserScore(
|
||||||
|
position=user_score.position if user_score.position is not None else 0,
|
||||||
|
score=ScoreResp.from_db(user_score),
|
||||||
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user