Merge branch 'master' into collection_expansions

OpenConceptLab · Jan 18, 2022 · c705bab · c705bab
2 parents aa5c149 + 826b66f
commit c705bab
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/core/__init__.py b/core/__init__.py
@@ -1,4 +1,4 @@
-API_VERSION = '2.0.111'
+API_VERSION = '2.0.112'
 API_BUILD = 'dev'
 VERSION = API_VERSION + '-' + API_BUILD
 __version__ = VERSION
diff --git a/core/common/tests.py b/core/common/tests.py
@@ -22,7 +22,7 @@
     to_camel_case,
     drop_version, is_versioned_uri, separate_version, to_parent_uri, jsonify_safe, es_get,
     get_resource_class_from_resource_name, flatten_dict, is_csv_file, is_url_encoded_string, to_parent_uri_from_kwargs,
-    set_current_user, get_current_user, set_request_url, get_request_url)
+    set_current_user, get_current_user, set_request_url, get_request_url, nested_dict_values)
 from core.concepts.models import Concept, LocalizedText
 from core.mappings.models import Mapping
 from core.orgs.models import Organization
@@ -743,6 +743,23 @@ def test_to_parent_uri_from_kwargs(self):
         self.assertIsNone(to_parent_uri_from_kwargs({}))
         self.assertIsNone(to_parent_uri_from_kwargs(None))
 
+    def test_nested_dict_values(self):
+        self.assertEqual(list(nested_dict_values({})), [])
+        self.assertEqual(list(nested_dict_values(dict(a=1))), [1])
+        self.assertEqual(list(nested_dict_values(dict(a=1, b='foobar'))), [1, 'foobar'])
+        self.assertEqual(
+            list(nested_dict_values(dict(a=1, b='foobar', c=dict(a=1, b='foobar')))),
+            [1, 'foobar', 1, 'foobar']
+        )
+        self.assertEqual(
+            list(
+                nested_dict_values(
+                    dict(a=1, b='foobar', c=dict(a=1, b='foobar', c=dict(d=[dict(a=1), dict(b='foobar')])))
+                )
+            ),
+            [1, 'foobar', 1, 'foobar', [{'a': 1}, {'b': 'foobar'}]]
+        )
+
 
 class BaseModelTest(OCLTestCase):
     def test_model_name(self):

diff --git a/core/common/utils.py b/core/common/utils.py
@@ -719,3 +719,11 @@ def named_tuple_fetchall(cursor):
     desc = cursor.description
     nt_result = namedtuple('Result', [col[0] for col in desc])
     return [nt_result(*row) for row in cursor.fetchall()]
+
+
+def nested_dict_values(_dict):
+    for value in _dict.values():
+        if isinstance(value, dict):
+            yield from nested_dict_values(value)
+        else:
+            yield value