better db model

src/core/entities/SerieList.py

@@ -147,7 +147,7 @@ class SerieList:
                 if result:
                     print(f"Added series: {result.name}")
         """
-        from src.server.database.service import AnimeSeriesService
+        from src.server.database.service import AnimeSeriesService, EpisodeService
 
         # Check if series already exists in DB
         existing = await AnimeSeriesService.get_by_key(db, serie.key)
@@ -166,9 +166,19 @@ class SerieList:
             name=serie.name,
             site=serie.site,
             folder=serie.folder,
-            episode_dict=serie.episodeDict,
         )
         
+        # Create Episode records for each episode in episodeDict
+        if serie.episodeDict:
+            for season, episode_numbers in serie.episodeDict.items():
+                for episode_number in episode_numbers:
+                    await EpisodeService.create(
+                        db=db,
+                        series_id=anime_series.id,
+                        season=season,
+                        episode_number=episode_number,
+                    )
+        
         # Also add to in-memory collection
         self.keyDict[serie.key] = serie
         
@@ -267,8 +277,10 @@ class SerieList:
         # Clear existing in-memory data
         self.keyDict.clear()
         
-        # Load all series from database
-        anime_series_list = await AnimeSeriesService.get_all(db)
+        # Load all series from database (with episodes for episodeDict)
+        anime_series_list = await AnimeSeriesService.get_all(
+            db, with_episodes=True
+        )
         
         for anime_series in anime_series_list:
             serie = self._convert_from_db(anime_series)
@@ -288,23 +300,22 @@ class SerieList:
         
         Args:
             anime_series: AnimeSeries model from database
+                (must have episodes relationship loaded)
             
         Returns:
             Serie entity instance
         """
-        # Convert episode_dict from JSON (string keys) to int keys
+        # Build episode_dict from episodes relationship
         episode_dict: dict[int, list[int]] = {}
-        if anime_series.episode_dict:
-            for season_str, episodes in anime_series.episode_dict.items():
-                try:
-                    season = int(season_str)
-                    episode_dict[season] = list(episodes)
-                except (ValueError, TypeError):
-                    logger.warning(
-                        "Invalid season key '%s' in episode_dict for %s",
-                        season_str,
-                        anime_series.key
-                    )
+        if anime_series.episodes:
+            for episode in anime_series.episodes:
+                season = episode.season
+                if season not in episode_dict:
+                    episode_dict[season] = []
+                episode_dict[season].append(episode.episode_number)
+            # Sort episode numbers within each season
+            for season in episode_dict:
+                episode_dict[season].sort()
         
         return Serie(
             key=anime_series.key,
@@ -325,19 +336,11 @@ class SerieList:
         Returns:
             Dictionary suitable for AnimeSeriesService.create()
         """
-        # Convert episode_dict keys to strings for JSON storage
-        episode_dict = None
-        if serie.episodeDict:
-            episode_dict = {
-                str(k): list(v) for k, v in serie.episodeDict.items()
-            }
-        
         return {
             "key": serie.key,
             "name": serie.name,
             "site": serie.site,
             "folder": serie.folder,
-            "episode_dict": episode_dict,
         }
 
     async def contains_in_db(self, key: str, db: "AsyncSession") -> bool: