diff --git a/Dockerfile b/Dockerfile index ac529d6..52f10e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.4.3 +FROM python:latest ENV PYTHONBUFFERED 1 RUN mkdir /code @@ -23,4 +23,4 @@ RUN npm install -g yuglify RUN pip install -r requirements.txt RUN adduser --disabled-password --gecos '' djworker -RUN chown djworker /files -R \ No newline at end of file +RUN chown djworker /files -R diff --git a/api/views.py b/api/views.py index 21ca924..fcd8dd5 100755 --- a/api/views.py +++ b/api/views.py @@ -88,7 +88,10 @@ class UserProfileViewSet(viewsets.ModelViewSet): class MixViewSet(viewsets.ModelViewSet): - queryset = Mix.objects.all().annotate(play_count=Count('activity_plays')) + queryset = Mix.objects.all().extra({ + 'play_count': 'SELECT COUNT(*) FROM spa_activityplay WHERE mix_id = spa_mix.id' + }) + serializer_class = serializers.MixSerializer permission_classes = (IsAuthenticatedOrReadOnly,) lookup_field = 'slug'