Merge pull request #157 from JeffreyMFarley/issue-1115

Include aggregation if it is used as a filter
cfpb · Jul 15, 2020 · 768fb54 · 768fb54
2 parents 8fc250d + 65ff163
commit 768fb54
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 2 deletions.
diff --git a/complaint_search/es_builders.py b/complaint_search/es_builders.py
@@ -409,8 +409,10 @@ def build(self):
 
         agg_fields = self._AGG_FIELDS
         if self.exclude:
-            agg_fields = [field_name for field_name in self._AGG_FIELDS
-                          if field_name not in self.exclude]
+            agg_fields = [
+                field_name for field_name in self._AGG_FIELDS
+                if field_name not in self.exclude or field_name in self.params
+            ]
         for field_name in agg_fields:
             aggs[field_name] = self.build_one(field_name)
 

diff --git a/complaint_search/tests/expected_results/search_with_company__valid.json b/complaint_search/tests/expected_results/search_with_company__valid.json
@@ -62,6 +62,22 @@
     }
   },
   "aggs": {
+    "company": {
+      "aggs": {
+        "company": {
+          "terms": {
+            "field": "company.raw",
+            "size": 0
+          }
+        }
+      },
+      "filter": {
+        "bool": {
+          "must": [],
+          "must_not": []
+        }
+      }
+    },
     "company_public_response": {
       "aggs": {
         "company_public_response": {

diff --git a/complaint_search/tests/expected_results/search_with_company_agg_exclude__valid.json b/complaint_search/tests/expected_results/search_with_company_agg_exclude__valid.json
@@ -62,6 +62,22 @@
     }
   },
   "aggs": {
+    "company": {
+      "aggs": {
+        "company": {
+          "terms": {
+            "field": "company.raw",
+            "size": 0
+          }
+        }
+      },
+      "filter": {
+        "bool": {
+          "must": [],
+          "must_not": []
+        }
+      }
+    },
     "company_public_response": {
       "aggs": {
         "company_public_response": {

diff --git a/complaint_search/tests/expected_results/search_with_zip_code__valid.json b/complaint_search/tests/expected_results/search_with_zip_code__valid.json
@@ -364,6 +364,22 @@
           "must_not": []
         }
       }
+    },
+    "zip_code": {
+      "aggs": {
+        "zip_code": {
+          "terms": {
+            "field": "zip_code",
+            "size": 0
+          }
+        }
+      },
+      "filter": {
+        "bool": {
+          "must": [],
+          "must_not": []
+        }
+      }
     }
   }
 }
diff --git a/complaint_search/tests/expected_results/search_with_zip_code_agg_exclude__valid.json b/complaint_search/tests/expected_results/search_with_zip_code_agg_exclude__valid.json
@@ -390,6 +390,22 @@
           "must_not": []
         }
       }
+    },
+    "zip_code": {
+      "aggs": {
+        "zip_code": {
+          "terms": {
+            "field": "zip_code",
+            "size": 0
+          }
+        }
+      },
+      "filter": {
+        "bool": {
+          "must": [],
+          "must_not": []
+        }
+      }
     }
   }
 }