From deda2f2b0897d9fb25ba58fd25122be6f29f125f Mon Sep 17 00:00:00 2001 From: Petitminion Date: Sun, 9 Mar 2025 17:30:38 +0100 Subject: [PATCH] Revert "fix(db):drop library migration bugs NOCHANGELOG" This reverts commit 3843996e75a17dde4bc0733fb403d5eb02fe6756. --- ...um_artist_remove_track_artist_artistcredit_and_more.py | 2 +- ...ion.py => 0060_remove_library_description_and_more.py} | 8 ++++++-- ..._playlist.py => 0061_migrate_libraries_to_playlist.py} | 6 ++---- .../music/migrations/0062_upload_third_party_provider.py | 2 +- api/tests/music/test_migrations.py | 7 ++----- 5 files changed, 12 insertions(+), 13 deletions(-) rename api/funkwhale_api/music/migrations/{0061_del_lib_description.py => 0060_remove_library_description_and_more.py} (54%) rename api/funkwhale_api/music/migrations/{0060_migrate_libraries_to_playlist.py => 0061_migrate_libraries_to_playlist.py} (93%) diff --git a/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py b/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py index 480730d90..b434d730d 100644 --- a/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py +++ b/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py @@ -36,7 +36,7 @@ def set_all_artists_credit(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ ("music", "0058_upload_quality"), - ("playlists", "0007_alter_playlist_actor_alter_playlisttrack_uuid_and_more"), + ("playlists", "0008_playlist_library_drop"), ] operations = [ diff --git a/api/funkwhale_api/music/migrations/0061_del_lib_description.py b/api/funkwhale_api/music/migrations/0060_remove_library_description_and_more.py similarity index 54% rename from api/funkwhale_api/music/migrations/0061_del_lib_description.py rename to api/funkwhale_api/music/migrations/0060_remove_library_description_and_more.py index c2f8bf6a7..6d14e152f 100644 --- a/api/funkwhale_api/music/migrations/0061_del_lib_description.py +++ b/api/funkwhale_api/music/migrations/0060_remove_library_description_and_more.py @@ -1,10 +1,14 @@ -from django.db import migrations +# Generated by Django 4.2.9 on 2025-01-03 20:43 + +from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("music", "0060_migrate_libraries_to_playlist"), + ("music", "0059_remove_album_artist_remove_track_artist_artistcredit_and_more"), + ("playlists", "0007_alter_playlist_actor_alter_playlisttrack_uuid_and_more"), ] + operations = [ migrations.RemoveField( model_name="library", diff --git a/api/funkwhale_api/music/migrations/0060_migrate_libraries_to_playlist.py b/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py similarity index 93% rename from api/funkwhale_api/music/migrations/0060_migrate_libraries_to_playlist.py rename to api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py index 7a5bb73cb..52be63931 100644 --- a/api/funkwhale_api/music/migrations/0060_migrate_libraries_to_playlist.py +++ b/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py @@ -46,7 +46,6 @@ def migrate_libraries_to_playlist(apps, schema_editor): actor=library.actor, creation_date=library.creation_date, privacy_level=library.privacy_level, - description=library.description, uuid=(new_uuid := uuid.uuid4()), fid=federation_utils.full_url( reverse( @@ -87,7 +86,7 @@ def migrate_libraries_to_playlist(apps, schema_editor): uuid=(new_uuid := uuid.uuid4()), fid=federation_utils.full_url( reverse( - f"federation:music:libraries-detail", + f"federation:music:playlists-detail", kwargs={"uuid": new_uuid}, ) ), @@ -100,8 +99,7 @@ def migrate_libraries_to_playlist(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ("music", "0059_remove_album_artist_remove_track_artist_artistcredit_and_more"), - ("playlists", "0008_playlist_library_drop"), + ("music", "0060_remove_library_description_and_more"), ] operations = [ migrations.RunPython( diff --git a/api/funkwhale_api/music/migrations/0062_upload_third_party_provider.py b/api/funkwhale_api/music/migrations/0062_upload_third_party_provider.py index fba5c4c55..40499048d 100644 --- a/api/funkwhale_api/music/migrations/0062_upload_third_party_provider.py +++ b/api/funkwhale_api/music/migrations/0062_upload_third_party_provider.py @@ -5,7 +5,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("music", "0061_del_lib_description"), + ("music", "0061_migrate_libraries_to_playlist"), ] operations = [ diff --git a/api/tests/music/test_migrations.py b/api/tests/music/test_migrations.py index e971055ab..125e619cc 100644 --- a/api/tests/music/test_migrations.py +++ b/api/tests/music/test_migrations.py @@ -85,7 +85,7 @@ def test_migrate_libraries_to_playlist(migrator): "music", "0059_remove_album_artist_remove_track_artist_artistcredit_and_more", ) - music_final_migration = ("music", "0060_migrate_libraries_to_playlist") + music_final_migration = ("music", "0061_migrate_libraries_to_playlist") # Apply migrations migrator.migrate( @@ -110,9 +110,7 @@ def test_migrate_libraries_to_playlist(migrator): existing_urls = Actor.objects.values_list("fid", flat=True) print(existing_urls) target_actor = Actor.objects.create( - name="Test Actor 2", - domain=domain2, - fid="http://test2.com/superduniquemanonmam", + name="Test Actor 2", domain=domain2, fid="http://test2.com/superduniquemanonmam" ) library = Library.objects.create( @@ -121,7 +119,6 @@ def test_migrate_libraries_to_playlist(migrator): creation_date=now(), privacy_level="everyone", uuid=uuid4(), - description="This is a description", ) Track.objects.create()