Deduped recieved scopes

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - FlowDB now enables partitionwise aggregation planning by default
 
 ### Fixed
+- Queries that have multiple of the same subquery with different parameters no longer cause duplicate scopes in tokens. [#6580](https://github.com/Flowminder/FlowKit/issues/6580)
 
 ### Removed
 

flowapi/flowapi/permissions.py

@@ -72,21 +72,21 @@ def grab_on_key_list(in_iter, search_keys):
 @grab_on_key_list.register
 def _(in_iter: dict, search_keys: list):
     for key, value in in_iter.items():
-        try:
-            yield _search_for_nested_keys(in_iter, search_keys)
-        except (KeyError, TypeError):
-            pass
         yield from grab_on_key_list(value, search_keys)
+    try:
+        yield _search_for_nested_keys(in_iter, search_keys)
+    except (KeyError, TypeError):
+        pass
 
 
 @grab_on_key_list.register
 def _(in_iter: list, search_keys: list):
     for value in in_iter:
-        try:
-            yield _search_for_nested_keys(value, search_keys)
-        except (KeyError, TypeError):
-            pass
         yield from grab_on_key_list(value, search_keys)
+    try:
+        yield _search_for_nested_keys(value, search_keys)
+    except (KeyError, TypeError):
+        pass
 
 
 def _search_for_nested_keys(in_iter: dict, search_keys: Any) -> Any:
@@ -210,7 +210,9 @@ async def query_to_scopes(query_dict):
     except Exception:
         raise BadQueryError
     agg_unit = await get_agg_unit(query_dict)
-    return [f"{agg_unit}:{tl_query_name}:{query_name}" for query_name in query_list]
+    return list(
+        set(f"{agg_unit}:{tl_query_name}:{query_name}" for query_name in query_list)
+    )
 
 
 def tl_schema_scope_string(tl_query, query_string) -> set:

flowapi/tests/unit/test_permissions.py

@@ -3,7 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 import prance
 import quart
+from flowapi import permissions
 from flowapi.permissions import (
+    query_to_scopes,
     tl_schema_scope_string,
     schema_to_scopes,
     grab_on_key_list,
@@ -147,6 +149,32 @@ def test_scopes_from_query():
     }
     assert tl_schema_scope_string(tl_query, input) == expected
 
+    # TODO Test that params dedupe properly
+
+
+async def test_query_dedupes(monkeypatch):
+    async def mock_get_agg_unit(query_dict):
+        return "dummy_agg_unit"
+
+    monkeypatch.setattr(permissions, "get_agg_unit", mock_get_agg_unit)
+    input = dict(
+        query_kind="test",
+        aggregation_unit="dummy_agg_unit",
+        sub_param_1=dict(
+            query_kind="dummy_query",
+            aggregation_unit="dummy_agg_unit",
+            date="2020/01/01",
+        ),
+        sub_param_2=dict(
+            query_kind="dummy_query",
+            aggregation_unit="dummy_agg_unit",
+            date="2020/01/02",
+        ),
+    )
+    expected = ["dummy_agg_unit:test:test", "dummy_agg_unit:test:dummy_query"]
+    result = await query_to_scopes(input)
+    assert sorted(expected) == sorted(result)
+
 
 def test_grab_on_key_list():
     input = {"1": [{}, {}, {"3": "success"}]}