Merge pull request #13 from maxipavlovic/bugfix/LITE-13440

LITE-13440 Fixed wrong `path` in OptimizationArgs for logical namespaces

Author: maxipavlovic

dj_rql/filter_cls.py

@@ -595,15 +595,19 @@ def _fill_select_tree(self, f_name, full_f_name, select_tree,
             elif parent_qs and (not isinstance(parent_qs, Annotation)):
                 changed_qs = qs.rebuild(parent_qs)
 
+        is_logical_namespace = len(filter_name_parts) > 1
+        path = ''
         for index, filter_name_part in enumerate(filter_name_parts):
+            path += filter_name_part
             current_select_tree.setdefault(filter_name_part, {
                 'hidden': hidden,
                 'fields': {},
                 'namespace': namespace or (index != last_filter_name_part_index),
                 'qs': changed_qs,
-                'path': full_f_name,
+                'path': path if is_logical_namespace else full_f_name,
             })
             current_select_tree = current_select_tree[filter_name_part]['fields']
+            path += '.'
 
         return current_select_tree, parent_qs if not qs else changed_qs
 

tests/test_filter_cls/test_select.py

@@ -6,6 +6,7 @@
 from django.core.exceptions import FieldError
 from django.db.models import CharField, IntegerField, Value
 
+from dj_rql.drf.fields import SelectField
 from dj_rql.exceptions import RQLFilterParsingError
 from dj_rql.filter_cls import RQLFilterClass
 from dj_rql.qs import AN, CH, PR, NPR, NSR, SR
@@ -793,3 +794,27 @@ class AnnotationCls(RQLFilterClass):
 
     with pytest.raises(FieldError):
         AnnotationCls(book_qs).apply_filters('ft=2')
+
+
+def test_deselect_namespace():
+    class Cls(SelectFilterCls):
+        FILTERS = (
+            {
+                'filter': 'ns.author',
+                'dynamic': True,
+                'qs': NSR('author'),
+                'field': SelectField(),
+            },
+            {
+                'namespace': 'ns2',
+                'source': 'author',
+                'qs': AN(ns=Value('abc', CharField(max_length=128))),
+                'filters': ('id',),
+            },
+        )
+
+    _, qs = Cls(book_qs).apply_filters('')
+    assert qs.query.select_related == {'author': {}}
+
+    _, qs = Cls(book_qs).apply_filters('select(-ns,-ns2)')
+    assert not qs.query.select_related