From 40cde0cd924006890a87ead623e68ec465bbf63c Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 8 May 2018 21:21:52 +0200
Subject: [PATCH] Queryset methods on artist/albums
---
api/funkwhale_api/music/models.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index e6253eb9..b8697a4f 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -76,6 +76,11 @@ class APIModelMixin(models.Model):
self.musicbrainz_model, self.mbid)
+class ArtistQuerySet(models.QuerySet):
+ def with_albums_count(self):
+ return self.annotate(_albums_count=models.Count('albums'))
+
+
class Artist(APIModelMixin):
name = models.CharField(max_length=255)
@@ -89,6 +94,7 @@ class Artist(APIModelMixin):
}
}
api = musicbrainz.api.artists
+ objects = ArtistQuerySet.as_manager()
def __str__(self):
return self.name
@@ -129,6 +135,11 @@ def import_tracks(instance, cleaned_data, raw_data):
track = importers.load(Track, track_cleaned_data, track_data, Track.import_hooks)
+class AlbumQuerySet(models.QuerySet):
+ def with_tracks_count(self):
+ return self.annotate(_tracks_count=models.Count('tracks'))
+
+
class Album(APIModelMixin):
title = models.CharField(max_length=255)
artist = models.ForeignKey(
@@ -173,6 +184,7 @@ class Album(APIModelMixin):
'converter': import_artist,
}
}
+ objects = AlbumQuerySet.as_manager()
def get_image(self):
image_data = musicbrainz.api.images.get_front(str(self.mbid))
--
GitLab