See #170: exclude by default all channels-related entities from /artists,...

See #170: exclude by default all channels-related entities from /artists, /albums and /tracks endpoints results, for backward compatibility

api/tests/audio/test_views.py

+import pytest
+
+from django.urls import reverse
+
+from funkwhale_api.audio import serializers
+
+
+def test_channel_create(logged_in_api_client):
+    actor = logged_in_api_client.user.create_actor()
+
+    data = {
+        # TODO: cover
+        "name": "My channel",
+        "username": "mychannel",
+        "summary": "This is my channel",
+        "tags": ["hello", "world"],
+    }
+
+    url = reverse("api:v1:channels-list")
+    response = logged_in_api_client.post(url, data)
+
+    assert response.status_code == 201
+
+    channel = actor.owned_channels.latest("id")
+    expected = serializers.ChannelSerializer(channel).data
+
+    assert response.data == expected
+    assert channel.artist.name == data["name"]
+    assert channel.artist.attributed_to == actor
+    assert (
+        sorted(channel.artist.tagged_items.values_list("tag__name", flat=True))
+        == data["tags"]
+    )
+    assert channel.attributed_to == actor
+    assert channel.actor.summary == data["summary"]
+    assert channel.actor.preferred_username == data["username"]
+    assert channel.library.privacy_level == "public"
+    assert channel.library.actor == actor
+
+
+def test_channel_detail(factories, logged_in_api_client):
+    channel = factories["audio.Channel"]()
+    url = reverse("api:v1:channels-detail", kwargs={"uuid": channel.uuid})
+    expected = serializers.ChannelSerializer(channel).data
+    response = logged_in_api_client.get(url)
+
+    assert response.status_code == 200
+    assert response.data == expected
+
+
+def test_channel_list(factories, logged_in_api_client):
+    channel = factories["audio.Channel"]()
+    url = reverse("api:v1:channels-list")
+    expected = serializers.ChannelSerializer(channel).data
+    response = logged_in_api_client.get(url)
+
+    assert response.status_code == 200
+    assert response.data == {
+        "results": [expected],
+        "count": 1,
+        "next": None,
+        "previous": None,
+    }
+
+
+def test_channel_update(logged_in_api_client, factories):
+    actor = logged_in_api_client.user.create_actor()
+    channel = factories["audio.Channel"](attributed_to=actor)
+
+    data = {
+        # TODO: cover
+        "name": "new name"
+    }
+
+    url = reverse("api:v1:channels-detail", kwargs={"uuid": channel.uuid})
+    response = logged_in_api_client.patch(url, data)
+
+    assert response.status_code == 200
+
+    channel.refresh_from_db()
+
+    assert channel.artist.name == data["name"]
+
+
+def test_channel_update_permission(logged_in_api_client, factories):
+    logged_in_api_client.user.create_actor()
+    channel = factories["audio.Channel"]()
+
+    data = {"name": "new name"}
+
+    url = reverse("api:v1:channels-detail", kwargs={"uuid": channel.uuid})
+    response = logged_in_api_client.patch(url, data)
+
+    assert response.status_code == 403
+
+
+def test_channel_delete(logged_in_api_client, factories):
+    actor = logged_in_api_client.user.create_actor()
+    channel = factories["audio.Channel"](attributed_to=actor)
+
+    url = reverse("api:v1:channels-detail", kwargs={"uuid": channel.uuid})
+    response = logged_in_api_client.delete(url)
+
+    assert response.status_code == 204
+
+    with pytest.raises(channel.DoesNotExist):
+        channel.refresh_from_db()
+
+
+def test_channel_delete_permission(logged_in_api_client, factories):
+    logged_in_api_client.user.create_actor()
+    channel = factories["audio.Channel"]()
+
+    url = reverse("api:v1:channels-detail", kwargs={"uuid": channel.uuid})
+    response = logged_in_api_client.patch(url)
+
+    assert response.status_code == 403
+    channel.refresh_from_db()
+
+
+@pytest.mark.parametrize("url_name", ["api:v1:channels-list"])
+def test_channel_views_disabled_via_feature_flag(
+    url_name, logged_in_api_client, preferences
+):
+    preferences["audio__channels_enabled"] = False
+    url = reverse(url_name)
+    response = logged_in_api_client.get(url)
+    assert response.status_code == 405

api/tests/music/test_filters.py

@@ -60,8 +60,8 @@ def test_artist_filter_track_album_artist(factories, mocker, queryset_equal_list
     "factory_name, filterset_class",
     [
         ("music.Track", filters.TrackFilter),
-        ("music.Artist", filters.TrackFilter),
-        ("music.Album", filters.TrackFilter),
+        ("music.Artist", filters.ArtistFilter),
+        ("music.Album", filters.AlbumFilter),
     ],
 )
 def test_track_filter_tag_single(

api/tests/music/test_views.py

@@ -997,3 +997,49 @@ def test_refetch_obj(mocker, factories, settings, service_actor):
     views.refetch_obj(obj, obj.__class__.objects.all())
     fetch = obj.fetches.filter(actor=service_actor).order_by("-creation_date").first()
     fetch_task.assert_called_once_with(fetch_id=fetch.pk)
+
+
+@pytest.mark.parametrize(
+    "params, expected",
+    [({}, 0), ({"include_channels": "false"}, 0), ({"include_channels": "true"}, 1)],
+)
+def test_artist_list_exclude_channels(
+    params, expected, factories, logged_in_api_client
+):
+    factories["audio.Channel"]()
+
+    url = reverse("api:v1:artists-list")
+    response = logged_in_api_client.get(url, params)
+
+    assert response.status_code == 200
+    assert response.data["count"] == expected
+
+
+@pytest.mark.parametrize(
+    "params, expected",
+    [({}, 0), ({"include_channels": "false"}, 0), ({"include_channels": "true"}, 1)],
+)
+def test_album_list_exclude_channels(params, expected, factories, logged_in_api_client):
+    channel_artist = factories["audio.Channel"]().artist
+    factories["music.Album"](artist=channel_artist)
+
+    url = reverse("api:v1:albums-list")
+    response = logged_in_api_client.get(url, params)
+
+    assert response.status_code == 200
+    assert response.data["count"] == expected
+
+
+@pytest.mark.parametrize(
+    "params, expected",
+    [({}, 0), ({"include_channels": "false"}, 0), ({"include_channels": "true"}, 1)],
+)
+def test_track_list_exclude_channels(params, expected, factories, logged_in_api_client):
+    channel_artist = factories["audio.Channel"]().artist
+    factories["music.Track"](artist=channel_artist)
+
+    url = reverse("api:v1:tracks-list")
+    response = logged_in_api_client.get(url, params)
+
+    assert response.status_code == 200
+    assert response.data["count"] == expected