From 0d95f8fee80997f7165e9caaa9e44f138e27e879 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Thu, 19 Jan 2023 15:20:26 -0500
Subject: [PATCH] Fix bug in unique tracks on different albums

---
 .coverage                                     | Bin 77824 -> 77824 bytes
 .drone.yml                                    |  19 ++-----------
 tests/scrobbles_tests/conftest.py             |  12 +++++++--
 tests/scrobbles_tests/test_views.py           |  25 ++++++++++++++++++
 ...009_alter_track_musicbrainz_id_and_more.py |  22 +++++++++++++++
 vrobbler/apps/music/models.py                 |   5 +++-
 6 files changed, 63 insertions(+), 20 deletions(-)
 create mode 100644 vrobbler/apps/music/migrations/0009_alter_track_musicbrainz_id_and_more.py

diff --git a/.coverage b/.coverage
index 20cee1c212e5f82b67de3257d69bbe9ae18e9abd..849b8dd131834d27283e89f94d742a01e44401fc 100644
GIT binary patch
delta 2747
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

delta 2698
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

diff --git a/.drone.yml b/.drone.yml
index 70aa1a0..285c745 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ name: run_tests
 
 steps:
   # Run tests against Python/Flask engine backend (with pytest)
-  - name: coverage
+  - name: pytest with coverage
     image: python:3.10.4
     commands:
       # Install dependencies
@@ -16,22 +16,7 @@ steps:
       - pip install poetry
       - poetry install
       # Start with a fresh database (which is already running as a service from Drone)
-      - poetry run pytest --cov-report term --cov=vrobbler tests
-    environment:
-      VROBBLER_DATABASE_URL: sqlite:///test.db
-    volumes:
-      # Mount pip cache from host
-      - name: pip_cache
-        path: /root/.cache/pip
-  - name: pytest
-    image: python:3.10.4
-    commands:
-      # Install dependencies
-      - cp vrobbler.conf.test vrobbler.conf
-      - pip install poetry
-      - poetry install
-      # Start with a fresh database (which is already running as a service from Drone)
-      - poetry run pytest
+      - poetry run pytest --cov-report term:skip-covered --cov=vrobbler tests
     environment:
       VROBBLER_DATABASE_URL: sqlite:///test.db
     volumes:
diff --git a/tests/scrobbles_tests/conftest.py b/tests/scrobbles_tests/conftest.py
index 938cebc..e854911 100644
--- a/tests/scrobbles_tests/conftest.py
+++ b/tests/scrobbles_tests/conftest.py
@@ -39,8 +39,16 @@ class MopidyRequest:
 
 
 @pytest.fixture
-def mopidy_track_request_data(**kwargs):
-    return MopidyRequest(**kwargs).request_json
+def mopidy_track_request_data():
+    return MopidyRequest().request_json
+
+
+@pytest.fixture
+def mopidy_track_diff_album_request_data(**kwargs):
+    mb_album_id = "0c56c457-afe1-4679-baab-759ba8dd2a58"
+    return MopidyRequest(
+        album="Gold", musicbrainz_album_id=mb_album_id
+    ).request_json
 
 
 @pytest.fixture
diff --git a/tests/scrobbles_tests/test_views.py b/tests/scrobbles_tests/test_views.py
index a139e28..2587882 100644
--- a/tests/scrobbles_tests/test_views.py
+++ b/tests/scrobbles_tests/test_views.py
@@ -38,6 +38,31 @@ def test_scrobble_mopidy_track(client, mopidy_track_request_data):
     assert scrobble.media_obj.title == "Same in the End"
 
 
+@pytest.mark.django_db
+def test_scrobble_mopidy_same_track_different_album(
+    client, mopidy_track_request_data, mopidy_track_diff_album_request_data
+):
+    url = reverse('scrobbles:mopidy-websocket')
+    response = client.post(
+        url, mopidy_track_request_data, content_type='application/json'
+    )
+    assert response.status_code == 200
+    assert response.data == {'scrobble_id': 1}
+    scrobble = Scrobble.objects.get(id=1)
+    assert scrobble.media_obj.album.name == "Sublime"
+
+    response = client.post(
+        url,
+        mopidy_track_diff_album_request_data,
+        content_type='application/json',
+    )
+
+    scrobble = Scrobble.objects.get(id=2)
+    assert scrobble.media_obj.__class__ == Track
+    assert scrobble.media_obj.album.name == "Gold"
+    assert scrobble.media_obj.title == "Same in the End"
+
+
 @pytest.mark.django_db
 def test_scrobble_mopidy_podcast(client, mopidy_podcast_request_data):
     url = reverse('scrobbles:mopidy-websocket')
diff --git a/vrobbler/apps/music/migrations/0009_alter_track_musicbrainz_id_and_more.py b/vrobbler/apps/music/migrations/0009_alter_track_musicbrainz_id_and_more.py
new file mode 100644
index 0000000..c5541c5
--- /dev/null
+++ b/vrobbler/apps/music/migrations/0009_alter_track_musicbrainz_id_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.1.5 on 2023-01-19 20:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('music', '0008_alter_track_options'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='track',
+            name='musicbrainz_id',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='track',
+            unique_together={('album', 'musicbrainz_id')},
+        ),
+    ]
diff --git a/vrobbler/apps/music/models.py b/vrobbler/apps/music/models.py
index c8f2418..c817e57 100644
--- a/vrobbler/apps/music/models.py
+++ b/vrobbler/apps/music/models.py
@@ -103,7 +103,10 @@ class Track(ScrobblableMixin):
 
     artist = models.ForeignKey(Artist, on_delete=models.DO_NOTHING)
     album = models.ForeignKey(Album, on_delete=models.DO_NOTHING, **BNULL)
-    musicbrainz_id = models.CharField(max_length=255, unique=True, **BNULL)
+    musicbrainz_id = models.CharField(max_length=255, **BNULL)
+
+    class Meta:
+        unique_together = [['album', 'musicbrainz_id']]
 
     def __str__(self):
         return f"{self.title} by {self.artist}"