refactor: isolate subscribe history queries

This commit is contained in:
jxxghp
2026-08-23 14:46:39 +08:00
parent 8b955c04d6
commit 5e9933ca8b
9 changed files with 132 additions and 58 deletions
+8 -6
View File
@@ -5,7 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import Mapped, Session, mapped_column
from app.db.base import Base, get_id_column
from app.db.decorators import db_query, async_db_query
from app.db.decorators import legacy_async_db_query, legacy_db_query
from app.db.models._constraints import media_identity_constraint
from app.schemas.types import MUSIC_ENTITY_RECORDING, MediaSource
@@ -107,8 +107,9 @@ class SubscribeHistory(Base):
)
@classmethod
@db_query
@legacy_db_query
def list_by_type(cls, db: Session, mtype: str, page: int = 1, count: int = 30):
"""按媒体类型分页查询订阅历史,并保留旧插件无 Session 调用。"""
return list(db.execute(
select(cls).where(
cls.type == mtype
@@ -118,8 +119,9 @@ class SubscribeHistory(Base):
).scalars().all())
@classmethod
@async_db_query
@legacy_async_db_query
async def async_list_by_type(cls, db: AsyncSession, mtype: str, page: int = 1, count: int = 30):
"""异步按媒体类型分页查询订阅历史,并保留旧插件无 Session 调用。"""
result = await db.execute(
select(cls).filter(
cls.type == mtype
@@ -130,7 +132,7 @@ class SubscribeHistory(Base):
return list(result.scalars().all())
@classmethod
@async_db_query
@legacy_async_db_query
async def async_list_by_type_and_username(
cls,
db: AsyncSession,
@@ -175,7 +177,7 @@ class SubscribeHistory(Base):
return condition
@classmethod
@db_query
@legacy_db_query
def exists(
cls, db: Session, media_source: MediaSource, media_id: str,
season: Optional[int] = None,
@@ -195,7 +197,7 @@ class SubscribeHistory(Base):
return db.execute(statement).scalars().first()
@classmethod
@async_db_query
@legacy_async_db_query
async def async_exists(
cls, db: AsyncSession, media_source: MediaSource, media_id: str,
season: Optional[int] = None,