refactor: isolate subscribe history queries

app/db/models/subscribehistory.py

@@ -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,

app/db/oper/subscribe.py

@@ -653,4 +653,6 @@ class SubscribeOper(DbOper):
             "season": season,
             "episode_group": episode_group,
         }
-        return bool(SubscribeHistory.exists(self._db, **identity_params))
+        return bool(self._execute_sync_query(
+            lambda session: SubscribeHistory.exists(session, **identity_params)
+        ))

app/db/oper/subscribehistory.py

@@ -1,5 +1,8 @@
 from typing import List, Optional
 
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
 from app.db.base import DbOper
 from app.db.models.subscribehistory import SubscribeHistory
 
@@ -18,11 +21,13 @@ class SubscribeHistoryOper(DbOper):
         """
         异步按媒体类型分页查询订阅历史。
         """
-        return await SubscribeHistory.async_list_by_type(
-            self._db,
-            mtype=mtype,
-            page=page,
-            count=count,
+        return await self._execute_async_query(
+            lambda session: SubscribeHistory.async_list_by_type(
+                session,
+                mtype=mtype,
+                page=page,
+                count=count,
+            )
         )
 
     async def async_list_by_type_and_username(
@@ -33,17 +38,26 @@ class SubscribeHistoryOper(DbOper):
         count: int = 30,
     ) -> List[SubscribeHistory]:
         """异步按媒体类型和用户分页查询订阅历史。"""
-        return await SubscribeHistory.async_list_by_type_and_username(
-            self._db,
-            mtype=mtype,
-            username=username,
-            page=page,
-            count=count,
+        return await self._execute_async_query(
+            lambda session: SubscribeHistory.async_list_by_type_and_username(
+                session,
+                mtype=mtype,
+                username=username,
+                page=page,
+                count=count,
+            )
         )
 
     async def async_get(self, history_id: int) -> Optional[SubscribeHistory]:
         """异步按 ID 查询订阅历史。"""
-        return await SubscribeHistory.async_get(self._db, history_id)
+        async def query(session: AsyncSession) -> Optional[SubscribeHistory]:
+            """在调用方异步会话中按主键查询历史。"""
+            result = await session.execute(
+                select(SubscribeHistory).where(SubscribeHistory.id == history_id)
+            )
+            return result.scalars().first()
+
+        return await self._execute_async_query(query)
 
     async def async_delete(self, history_id: int) -> None:
         """异步删除订阅历史。"""