Merge 112a823 into c28a166

commcare_export/checkpoint.py

@@ -12,6 +12,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
+from commcare_export.exceptions import DataExportException
 from commcare_export.writers import SqlMixin
 
 logger = logging.getLogger(__name__)
@@ -86,7 +87,8 @@ def set_final_checkpoint(self):
 
     def _set_checkpoint(self, checkpoint_time, final):
         logger.info('Setting %s checkpoint: %s', 'final' if final else 'batch', checkpoint_time)
-        checkpoint_time = checkpoint_time or datetime.datetime.utcnow()
+        if not checkpoint_time:
+            raise DataExportException('Tried to set an empty checkpoint. This is not allowed.')
         with session_scope(self.Session) as session:
             session.add(Checkpoint(
                 id=uuid.uuid4().hex,

commcare_export/commcare_hq_client.py

@@ -141,15 +141,18 @@ def iterate_resource(resource=resource, params=params):
                     else:
                         more_to_fetch = False
 
-                self.checkpoint(paginator, batch)
+                    self.checkpoint(paginator, batch)
 
         return RepeatableIterator(iterate_resource)
 
     def checkpoint(self, paginator, batch):
         from commcare_export.commcare_minilinq import DatePaginator
         if self._checkpoint_manager and isinstance(paginator, DatePaginator):
             since_date = paginator.get_since_date(batch)
-            self._checkpoint_manager.set_batch_checkpoint(checkpoint_time=since_date)
+            if since_date:
+                self._checkpoint_manager.set_batch_checkpoint(checkpoint_time=since_date)
+            else:
+                logger.warning('Failed to get a checkpoint date from a batch of data.')
 
 
 class MockCommCareHqClient(object):