Added search to userView

spa/api/v1/MixResource.py

@@ -130,17 +130,19 @@ class MixResource(BackboneCompatibleResource):
         return obj_list
 
     def apply_filters(self, request, applicable_filters):
-        semi_filtered = super(MixResource, self).apply_filters(request, applicable_filters).filter(
-            waveform_generated=True)
-        type = request.GET.get('type', None)
-        user = request.GET.get('user', None)
-        if type == 'favourites':
+        semi_filtered = super(MixResource, self)\
+            .apply_filters(request, applicable_filters)\
+            .filter(waveform_generated=True)
+
+        f_type = request.GET.get('type', None)
+        f_user = request.GET.get('user', None)
+        if f_type == 'favourites':
             semi_filtered = semi_filtered.filter(favourites__user=request.user.get_profile())
-        elif type == 'likes':
+        elif f_type == 'likes':
             semi_filtered = semi_filtered.filter(likes__user=request.user.get_profile())
 
-        if user is not None:
-            semi_filtered = semi_filtered.filter(user__slug=user)
+        if f_user is not None:
+            semi_filtered = semi_filtered.filter(user__slug=f_user)
 
         return semi_filtered
 

spa/api/v1/UserResource.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
-from django.db.models import Count
+from django.db.models import Count, Q
 from tastypie import fields
 from tastypie.authentication import Authentication
 from tastypie.authorization import DjangoAuthorization
@@ -97,6 +97,7 @@ class UserProfileResource(BackboneCompatibleResource):
     def dehydrate_mix_count(self, bundle):
         return bundle.obj.mixes.count()
 
+
 class UserResource(BackboneCompatibleResource):
     profile = fields.ToOneField(UserProfileResource, attribute='userprofile', related_name='user', full=True)
 
@@ -119,6 +120,18 @@ class UserResource(BackboneCompatibleResource):
                 self.wrap_view('dispatch_detail'), name="api_dispatch_detail"),
         ]
 
+    def apply_filters(self, request, applicable_filters):
+        semi_filtered = super(UserResource, self).apply_filters(request, applicable_filters)
+        q = request.GET.get('q', None)
+        if q is not None:
+            semi_filtered = semi_filtered.filter(
+                Q(first_name__icontains=q) |
+                Q(last_name__icontains=q) |
+                Q(username__icontains=q)
+            )
+
+        return semi_filtered
+
     def apply_sorting(self, obj_list, options=None):
         return super(UserResource, self).apply_sorting(obj_list, options)