From ad2a3163aea9389e6357ab02e14b4d8d0165afe7 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Thu, 30 Jun 2016 21:54:08 +0100
Subject: [PATCH] User initial filtering

---
 api/views.py     | 4 ++++
 dss/settings.py  | 7 +++----
 requirements.txt | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/api/views.py b/api/views.py
index d78d47f..42cd496 100755
--- a/api/views.py
+++ b/api/views.py
@@ -72,6 +72,7 @@ class UserProfileViewSet(viewsets.ModelViewSet):
     lookup_field = 'slug'
     filter_fields = (
         'slug',
+        'user__first_name',
     )
 
     def get_queryset(self):
@@ -81,6 +82,9 @@ class UserProfileViewSet(viewsets.ModelViewSet):
             ret = UserProfile.objects.filter(followers__slug__in=[self.request.query_params['followers']])
         elif 'messaged_with' in self.request.query_params:
             ret = UserProfile.objects.filter(messages__slug__in=[self.request.query_params['followers']])
+        elif 'initial' in self.request.query_params:
+            ret = UserProfile.objects.filter(user__first_name__startswith=self.request.query_params['initial']) \
+                                     .annotate(mix_count=Count('mixes')).order_by('-mix_count')
         else:
             ret = super(UserProfileViewSet, self).get_queryset()
 
diff --git a/dss/settings.py b/dss/settings.py
index 33ba9ab..73dcf5f 100755
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -93,7 +93,7 @@ MIDDLEWARE_CLASSES = (
     # 'htmlmin.middleware.HtmlMinifyMiddleware',
     # 'htmlmin.middleware.MarkRequestMiddleware',
     # 'spa.middleware.uploadify.SWFUploadMiddleware',
-    # 'spa.middleware.sqlprinter.SqlPrintingMiddleware',
+    'spa.middleware.sqlprinter.SqlPrintingMiddleware',
     # 'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
@@ -195,9 +195,8 @@ REST_FRAMEWORK = {
         'rest_framework.authentication.BasicAuthentication',
         'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
     ),
-    'PAGINATE_BY': 12,  # Default to 10
-    'PAGINATE_BY_PARAM': 'limit',  # Allow client to override, using `?page_size=xxx`.
-    'MAX_PAGINATE_BY': 100  # Maximum limit allowed when using `?page_size=xxx`.}
+    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
+    'PAGE_SIZE': 10
 }
 
 DEFAULT_TRACK_IMAGE = 'assets/images/dyn/default-track-200.png'
diff --git a/requirements.txt b/requirements.txt
index 20fbab7..3e4e502 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -36,7 +36,7 @@ djrill
 
 celery
 
-djangorestframework==3.1.3
+djangorestframework==3.3.3
 djangorestframework-jwt==1.6.0
 drf-nested-routers
 pillow