From 13b67ed77a8f9e66c3222a60c8220aa709d3cfaf Mon Sep 17 00:00:00 2001 From: M1ha Date: Wed, 19 Dec 2018 12:58:34 +0500 Subject: [PATCH] Fix time between batches count --- src/django_clickhouse/clickhouse_models.py | 2 +- tests/test_clickhouse_models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/django_clickhouse/clickhouse_models.py b/src/django_clickhouse/clickhouse_models.py index d6054a7..b09e24c 100644 --- a/src/django_clickhouse/clickhouse_models.py +++ b/src/django_clickhouse/clickhouse_models.py @@ -231,7 +231,7 @@ class ClickHouseModel(with_metaclass(ClickHouseModelMeta, InfiModel)): if last_sync_time is None: return True - return (last_sync_time - datetime.datetime.now()).total_seconds() >= cls.get_sync_delay() + return (datetime.datetime.now() - last_sync_time).total_seconds() >= cls.get_sync_delay() class ClickHouseMultiModel(ClickHouseModel): diff --git a/tests/test_clickhouse_models.py b/tests/test_clickhouse_models.py index 8bd471b..860ebc6 100644 --- a/tests/test_clickhouse_models.py +++ b/tests/test_clickhouse_models.py @@ -26,5 +26,5 @@ class ClickHouseModelTest(TestCase): # Time has passed sync_delay = ClickHouseTestModel.get_sync_delay() self.storage.set_last_sync_time(ClickHouseTestModel.get_import_key(), - datetime.datetime.now() - datetime.timedelta(seconds=sync_delay)) - self.assertFalse(ClickHouseTestModel.need_sync()) + datetime.datetime.now() - datetime.timedelta(seconds=sync_delay + 1)) + self.assertTrue(ClickHouseTestModel.need_sync())