mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-10 19:56:59 +03:00
Merge pull request #2535 from carltongibson/search-filter-duplicates
Fix duplicate results of `ManyToManyField` when using `SearchFilter`.
This commit is contained in:
commit
b999db1c46
|
@ -104,7 +104,7 @@ class SearchFilter(BaseFilterBackend):
|
|||
for search_term in self.get_search_terms(request):
|
||||
or_queries = [models.Q(**{orm_lookup: search_term})
|
||||
for orm_lookup in orm_lookups]
|
||||
queryset = queryset.filter(reduce(operator.or_, or_queries))
|
||||
queryset = queryset.filter(reduce(operator.or_, or_queries)).distinct()
|
||||
|
||||
return queryset
|
||||
|
||||
|
|
|
@ -429,6 +429,56 @@ class SearchFilterTests(TestCase):
|
|||
reload_module(filters)
|
||||
|
||||
|
||||
class AttributeModel(models.Model):
|
||||
label = models.CharField(max_length=32)
|
||||
|
||||
|
||||
class SearchFilterModelM2M(models.Model):
|
||||
title = models.CharField(max_length=20)
|
||||
text = models.CharField(max_length=100)
|
||||
attributes = models.ManyToManyField(AttributeModel)
|
||||
|
||||
|
||||
class SearchFilterM2MSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = SearchFilterModelM2M
|
||||
|
||||
|
||||
class SearchFilterM2MTests(TestCase):
|
||||
def setUp(self):
|
||||
# Sequence of title/text/attributes is:
|
||||
#
|
||||
# z abc [1, 2, 3]
|
||||
# zz bcd [1, 2, 3]
|
||||
# zzz cde [1, 2, 3]
|
||||
# ...
|
||||
for idx in range(3):
|
||||
label = 'w' * (idx + 1)
|
||||
AttributeModel(label=label)
|
||||
|
||||
for idx in range(10):
|
||||
title = 'z' * (idx + 1)
|
||||
text = (
|
||||
chr(idx + ord('a')) +
|
||||
chr(idx + ord('b')) +
|
||||
chr(idx + ord('c'))
|
||||
)
|
||||
SearchFilterModelM2M(title=title, text=text).save()
|
||||
SearchFilterModelM2M.objects.get(title='zz').attributes.add(1, 2, 3)
|
||||
|
||||
def test_m2m_search(self):
|
||||
class SearchListView(generics.ListAPIView):
|
||||
queryset = SearchFilterModelM2M.objects.all()
|
||||
serializer_class = SearchFilterM2MSerializer
|
||||
filter_backends = (filters.SearchFilter,)
|
||||
search_fields = ('=title', 'text', 'attributes__label')
|
||||
|
||||
view = SearchListView.as_view()
|
||||
request = factory.get('/', {'search': 'zz'})
|
||||
response = view(request)
|
||||
self.assertEqual(len(response.data), 1)
|
||||
|
||||
|
||||
class OrderingFilterModel(models.Model):
|
||||
title = models.CharField(max_length=20)
|
||||
text = models.CharField(max_length=100)
|
||||
|
|
Loading…
Reference in New Issue
Block a user