From fb0c7f0d6e2c943e3dbc8318f0546b5aa0d591dc Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Wed, 18 Nov 2015 20:50:20 +0000 Subject: [PATCH 1/3] Bumped python version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac529d6..d405689 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.4.3 +FROM python:3.5.0 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 From 8d3c934c77f4e33c449d6b5771abec49e787a38d Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Thu, 19 Nov 2015 19:28:42 +0000 Subject: [PATCH 2/3] Fixed python version in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d405689..52f10e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.5.0 +FROM python:latest ENV PYTHONBUFFERED 1 RUN mkdir /code From d3b636fe4163d4d9bc665f5f72fc76d18319c5df Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Thu, 19 Nov 2015 22:28:34 +0000 Subject: [PATCH 3/3] Fixed play count slowness --- api/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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'