fix subscribe api

app/db/models/subscribe.py

@@ -2,6 +2,7 @@ from sqlalchemy import Column, Integer, String, Sequence
 from sqlalchemy.orm import Session
 
 from app.db.models import Base
+from app.schemas import MediaType
 
 
 class Subscribe(Base):
@@ -19,8 +20,8 @@ class Subscribe(Base):
     keyword = Column(String)
     tmdbid = Column(Integer, index=True)
     imdbid = Column(String)
-    tvdbid = Column(Integer, index=True)
-    doubanid = Column(String)
+    tvdbid = Column(Integer)
+    doubanid = Column(String, index=True)
     # 季号
     season = Column(Integer)
     # 海报
@@ -60,7 +61,10 @@ class Subscribe(Base):
         return db.query(Subscribe).filter(Subscribe.state == state).all()
 
     @staticmethod
-    def get_by_tmdbid(db: Session, tmdbid: int):
+    def get_by_tmdbid(db: Session, tmdbid: int, season: int = None):
+        if season:
+            return db.query(Subscribe).filter(Subscribe.tmdbid == tmdbid,
+                                              Subscribe.season == season).all()
         return db.query(Subscribe).filter(Subscribe.tmdbid == tmdbid).all()
 
     @staticmethod
@@ -68,5 +72,17 @@ class Subscribe(Base):
         return db.query(Subscribe).filter(Subscribe.name == title).first()
 
     @staticmethod
-    def get_by_tvdbid(db: Session, tvdbid: int):
-        return db.query(Subscribe).filter(Subscribe.tvdbid == tvdbid).first()
+    def get_by_doubanid(db: Session, doubanid: str):
+        return db.query(Subscribe).filter(Subscribe.doubanid == doubanid).first()
+
+    def delete_by_tmdbid(self, db: Session, tmdbid: int, season: int):
+        subscrbies = self.get_by_tmdbid(db, tmdbid, season)
+        for subscrbie in subscrbies:
+            subscrbie.delete(db, subscrbie.id)
+        return True
+
+    def delete_by_doubanid(self, db: Session, doubanid: str):
+        subscribe = self.get_by_doubanid(db, doubanid)
+        if subscribe:
+            subscribe.delete(db, subscribe.id)
+        return True

app/db/models/systemconfig.py

@@ -18,7 +18,8 @@ class SystemConfig(Base):
     def get_by_key(db: Session, key: str):
         return db.query(SystemConfig).filter(SystemConfig.key == key).first()
 
-    @staticmethod
-    def delete_by_key(db: Session, key: str):
-        db.query(SystemConfig).filter(SystemConfig.key == key).delete()
-        db.commit()
+    def delete_by_key(self, db: Session, key: str):
+        systemconfig = self.get_by_key(db, key)
+        if systemconfig:
+            systemconfig.delete(db, systemconfig.id)
+        return True

app/db/models/user.py

@@ -37,6 +37,8 @@ class User(Base):
     def get_by_name(db: Session, name: str):
         return db.query(User).filter(User.name == name).first()
 
-    @staticmethod
-    def delete_by_name(db: Session, name: str):
-        return db.query(User).filter(User.name == name).delete()
+    def delete_by_name(self, db: Session, name: str):
+        user = self.get_by_name(db, name)
+        if user:
+            user.delete(db, user.id)
+        return True

app/db/subscribe_oper.py

@@ -14,22 +14,23 @@ class SubscribeOper(DbOper):
         """
         新增订阅
         """
-        subscribe = Subscribe(name=mediainfo.title,
-                              year=mediainfo.year,
-                              type=mediainfo.type.value,
-                              tmdbid=mediainfo.tmdb_id,
-                              imdbid=mediainfo.imdb_id,
-                              tvdbid=mediainfo.tvdb_id,
-                              poster=mediainfo.get_poster_image(),
-                              backdrop=mediainfo.get_backdrop_image(),
-                              vote=mediainfo.vote_average,
-                              description=mediainfo.overview,
-                              **kwargs)
-        if not subscribe.exists(self._db, tmdbid=mediainfo.tmdb_id, season=kwargs.get('season')):
+        subscribe = Subscribe.exists(self._db, tmdbid=mediainfo.tmdb_id, season=kwargs.get('season'))
+        if not subscribe:
+            subscribe = Subscribe(name=mediainfo.title,
+                                  year=mediainfo.year,
+                                  type=mediainfo.type.value,
+                                  tmdbid=mediainfo.tmdb_id,
+                                  imdbid=mediainfo.imdb_id,
+                                  tvdbid=mediainfo.tvdb_id,
+                                  poster=mediainfo.get_poster_image(),
+                                  backdrop=mediainfo.get_backdrop_image(),
+                                  vote=mediainfo.vote_average,
+                                  description=mediainfo.overview,
+                                  **kwargs)
             subscribe.create(self._db)
             return subscribe.id, "新增订阅成功"
         else:
-            return 0, "订阅已存在"
+            return subscribe.id, "订阅已存在"
 
     def get(self, sid: int) -> Subscribe:
         """