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.

tests/services/test_credit.py

@@ -49,7 +49,8 @@ class TestCreditService:
             mock_repo.get_by_id.return_value = sample_user
 
             result = await credit_service.check_credits(
-                1, CreditActionType.VLC_PLAY_SOUND,
+                1,
+                CreditActionType.VLC_PLAY_SOUND,
             )
 
             assert result is True
@@ -75,7 +76,8 @@ class TestCreditService:
             mock_repo.get_by_id.return_value = poor_user
 
             result = await credit_service.check_credits(
-                1, CreditActionType.VLC_PLAY_SOUND,
+                1,
+                CreditActionType.VLC_PLAY_SOUND,
             )
 
             assert result is False
@@ -92,7 +94,8 @@ class TestCreditService:
             mock_repo.get_by_id.return_value = None
 
             result = await credit_service.check_credits(
-                999, CreditActionType.VLC_PLAY_SOUND,
+                999,
+                CreditActionType.VLC_PLAY_SOUND,
             )
 
             assert result is False
@@ -100,7 +103,9 @@ class TestCreditService:
 
     @pytest.mark.asyncio
     async def test_validate_and_reserve_credits_success(
-        self, credit_service, sample_user,
+        self,
+        credit_service,
+        sample_user,
     ) -> None:
         """Test successful credit validation and reservation."""
         mock_session = credit_service.db_session_factory()
@@ -122,7 +127,8 @@ class TestCreditService:
 
     @pytest.mark.asyncio
     async def test_validate_and_reserve_credits_insufficient(
-        self, credit_service,
+        self,
+        credit_service,
     ) -> None:
         """Test credit validation with insufficient credits."""
         mock_session = credit_service.db_session_factory()
@@ -152,7 +158,8 @@ class TestCreditService:
 
     @pytest.mark.asyncio
     async def test_validate_and_reserve_credits_user_not_found(
-        self, credit_service,
+        self,
+        credit_service,
     ) -> None:
         """Test credit validation when user is not found."""
         mock_session = credit_service.db_session_factory()
@@ -225,7 +232,9 @@ class TestCreditService:
 
     @pytest.mark.asyncio
     async def test_deduct_credits_failed_action_requires_success(
-        self, credit_service, sample_user,
+        self,
+        credit_service,
+        sample_user,
     ) -> None:
         """Test credit deduction when action failed but requires success."""
         mock_session = credit_service.db_session_factory()

tests/services/test_extraction.py

@@ -175,7 +175,8 @@ class TestExtractionService:
 
     @pytest.mark.asyncio
     async def test_process_extraction_with_service_detection(
-        self, extraction_service,
+        self,
+        extraction_service,
     ) -> None:
         """Test extraction processing with service detection."""
         extraction_id = 1
@@ -314,6 +315,7 @@ class TestExtractionService:
 
                 result = await extraction_service._create_sound_record(
                     audio_path,
+                    None,  # thumbnail_path
                     extraction.title,
                     extraction.service,
                     extraction.service_id,

tests/services/test_player.py

@@ -94,6 +94,48 @@ class TestPlayerState:
         assert result["type"] == "SDB"
         assert result["thumbnail"] == "test.jpg"
         assert result["play_count"] == 5
+        assert result["extract_url"] is None
+
+    def test_serialize_sound_with_extraction_url(self) -> None:
+        """Test serializing a sound object with extraction URL."""
+        from app.models.extraction import Extraction
+
+        state = PlayerState()
+        sound = Sound(
+            id=1,
+            name="Test Song",
+            filename="test.mp3",
+            duration=30000,
+            size=1024,
+            type="EXT",
+            thumbnail="test.jpg",
+            play_count=5,
+        )
+
+        # Mock extraction relationship
+        extraction = Extraction(
+            id=1,
+            url="https://www.youtube.com/watch?v=test",
+            service="youtube",
+            service_id="test",
+            title="Test Song",
+            status="completed",
+            user_id=1,
+            sound_id=1,
+        )
+        sound.extractions = [extraction]
+
+        result = state._serialize_sound(sound)
+
+        assert result["id"] == 1
+        assert result["name"] == "Test Song"
+        assert result["filename"] == "test.mp3"
+        assert result["duration"] == 30000
+        assert result["size"] == 1024
+        assert result["type"] == "EXT"
+        assert result["thumbnail"] == "test.jpg"
+        assert result["play_count"] == 5
+        assert result["extract_url"] == "https://www.youtube.com/watch?v=test"
 
     def test_serialize_sound_with_none(self) -> None:
         """Test serializing None sound."""
@@ -132,13 +174,18 @@ class TestPlayerService:
 
     @pytest.fixture
     def player_service(
-        self, mock_db_session_factory, mock_vlc_instance, mock_socket_manager,
+        self,
+        mock_db_session_factory,
+        mock_vlc_instance,
+        mock_socket_manager,
     ):
         """Create a player service instance for testing."""
         return PlayerService(mock_db_session_factory)
 
     def test_init_creates_player_service(
-        self, mock_db_session_factory, mock_vlc_instance,
+        self,
+        mock_db_session_factory,
+        mock_vlc_instance,
     ) -> None:
         """Test that player service initializes correctly."""
         with patch("app.services.player.socket_manager"):
@@ -157,7 +204,9 @@ class TestPlayerService:
 
     @pytest.mark.asyncio
     async def test_start_initializes_service(
-        self, player_service, mock_vlc_instance,
+        self,
+        player_service,
+        mock_vlc_instance,
     ) -> None:
         """Test that start method initializes the service."""
         with patch.object(player_service, "reload_playlist", new_callable=AsyncMock):
@@ -204,7 +253,9 @@ class TestPlayerService:
             mock_path.return_value = mock_file_path
 
             with patch.object(
-                player_service, "_broadcast_state", new_callable=AsyncMock,
+                player_service,
+                "_broadcast_state",
+                new_callable=AsyncMock,
             ):
                 mock_media = Mock()
                 player_service._vlc_instance.media_new.return_value = mock_media
@@ -261,7 +312,9 @@ class TestPlayerService:
         player_service.state.status = PlayerStatus.STOPPED
 
         with patch.object(
-            player_service, "_broadcast_state", new_callable=AsyncMock,
+            player_service,
+            "_broadcast_state",
+            new_callable=AsyncMock,
         ) as mock_broadcast:
             await player_service.pause()
 
@@ -275,10 +328,14 @@ class TestPlayerService:
         player_service.state.current_sound_position = 5000
 
         with patch.object(
-            player_service, "_process_play_count", new_callable=AsyncMock,
+            player_service,
+            "_process_play_count",
+            new_callable=AsyncMock,
         ):
             with patch.object(
-                player_service, "_broadcast_state", new_callable=AsyncMock,
+                player_service,
+                "_broadcast_state",
+                new_callable=AsyncMock,
             ):
                 await player_service.stop_playback()
 
@@ -329,7 +386,9 @@ class TestPlayerService:
         player_service.state.status = PlayerStatus.STOPPED
 
         with patch.object(
-            player_service, "_broadcast_state", new_callable=AsyncMock,
+            player_service,
+            "_broadcast_state",
+            new_callable=AsyncMock,
         ) as mock_broadcast:
             await player_service.seek(15000)
 
@@ -391,7 +450,9 @@ class TestPlayerService:
             mock_repo.get_playlist_sounds.return_value = mock_sounds
 
             with patch.object(
-                player_service, "_broadcast_state", new_callable=AsyncMock,
+                player_service,
+                "_broadcast_state",
+                new_callable=AsyncMock,
             ):
                 await player_service.reload_playlist()
 
@@ -415,7 +476,9 @@ class TestPlayerService:
         sounds = [sound1, sound2]
 
         with patch.object(
-            player_service, "_stop_playback", new_callable=AsyncMock,
+            player_service,
+            "_stop_playback",
+            new_callable=AsyncMock,
         ) as mock_stop:
             await player_service._handle_playlist_id_changed(1, 2, sounds)
 
@@ -427,13 +490,16 @@ class TestPlayerService:
 
     @pytest.mark.asyncio
     async def test_handle_playlist_id_changed_empty_playlist(
-        self, player_service,
+        self,
+        player_service,
     ) -> None:
         """Test handling playlist ID change with empty playlist."""
         player_service.state.status = PlayerStatus.PLAYING
 
         with patch.object(
-            player_service, "_stop_playback", new_callable=AsyncMock,
+            player_service,
+            "_stop_playback",
+            new_callable=AsyncMock,
         ) as mock_stop:
             await player_service._handle_playlist_id_changed(1, 2, [])
 
@@ -444,7 +510,8 @@ class TestPlayerService:
 
     @pytest.mark.asyncio
     async def test_handle_same_playlist_track_exists_same_index(
-        self, player_service,
+        self,
+        player_service,
     ) -> None:
         """Test handling same playlist when track exists at same index."""
         sound1 = Sound(id=1, name="Song 1", filename="song1.mp3", duration=30000)
@@ -461,7 +528,8 @@ class TestPlayerService:
 
     @pytest.mark.asyncio
     async def test_handle_same_playlist_track_exists_different_index(
-        self, player_service,
+        self,
+        player_service,
     ) -> None:
         """Test handling same playlist when track exists at different index."""
         sound1 = Sound(id=2, name="Song 2", filename="song2.mp3", duration=45000)
@@ -483,7 +551,9 @@ class TestPlayerService:
         sounds = [sound1, sound2]  # Track with ID 1 is missing
 
         with patch.object(
-            player_service, "_handle_track_removed", new_callable=AsyncMock,
+            player_service,
+            "_handle_track_removed",
+            new_callable=AsyncMock,
         ) as mock_removed:
             await player_service._handle_same_playlist_track_check(1, 0, sounds)
             mock_removed.assert_called_once_with(1, sounds)
@@ -496,7 +566,9 @@ class TestPlayerService:
         sounds = [sound1]
 
         with patch.object(
-            player_service, "_stop_playback", new_callable=AsyncMock,
+            player_service,
+            "_stop_playback",
+            new_callable=AsyncMock,
         ) as mock_stop:
             await player_service._handle_track_removed(1, sounds)
 
@@ -511,7 +583,9 @@ class TestPlayerService:
         player_service.state.status = PlayerStatus.PLAYING
 
         with patch.object(
-            player_service, "_stop_playback", new_callable=AsyncMock,
+            player_service,
+            "_stop_playback",
+            new_callable=AsyncMock,
         ) as mock_stop:
             await player_service._handle_track_removed(1, [])
 
@@ -609,10 +683,14 @@ class TestPlayerService:
             mock_repo.get_playlist_sounds.return_value = mock_sounds
 
             with patch.object(
-                player_service, "_stop_playback", new_callable=AsyncMock,
+                player_service,
+                "_stop_playback",
+                new_callable=AsyncMock,
             ) as mock_stop:
                 with patch.object(
-                    player_service, "_broadcast_state", new_callable=AsyncMock,
+                    player_service,
+                    "_broadcast_state",
+                    new_callable=AsyncMock,
                 ):
                     await player_service.reload_playlist()
 
@@ -652,7 +730,9 @@ class TestPlayerService:
             mock_repo.get_playlist_sounds.return_value = mock_sounds
 
             with patch.object(
-                player_service, "_broadcast_state", new_callable=AsyncMock,
+                player_service,
+                "_broadcast_state",
+                new_callable=AsyncMock,
             ):
                 await player_service.reload_playlist()
 

tests/services/test_socket_service.py

@@ -270,7 +270,9 @@ class TestSocketManager:
 
     @pytest.mark.asyncio
     async def test_disconnect_handler_unknown_socket(
-        self, socket_manager, mock_sio,
+        self,
+        socket_manager,
+        mock_sio,
     ) -> None:
         """Test disconnect handler with unknown socket."""
         # Access the disconnect handler directly

tests/services/test_sound_normalizer.py

@@ -155,7 +155,8 @@ class TestSoundNormalizerService:
 
     @pytest.mark.asyncio
     async def test_normalize_sound_force_already_normalized(
-        self, normalizer_service,
+        self,
+        normalizer_service,
     ) -> None:
         """Test force normalizing a sound that's already normalized."""
         sound = Sound(
@@ -284,7 +285,8 @@ class TestSoundNormalizerService:
 
     @pytest.mark.asyncio
     async def test_normalize_sound_normalization_error(
-        self, normalizer_service,
+        self,
+        normalizer_service,
     ) -> None:
         """Test handling normalization errors."""
         sound = Sound(

tests/services/test_vlc_player.py

@@ -185,7 +185,9 @@ class TestVLCPlayerService:
     @pytest.mark.asyncio
     @patch("app.services.vlc_player.asyncio.create_subprocess_exec")
     async def test_stop_all_vlc_instances_success(
-        self, mock_subprocess, vlc_service,
+        self,
+        mock_subprocess,
+        vlc_service,
     ) -> None:
         """Test successful stopping of all VLC instances."""
         # Mock pgrep process (find VLC processes)
@@ -281,7 +283,9 @@ class TestVLCPlayerService:
     @pytest.mark.asyncio
     @patch("app.services.vlc_player.asyncio.create_subprocess_exec")
     async def test_stop_all_vlc_instances_error(
-        self, mock_subprocess, vlc_service,
+        self,
+        mock_subprocess,
+        vlc_service,
     ) -> None:
         """Test stopping VLC instances when an error occurs."""
         # Mock subprocess exception
@@ -341,10 +345,12 @@ class TestVLCPlayerService:
         mock_user_repo = AsyncMock()
 
         with patch(
-            "app.services.vlc_player.SoundRepository", return_value=mock_sound_repo,
+            "app.services.vlc_player.SoundRepository",
+            return_value=mock_sound_repo,
         ):
             with patch(
-                "app.services.vlc_player.UserRepository", return_value=mock_user_repo,
+                "app.services.vlc_player.UserRepository",
+                return_value=mock_user_repo,
             ):
                 with patch("app.services.vlc_player.socket_manager") as mock_socket:
                     # Mock the file path utility
@@ -424,10 +430,12 @@ class TestVLCPlayerService:
         )
 
         with patch(
-            "app.services.vlc_player.SoundRepository", return_value=mock_sound_repo,
+            "app.services.vlc_player.SoundRepository",
+            return_value=mock_sound_repo,
         ):
             with patch(
-                "app.services.vlc_player.UserRepository", return_value=mock_user_repo,
+                "app.services.vlc_player.UserRepository",
+                return_value=mock_user_repo,
             ):
                 with patch("app.services.vlc_player.socket_manager") as mock_socket:
                     # Setup mocks
@@ -461,6 +469,7 @@ class TestVLCPlayerService:
                             "sound_id": 1,
                             "sound_name": "Test Sound",
                             "user_id": 1,
+                            "user_name": "Admin User",
                             "play_count": 1,
                         },
                     )
@@ -474,7 +483,8 @@ class TestVLCPlayerService:
 
     @pytest.mark.asyncio
     async def test_record_play_count_always_creates_record(
-        self, vlc_service_with_db,
+        self,
+        vlc_service_with_db,
     ) -> None:
         """Test play count recording always creates a new SoundPlayed record."""
         # Mock session and repositories
@@ -503,10 +513,12 @@ class TestVLCPlayerService:
         )
 
         with patch(
-            "app.services.vlc_player.SoundRepository", return_value=mock_sound_repo,
+            "app.services.vlc_player.SoundRepository",
+            return_value=mock_sound_repo,
         ):
             with patch(
-                "app.services.vlc_player.UserRepository", return_value=mock_user_repo,
+                "app.services.vlc_player.UserRepository",
+                return_value=mock_user_repo,
             ):
                 with patch("app.services.vlc_player.socket_manager") as mock_socket:
                     # Setup mocks