add test for es_update --start and fix regression in --start flag

#39 es_update start flag broken

Author: codekiln

django_elastic_migrations/management/commands/es_update.py

@@ -47,7 +47,7 @@ def add_arguments(self, parser):
             "--start",
             dest="start_date",
             help="The start date for indexing. Can be any dateutil-parsable string;"
-                 " YYYY-MM-DDTHH:MM:SS is recommended to avoid confusion",
+                 "YYYY-MM-DD or YYYY-MM-DDTHH:MM:SS is recommended to avoid confusion",
         )
 
     def handle(self, *args, **options):

django_elastic_migrations/models.py

@@ -965,7 +965,14 @@ def __init__(self, *args, **kwargs):
         super(UpdateIndexAction, self).__init__(*args, **kwargs)
         if self.task_kwargs == '{}' and self.self_kwargs:
             # retain a history of how this command was called
-            self.task_kwargs = json.dumps(self.self_kwargs, sort_keys=True)
+            try:
+                self.task_kwargs = json.dumps(self.self_kwargs, sort_keys=True)
+            except TypeError as e:
+                if 'Object of type datetime is not JSON serializable' in str(e):
+                    for key, val in self.self_kwargs.items():
+                        if isinstance(val, datetime.date):
+                            self.self_kwargs[key] = str(val)
+                    self.task_kwargs = json.dumps(self.self_kwargs, sort_keys=True)
 
         self._batch_num = 0
         self._expected_remaining = 0

tests/test_management_commands.py

@@ -1,6 +1,7 @@
 from __future__ import (absolute_import, division, print_function, unicode_literals)
 
 import logging
+from datetime import datetime, timedelta
 from unittest import skip
 
 from django.contrib.humanize.templatetags.humanize import ordinal
@@ -17,6 +18,10 @@
 log = logging.getLogger(__file__)
 
 
+def days_ago(d):
+    return datetime.now() - timedelta(days=d)
+
+
 # noinspection PyUnresolvedReferences
 class CommonDEMTestUtilsMixin(object):
 
@@ -227,6 +232,26 @@ def test_newer_flag(self):
                                  actual_num=actual_num_docs
                              ))
 
+    def test_start_flag(self):
+        self.check_basic_setup_and_get_models()
+
+        num_docs = MovieSearchIndex.get_num_docs()
+        self.assertEqual(num_docs, 0)
+
+        Movie.objects.all().update(last_modified=days_ago(3))
+        call_command('es_update', 'movies', '--start={}'.format(days_ago(2).isoformat()))
+        num_docs = MovieSearchIndex.get_num_docs()
+        # we had last modified set to three days ago, and we only updated last two days,
+        # so we should not have any.
+        self.assertEqual(num_docs, 0)
+
+        Movie.objects.all().update(last_modified=days_ago(1))
+        call_command('es_update', 'movies', '--start={}'.format(days_ago(2).isoformat()))
+        num_docs = MovieSearchIndex.get_num_docs()
+        # we had last modified set to one days ago, and we only updated last two days,
+        # so we should have two
+        self.assertEqual(num_docs, 2)
+
 
 @skip("Skipped multiprocessing tests until SQLLite can be integrated into test setup")
 # @tag('multiprocessing')