From 02d2c12188a8fb7d6c1b1cf9ebad1c5daf10fe41 Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Tue, 27 Mar 2018 10:15:43 -0400 Subject: [PATCH] Fix existing aggregate report query --- parsedmarc/elastic.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py index bf6b155f..c8337749 100644 --- a/parsedmarc/elastic.py +++ b/parsedmarc/elastic.py @@ -204,10 +204,13 @@ def save_aggregate_report_to_elasticsearch(aggregate_report): org_name_query = Q(dict(match=dict(org_name=org_name))) domain_query = Q(dict(match=dict(domain=domain))) - date_range_query = Q(dict(match=dict(date_range=end_date))) + begin_date_query = Q(dict(match=dict(date_range=begin_date))) + end_date_query = Q(dict(match=dict(date_range=end_date))) search = aggregate_index.search() - search.query = org_name_query & domain_query & date_range_query + search.query = org_name_query & domain_query & begin_date_query & \ + end_date_query + existing = search.execute() if len(existing) > 0: raise AlreadySaved("Aggregate report from {0} about {1} with end date "