#42: Add level 2 include filtering

ral-facilities · Oct 17, 2019 · e410825 · e410825
1 parent 22d0be1
commit e410825
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/common/database_helpers.py b/common/database_helpers.py
@@ -168,7 +168,14 @@ def apply_filter(self, query):
             field = getattr(query.table, self.field)
         except AttributeError:
             raise BadFilterError(f"Bad  WhereFilter requested")
-        if self.included_field:
+
+        if self.included_included_field:
+            included_table = getattr(db_models, self.field)
+            included_included_table = getattr(db_models, self.included_field)
+            query.base_query = query.base_query.join(included_table).join(included_included_table)
+            field = getattr(included_included_table, self.included_included_field)
+
+        elif self.included_field:
             included_table = getattr(db_models, self.field)
             query.base_query = query.base_query.join(included_table)
             field = getattr(included_table, self.included_field)