From 96c7a3fc92cda32a0642dba2deffcc1b50e45b95 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 2 Jul 2023 14:37:36 +0800
Subject: [PATCH] fix bug

---
 app/api/endpoints/subscribe.py   | 5 ++++-
 app/db/models/transferhistory.py | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/api/endpoints/subscribe.py b/app/api/endpoints/subscribe.py
index 943b3b1c..1b35900d 100644
--- a/app/api/endpoints/subscribe.py
+++ b/app/api/endpoints/subscribe.py
@@ -9,6 +9,8 @@ from app.core.config import settings
 from app.core.security import verify_token
 from app.db import get_db
 from app.db.models.subscribe import Subscribe
+from app.db.models.user import User
+from app.db.userauth import get_current_active_user
 from app.schemas.types import MediaType
 
 router = APIRouter()
@@ -56,7 +58,7 @@ async def subscribe_info_by_id(
 async def create_subscribe(
         *,
         subscribe_in: schemas.Subscribe,
-        _: schemas.TokenPayload = Depends(verify_token)
+        current_user: User = Depends(get_current_active_user),
 ) -> Any:
     """
     新增订阅
@@ -77,6 +79,7 @@ async def create_subscribe(
                                   tmdbid=subscribe_in.tmdbid,
                                   season=subscribe_in.season,
                                   doubanid=subscribe_in.doubanid,
+                                  username=current_user.name,
                                   exist_ok=True)
     return schemas.Response(success=True if result else False, message=result)
 
diff --git a/app/db/models/transferhistory.py b/app/db/models/transferhistory.py
index fa9dee85..4b840763 100644
--- a/app/db/models/transferhistory.py
+++ b/app/db/models/transferhistory.py
@@ -46,12 +46,14 @@ class TransferHistory(Base):
 
     @staticmethod
     def list_by_title(db: Session, title: str, page: int = 1, count: int = 30):
-        return db.query(TransferHistory).filter(TransferHistory.title == title).offset((page - 1) * count).limit(
+        return db.query(TransferHistory).filter(TransferHistory.title == title).order_by(
+            TransferHistory.date.desc()).offset((page - 1) * count).limit(
             count).all()
 
     @staticmethod
     def list_by_page(db: Session, page: int = 1, count: int = 30):
-        return db.query(TransferHistory).offset((page - 1) * count).limit(count).all()
+        return db.query(TransferHistory).order_by(TransferHistory.date.desc()).offset((page - 1) * count).limit(
+            count).all()
 
     @staticmethod
     def get_by_hash(db: Session, download_hash: str):