Refactor sound and extraction services to include user and timestamp fields

- Updated ExtractionInfo to include user_id, created_at, and updated_at fields.
- Modified ExtractionService to return user and timestamp information in extraction responses.
- Enhanced sound serialization in PlayerState to include extraction URL if available.
- Adjusted PlaylistRepository to load sound extractions when retrieving playlist sounds.
- Added tests for new fields in extraction and sound endpoints, ensuring proper response structure.
- Created new test file endpoints for sound downloads and thumbnail retrievals, including success and error cases.
- Refactored various test cases for consistency and clarity, ensuring proper mocking and assertions.

app/services/extraction.py

@@ -31,6 +31,9 @@ class ExtractionInfo(TypedDict):
     status: str
     error: str | None
     sound_id: int | None
+    user_id: int
+    created_at: str
+    updated_at: str
 
 
 class ExtractionService:
@@ -88,6 +91,9 @@ class ExtractionService:
                 "status": extraction.status,
                 "error": extraction.error,
                 "sound_id": extraction.sound_id,
+                "user_id": extraction.user_id,
+                "created_at": extraction.created_at.isoformat(),
+                "updated_at": extraction.updated_at.isoformat(),
             }
 
     async def _detect_service_info(self, url: str) -> dict[str, str | None] | None:
@@ -201,6 +207,7 @@ class ExtractionService:
             # Create Sound record
             sound = await self._create_sound_record(
                 final_audio_path,
+                final_thumbnail_path,
                 extraction_title,
                 extraction_service,
                 extraction_service_id,
@@ -208,6 +215,9 @@ class ExtractionService:
 
             # Store sound_id early to avoid session detachment issues
             sound_id = sound.id
+            if not sound_id:
+                msg = "Sound creation failed - no ID returned"
+                raise RuntimeError(msg)
 
             # Normalize the sound
             await self._normalize_sound(sound_id)
@@ -234,6 +244,8 @@ class ExtractionService:
                 error_msg,
             )
         else:
+            # Get updated extraction to get latest timestamps
+            updated_extraction = await self.extraction_repo.get_by_id(extraction_id)
             return {
                 "id": extraction_id,
                 "url": extraction_url,
@@ -243,6 +255,17 @@ class ExtractionService:
                 "status": "completed",
                 "error": None,
                 "sound_id": sound_id,
+                "user_id": user_id,
+                "created_at": (
+                    updated_extraction.created_at.isoformat()
+                    if updated_extraction
+                    else ""
+                ),
+                "updated_at": (
+                    updated_extraction.updated_at.isoformat()
+                    if updated_extraction
+                    else ""
+                ),
             }
 
             # Update extraction with error
@@ -254,6 +277,8 @@ class ExtractionService:
                 },
             )
 
+            # Get updated extraction to get latest timestamps
+            updated_extraction = await self.extraction_repo.get_by_id(extraction_id)
             return {
                 "id": extraction_id,
                 "url": extraction_url,
@@ -263,6 +288,17 @@ class ExtractionService:
                 "status": "failed",
                 "error": error_msg,
                 "sound_id": None,
+                "user_id": user_id,
+                "created_at": (
+                    updated_extraction.created_at.isoformat()
+                    if updated_extraction
+                    else ""
+                ),
+                "updated_at": (
+                    updated_extraction.updated_at.isoformat()
+                    if updated_extraction
+                    else ""
+                ),
             }
 
     async def _extract_media(
@@ -409,6 +445,7 @@ class ExtractionService:
     async def _create_sound_record(
         self,
         audio_path: Path,
+        thumbnail_path: Path | None,
         title: str | None,
         service: str | None,
         service_id: str | None,
@@ -427,6 +464,7 @@ class ExtractionService:
             "duration": duration,
             "size": size,
             "hash": file_hash,
+            "thumbnail": thumbnail_path.name if thumbnail_path else None,
             "is_deletable": True,  # Extracted sounds can be deleted
             "is_music": True,  # Assume extracted content is music
             "is_normalized": False,
@@ -434,7 +472,11 @@ class ExtractionService:
         }
 
         sound = await self.sound_repo.create(sound_data)
-        logger.info("Created sound record with ID: %d", sound.id)
+        logger.info(
+            "Created sound record with ID: %d, thumbnail: %s",
+            sound.id,
+            thumbnail_path.name if thumbnail_path else "None",
+        )
 
         return sound
 
@@ -496,6 +538,9 @@ class ExtractionService:
             "status": extraction.status,
             "error": extraction.error,
             "sound_id": extraction.sound_id,
+            "user_id": extraction.user_id,
+            "created_at": extraction.created_at.isoformat(),
+            "updated_at": extraction.updated_at.isoformat(),
         }
 
     async def get_user_extractions(self, user_id: int) -> list[ExtractionInfo]:
@@ -513,6 +558,9 @@ class ExtractionService:
                 "status": extraction.status,
                 "error": extraction.error,
                 "sound_id": extraction.sound_id,
+                "user_id": extraction.user_id,
+                "created_at": extraction.created_at.isoformat(),
+                "updated_at": extraction.updated_at.isoformat(),
             }
             for extraction in extractions
         ]
@@ -532,6 +580,9 @@ class ExtractionService:
                 "status": extraction.status,
                 "error": extraction.error,
                 "sound_id": extraction.sound_id,
+                "user_id": extraction.user_id,
+                "created_at": extraction.created_at.isoformat(),
+                "updated_at": extraction.updated_at.isoformat(),
             }
             for extraction in extractions
         ]

app/services/player.py

@@ -87,6 +87,14 @@ class PlayerState:
         """Serialize a sound object for JSON serialization."""
         if not sound:
             return None
+
+        # Get extraction URL if sound is linked to an extraction
+        extract_url = None
+        if hasattr(sound, "extractions") and sound.extractions:
+            # Get the first extraction (there should only be one per sound)
+            extraction = sound.extractions[0]
+            extract_url = extraction.url
+
         return {
             "id": sound.id,
             "name": sound.name,
@@ -96,6 +104,7 @@ class PlayerState:
             "type": sound.type,
             "thumbnail": sound.thumbnail,
             "play_count": sound.play_count,
+            "extract_url": extract_url,
         }
 
 
@@ -585,7 +594,8 @@ class PlayerService:
 
                 # Check if track finished
                 player_state = self._player.get_state()
-                if hasattr(vlc, "State") and player_state == vlc.State.Ended:
+                vlc_state_ended = 6  # vlc.State.Ended value
+                if player_state == vlc_state_ended:
                     # Track finished, handle auto-advance
                     self._schedule_async_task(self._handle_track_finished())