refactor(app): update database code
This commit is contained in:
@@ -8,7 +8,7 @@ from app.database.beatmap_playcounts import BeatmapPlaycounts
|
||||
from app.database.beatmapset import Beatmapset
|
||||
from app.database.favourite_beatmapset import FavouriteBeatmapset
|
||||
from app.database.score import Score
|
||||
from app.dependencies.database import get_db, get_redis
|
||||
from app.dependencies.database import Database, get_redis
|
||||
from app.dependencies.fetcher import get_fetcher
|
||||
from app.fetcher import Fetcher
|
||||
from app.models.beatmap import BeatmapRankStatus, Genre, Language
|
||||
@@ -149,6 +149,7 @@ class V1Beatmap(AllStrModel):
|
||||
description="根据指定条件搜索谱面。",
|
||||
)
|
||||
async def get_beatmaps(
|
||||
session: Database,
|
||||
since: datetime | None = Query(None, description="自指定时间后拥有排行榜的谱面"),
|
||||
beatmapset_id: int | None = Query(None, alias="s", description="谱面集 ID"),
|
||||
beatmap_id: int | None = Query(None, alias="b", description="谱面 ID"),
|
||||
@@ -163,7 +164,6 @@ async def get_beatmaps(
|
||||
checksum: str | None = Query(None, alias="h", description="谱面文件 MD5"),
|
||||
limit: int = Query(500, ge=1, le=500, description="返回结果数量限制"),
|
||||
mods: int = Query(0, description="应用到谱面属性的 MOD"),
|
||||
session: AsyncSession = Depends(get_db),
|
||||
redis: Redis = Depends(get_redis),
|
||||
fetcher: Fetcher = Depends(get_fetcher),
|
||||
):
|
||||
|
||||
@@ -6,7 +6,7 @@ from typing import Literal
|
||||
|
||||
from app.database.counts import ReplayWatchedCount
|
||||
from app.database.score import Score
|
||||
from app.dependencies.database import get_db
|
||||
from app.dependencies.database import Database
|
||||
from app.dependencies.storage import get_storage_service
|
||||
from app.models.mods import int_to_mods
|
||||
from app.models.score import GameMode
|
||||
@@ -17,7 +17,6 @@ from .router import router
|
||||
from fastapi import Depends, HTTPException, Query
|
||||
from pydantic import BaseModel
|
||||
from sqlmodel import col, select
|
||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||
|
||||
|
||||
class ReplayModel(BaseModel):
|
||||
@@ -32,6 +31,7 @@ class ReplayModel(BaseModel):
|
||||
description="获取指定谱面的回放文件。",
|
||||
)
|
||||
async def download_replay(
|
||||
session: Database,
|
||||
beatmap: int = Query(..., alias="b", description="谱面 ID"),
|
||||
user: str = Query(..., alias="u", description="用户"),
|
||||
ruleset_id: int | None = Query(
|
||||
@@ -45,7 +45,6 @@ async def download_replay(
|
||||
None, description="用户类型:string 用户名称 / id 用户 ID"
|
||||
),
|
||||
mods: int = Query(0, description="成绩的 MOD"),
|
||||
session: AsyncSession = Depends(get_db),
|
||||
storage_service: StorageService = Depends(get_storage_service),
|
||||
):
|
||||
mods_ = int_to_mods(mods)
|
||||
|
||||
@@ -5,16 +5,15 @@ from typing import Literal
|
||||
|
||||
from app.database.pp_best_score import PPBestScore
|
||||
from app.database.score import Score, get_leaderboard
|
||||
from app.dependencies.database import get_db
|
||||
from app.dependencies.database import Database
|
||||
from app.models.mods import int_to_mods, mod_to_save, mods_to_int
|
||||
from app.models.score import GameMode, LeaderboardType
|
||||
|
||||
from .router import AllStrModel, router
|
||||
|
||||
from fastapi import Depends, HTTPException, Query
|
||||
from fastapi import HTTPException, Query
|
||||
from sqlalchemy.orm import joinedload
|
||||
from sqlmodel import col, exists, select
|
||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||
|
||||
|
||||
class V1Score(AllStrModel):
|
||||
@@ -68,13 +67,13 @@ class V1Score(AllStrModel):
|
||||
description="获取指定用户的最好成绩。",
|
||||
)
|
||||
async def get_user_best(
|
||||
session: Database,
|
||||
user: str = Query(..., alias="u", description="用户"),
|
||||
ruleset_id: int = Query(0, alias="m", description="Ruleset ID", ge=0),
|
||||
type: Literal["string", "id"] | None = Query(
|
||||
None, description="用户类型:string 用户名称 / id 用户 ID"
|
||||
),
|
||||
limit: int = Query(10, ge=1, le=100, description="返回的成绩数量"),
|
||||
session: AsyncSession = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
scores = (
|
||||
@@ -104,13 +103,13 @@ async def get_user_best(
|
||||
description="获取指定用户的最近成绩。",
|
||||
)
|
||||
async def get_user_recent(
|
||||
session: Database,
|
||||
user: str = Query(..., alias="u", description="用户"),
|
||||
ruleset_id: int = Query(0, alias="m", description="Ruleset ID", ge=0),
|
||||
type: Literal["string", "id"] | None = Query(
|
||||
None, description="用户类型:string 用户名称 / id 用户 ID"
|
||||
),
|
||||
limit: int = Query(10, ge=1, le=100, description="返回的成绩数量"),
|
||||
session: AsyncSession = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
scores = (
|
||||
@@ -140,6 +139,7 @@ async def get_user_recent(
|
||||
description="获取指定谱面的成绩。",
|
||||
)
|
||||
async def get_scores(
|
||||
session: Database,
|
||||
user: str | None = Query(None, alias="u", description="用户"),
|
||||
beatmap_id: int = Query(alias="b", description="谱面 ID"),
|
||||
ruleset_id: int = Query(0, alias="m", description="Ruleset ID", ge=0),
|
||||
@@ -148,7 +148,6 @@ async def get_scores(
|
||||
),
|
||||
limit: int = Query(10, ge=1, le=100, description="返回的成绩数量"),
|
||||
mods: int = Query(0, description="成绩的 MOD"),
|
||||
session: AsyncSession = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
if user is not None:
|
||||
|
||||
@@ -5,14 +5,13 @@ from typing import Literal
|
||||
|
||||
from app.database.lazer_user import User
|
||||
from app.database.statistics import UserStatistics, UserStatisticsResp
|
||||
from app.dependencies.database import get_db
|
||||
from app.dependencies.database import Database
|
||||
from app.models.score import GameMode
|
||||
|
||||
from .router import AllStrModel, router
|
||||
|
||||
from fastapi import Depends, HTTPException, Query
|
||||
from fastapi import HTTPException, Query
|
||||
from sqlmodel import select
|
||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||
|
||||
|
||||
class V1User(AllStrModel):
|
||||
@@ -41,7 +40,7 @@ class V1User(AllStrModel):
|
||||
|
||||
@classmethod
|
||||
async def from_db(
|
||||
cls, session: AsyncSession, db_user: User, ruleset: GameMode | None = None
|
||||
cls, session: Database, db_user: User, ruleset: GameMode | None = None
|
||||
) -> "V1User":
|
||||
ruleset = ruleset or db_user.playmode
|
||||
current_statistics: UserStatistics | None = None
|
||||
@@ -92,6 +91,7 @@ class V1User(AllStrModel):
|
||||
description="获取指定用户的信息。",
|
||||
)
|
||||
async def get_user(
|
||||
session: Database,
|
||||
user: str = Query(..., alias="u", description="用户"),
|
||||
ruleset_id: int | None = Query(None, alias="m", description="Ruleset ID", ge=0),
|
||||
type: Literal["string", "id"] | None = Query(
|
||||
@@ -100,7 +100,6 @@ async def get_user(
|
||||
event_days: int = Query(
|
||||
default=1, ge=1, le=31, description="从现在起所有事件的最大天数"
|
||||
),
|
||||
session: AsyncSession = Depends(get_db),
|
||||
):
|
||||
db_user = (
|
||||
await session.exec(
|
||||
|
||||
Reference in New Issue
Block a user