kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
See #574: linting
rodzic
bf3b3854dc
commit
77973ba6f9
|
@ -557,7 +557,9 @@ class UploadQuerySet(models.QuerySet):
|
||||||
libraries = Library.objects.viewable_by(actor)
|
libraries = Library.objects.viewable_by(actor)
|
||||||
|
|
||||||
if include:
|
if include:
|
||||||
return self.filter(library__in=libraries, import_status="finished").distinct()
|
return self.filter(
|
||||||
|
library__in=libraries, import_status="finished"
|
||||||
|
).distinct()
|
||||||
return self.exclude(library__in=libraries, import_status="finished").distinct()
|
return self.exclude(library__in=libraries, import_status="finished").distinct()
|
||||||
|
|
||||||
def local(self, include=True):
|
def local(self, include=True):
|
||||||
|
|
|
@ -235,7 +235,9 @@ class SubsonicViewSet(viewsets.GenericViewSet):
|
||||||
except (TypeError, KeyError, ValueError):
|
except (TypeError, KeyError, ValueError):
|
||||||
size = 50
|
size = 50
|
||||||
|
|
||||||
queryset = queryset.playable_by(actor).prefetch_related('uploads').order_by("?")[:size]
|
queryset = (
|
||||||
|
queryset.playable_by(actor).prefetch_related("uploads").order_by("?")[:size]
|
||||||
|
)
|
||||||
data = {
|
data = {
|
||||||
"randomSongs": {
|
"randomSongs": {
|
||||||
"song": serializers.GetSongSerializer(queryset, many=True).data
|
"song": serializers.GetSongSerializer(queryset, many=True).data
|
||||||
|
|
|
@ -254,13 +254,15 @@ def test_get_random_songs(f, db, logged_in_api_client, factories, mocker):
|
||||||
factories["music.Track"]()
|
factories["music.Track"]()
|
||||||
|
|
||||||
order_by = mocker.patch.object(
|
order_by = mocker.patch.object(
|
||||||
music_models.TrackQuerySet, 'order_by', return_value=[track1, track2]
|
music_models.TrackQuerySet, "order_by", return_value=[track1, track2]
|
||||||
)
|
)
|
||||||
response = logged_in_api_client.get(url, {"f": f, "size": 2})
|
response = logged_in_api_client.get(url, {"f": f, "size": 2})
|
||||||
|
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert response.data == {
|
assert response.data == {
|
||||||
"randomSongs": {"song": serializers.GetSongSerializer([track1, track2], many=True).data}
|
"randomSongs": {
|
||||||
|
"song": serializers.GetSongSerializer([track1, track2], many=True).data
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
order_by.assert_called_once_with("?")
|
order_by.assert_called_once_with("?")
|
||||||
|
|
Ładowanie…
Reference in New Issue