From bdf9f6237719d3ad5a7432a8459141be3eba2112 Mon Sep 17 00:00:00 2001
From: Sean Whalen <whalenster@gmail.com>
Date: Wed, 28 Nov 2018 11:08:47 -0500
Subject: [PATCH] Revert "Fix Elasticsearch/Python mapping mismatch"

This reverts commit e7e1f238ab4f955fa182aa753ef91eb8c85bacee.
---
 CHANGELOG.md          | 5 +----
 parsedmarc/elastic.py | 4 ++--
 requirements.txt      | 4 ++--
 setup.py              | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15ca563..f5eaa31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,7 @@
 5.1.0
 -----
 
-- Bugfix: Elasticsearch/Python mapping mismatch (fixes root cause of issue #25)
-- Remove static `elasticsearch` and `elasticsearch-dsl` versions from package requirements
-- Add support for TLS/SSL and username/password auth to Kafka
- 
+- Add support for TLS/SSL and uerename/password auth to Kafka 
 
 5.0.2
 -----
diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py
index 937ebd6..87d8f79 100644
--- a/parsedmarc/elastic.py
+++ b/parsedmarc/elastic.py
@@ -30,7 +30,7 @@ class _PublishedPolicy(InnerDoc):
     p = Text()
     sp = Text()
     pct = Integer()
-    fo = Text()
+    fo = Text()  # TODO: Change this to Text (issue #31)
 
 
 class _DKIMResult(InnerDoc):
@@ -54,7 +54,7 @@ class _AggregateReportDoc(Document):
     org_email = Text()
     org_extra_contact_info = Text()
     report_id = Text()
-    date_range = Date()
+    date_range = DateRange()
     errors = Text()
     published_policy = Object(_PublishedPolicy)
     source_ip_address = Ip()
diff --git a/requirements.txt b/requirements.txt
index 04e1e60..cb88f88 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,8 +9,8 @@ dnspython
 imapclient
 mail-parser
 dateparser
-elasticsearch
-elasticsearch-dsl
+elasticsearch==6.3.1
+elasticsearch-dsl==6.2.1
 kafka-python
 flake8
 sphinx
diff --git a/setup.py b/setup.py
index 95d92f8..1b5d3ad 100644
--- a/setup.py
+++ b/setup.py
@@ -95,8 +95,8 @@ setup(
     install_requires=['dnspython', 'expiringdict', 'publicsuffix',
                       'xmltodict', 'geoip2', 'urllib3<1.24,>=1.21.1',
                       'requests', 'imapclient', 'mail-parser', 'dateparser',
-                      'elasticsearch',
-                      'elasticsearch-dsl', 'kafka-python'
+                      'elasticsearch==6.3.1',
+                      'elasticsearch-dsl==6.2.1', 'kafka-python'
                       ],
 
     entry_points={