#145: Fix bug where GET requests without distinct filter sometimes r…

…eturn a 400
ral-facilities · Oct 1, 2020 · d3a0f0b · d3a0f0b
1 parent a4baba3
commit d3a0f0b
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/common/icat/helpers.py b/common/icat/helpers.py
@@ -293,9 +293,13 @@ def entity_to_dict(self, entity, includes, distinct_fields=None):
                         " cause an issue further on in the request"
                     )
                 if isinstance(target, Entity):
-                    distinct_fields_copy = self.prepare_distinct_fields_for_recursion(
-                        key, distinct_fields
-                    )
+                    if distinct_fields is not None:
+                        distinct_fields_copy = self.prepare_distinct_fields_for_recursion(
+                            key, distinct_fields
+                        )
+                    else:
+                        distinct_fields_copy = None
+
                     d[key] = self.entity_to_dict(
                         target, includes_copy, distinct_fields_copy
                     )
@@ -304,9 +308,13 @@ def entity_to_dict(self, entity, includes, distinct_fields=None):
                 elif isinstance(target, EntityList):
                     d[key] = []
                     for e in target:
-                        distinct_fields_copy = self.prepare_distinct_fields_for_recursion(
-                            key, distinct_fields
-                        )
+                        if distinct_fields is not None:
+                            distinct_fields_copy = self.prepare_distinct_fields_for_recursion(
+                                key, distinct_fields
+                            )
+                        else:
+                            distinct_fields_copy = None
+
                         d[key].append(
                             self.entity_to_dict(e, includes_copy, distinct_fields_copy)
                         )