prepare 0.17.7

CHANGELOG.rst

@@ -17,7 +17,7 @@ are used for versioning (schema follows below):
 
 0.17.7
 ------
-2019-xx-xx (not-yet-released)
+2019-05-30
 
 .. note::
 
@@ -29,6 +29,7 @@ are used for versioning (schema follows below):
 - Fixes in occasionally failing search test (``test_search`` and
   ``test_filtering_geo_spatial``).
 - Working travis.
+- Fixed issue with errors on empty ``ids`` filter.
 
 0.17.6
 ------

docs/changelog.rst

@@ -17,7 +17,7 @@ are used for versioning (schema follows below):
 
 0.17.7
 ------
-2019-xx-xx (not-yet-released)
+2019-05-30
 
 .. note::
 
@@ -29,6 +29,7 @@ are used for versioning (schema follows below):
 - Fixes in occasionally failing search test (``test_search`` and
   ``test_filtering_geo_spatial``).
 - Working travis.
+- Fixed issue with errors on empty ``ids`` filter.
 
 0.17.6
 ------

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.17.6'
+version = '0.17.7'
 
 DOCS_TRANSFORMATIONS = (
     (
@@ -200,7 +200,7 @@
     url='https://github.com/barseghyanartur/django-elasticsearch-dsl-drf/',
     package_dir={'': 'src'},
     packages=find_packages(where='./src'),
-    license='GPL 2.0/LGPL 2.1',
+    license='GPL-2.0-only OR LGPL-2.1-or-later',
     install_requires=(install_requires + extras_require),
     tests_require=tests_require,
     include_package_data=True,

src/django_elasticsearch_dsl_drf/__init__.py

@@ -3,7 +3,7 @@
 """
 
 __title__ = 'django-elasticsearch-dsl-drf'
-__version__ = '0.17.6'
+__version__ = '0.17.7'
 __author__ = 'Artur Barseghyan <[email protected]>'
 __copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

src/django_elasticsearch_dsl_drf/filter_backends/filtering/ids.py

@@ -88,11 +88,11 @@ def get_ids_values(self, request, view):
         :rtype: elasticsearch_dsl.search.Search
         """
         query_params = self.get_ids_query_params(request)
-        __ids = []
-        for __id in query_params:
-            __values = self.split_lookup_complex_value(__id)
-            __ids += __values
-        return __ids
+        _ids = []
+        for _id in query_params:
+            _values = self.split_lookup_complex_value(_id)
+            _ids += _values
+        return _ids
 
     def filter_queryset(self, request, queryset, view):
         """Filter the queryset.
@@ -109,8 +109,10 @@ def filter_queryset(self, request, queryset, view):
         __ids = self.get_ids_values(request, view)
 
         if __ids:
+            _ids = [_i for _i in __ids if _i]
             queryset = queryset.query(
                 'ids',
-                **{'values': __ids, 'type': view.mapping}
+                **{'values': _ids, 'type': view.mapping}
             )
+
         return queryset

src/django_elasticsearch_dsl_drf/tests/test_filtering_common.py

@@ -535,6 +535,20 @@ def test_ids_filter(self):
             self.published_count
         )
 
+    def test_ids_empty_filter(self):
+        """Test ids filter with empty value. This should not fail.
+
+        Example:
+
+            http://localhost:8000/api/articles/?ids=
+        """
+        __ids = []
+        return self._field_filter_value(
+            'ids',
+            SEPARATOR_LOOKUP_COMPLEX_VALUE.join(__ids),
+            0
+        )
+
     def test_default_filter_lookup(self):
         """Test default filter lookup.