Merge pull request #23 from manuelnaranjo/master

__in filter

Author: philipn

rest_framework_filters/fields.py

@@ -0,0 +1,11 @@
+from django import forms
+
+class ArrayDecimalField(forms.DecimalField):
+    def clean(self, value):
+        if value is None:
+            return None
+
+        out = []
+        for val in value.split(','):
+            out.append(super(ArrayDecimalField, self).clean(val))
+        return out

rest_framework_filters/filters.py

@@ -8,6 +8,7 @@
 import django_filters
 from django_filters.filters import *
 
+from . import fields
 
 def subsitute_iso8601(date_type):
     from rest_framework import ISO_8601
@@ -80,3 +81,16 @@ class TimeFilter(django_filters.DateTimeFilter):
     def __init__(self, *args, **kwargs):
         super(TimeFilter, self).__init__(*args, **kwargs)
         self.extra.update({'input_formats': TIME_INPUT_FORMATS})
+
+
+class InSetNumberFilter(NumberFilter):
+    field_class = fields.ArrayDecimalField
+
+    def filter(self, qs, value):
+        if value in ([], (), {}, None, ''):
+            return qs
+        method = qs.exclude if self.exclude else qs.filter
+        qs = method(**{self.name: value})
+        if self.distinct:
+            qs = qs.distinct()
+        return qs

rest_framework_filters/filterset.py

@@ -73,6 +73,8 @@ def fix_filter_field(self, f):
         lookup_type = f.lookup_type
         if lookup_type == 'isnull':
             return filters.BooleanFilter(name=("%s%sisnull" % (f.name, LOOKUP_SEP)))
+        if lookup_type == 'in' and type(f) in [filters.NumberFilter]:
+            return filters.InSetNumberFilter(name=("%s%sin" % (f.name, LOOKUP_SEP)))
         return f
 
     def populate_from_filterset(self, filterset, filter_, name):

rest_framework_filters/tests.py

@@ -231,6 +231,11 @@ class ExplicitLookupsPersonDateFilter(FilterSet):
     class Meta:
         model = Person
 
+class InSetLookupPersonFilter(FilterSet):
+    pk = AllLookupsFilter('id')
+
+    class Meta:
+        model = Person
 
 class TestFilterSets(TestCase):
     def setUp(self):
@@ -626,3 +631,41 @@ class Meta:
         self.assertEqual(len(list(f)), 1)
         p = list(f)[0]
         self.assertEqual(p.name, "John")
+
+    def test_inset_filter(self):
+        p1 = Person.objects.get(name="John").pk
+        p2 = Person.objects.get(name="Mark").pk
+
+        ALL_GET = {
+            'pk__in': '{:d},{:d}'.format(p1, p2),
+        }
+        f = InSetLookupPersonFilter(ALL_GET, queryset=Person.objects.all())
+        f = [x.pk for x in f]
+        self.assertEqual(len(f), 2)
+        self.assertIn(p1, f)
+        self.assertIn(p2, f)
+
+
+        INVALID_GET = {
+            'pk__in': '{:d},c{:d}'.format(p1, p2)
+        }
+        f = InSetLookupPersonFilter(INVALID_GET, queryset=Person.objects.all())
+        self.assertEqual(len(list(f)), 0)
+
+        EXTRA_GET = {
+            'pk__in': '{:d},{:d},{:d}'.format(p1, p2, p1*p2)
+        }
+        f = InSetLookupPersonFilter(EXTRA_GET, queryset=Person.objects.all())
+        f = [x.pk for x in f]
+        self.assertEqual(len(f), 2)
+        self.assertIn(p1, f)
+        self.assertIn(p2, f)
+
+        DISORDERED_GET = {
+            'pk__in': '{:d},{:d},{:d}'.format(p2, p2*p1, p1)
+        }
+        f = InSetLookupPersonFilter(DISORDERED_GET, queryset=Person.objects.all())
+        f = [x.pk for x in f]
+        self.assertEqual(len(f), 2)
+        self.assertIn(p1, f)
+        self.assertIn(p2, f)