Temporary kill the stale object check

datahub/company/tasks.py

@@ -3,6 +3,7 @@
 from celery import shared_task
 from dateutil import parser
 from django.apps import apps
+from django.utils.timezone import make_naive
 from raven.contrib.django.raven_compat.models import client, settings
 from requests import RequestException
 
@@ -30,22 +31,23 @@ def save_to_korben(self, object_id, user_id, db_table, update):
             name=name
         )
     )
-    korben_connector = KorbenConnector()
-    data = object_to_save.convert_model_to_korben_format()
-    remote_object = korben_connector.get(
-        data=data,
-        table_name=db_table
-    )
-    if parser.parse(remote_object.json()['modified_on']) <= object_to_save.modified_on:
-        try:
-            object_to_save.save_to_korben(update)
-        except (KorbenException, RequestException) as e:
-            client.captureException()
-            raise self.retry(
-                exc=e,
-                countdown=settings.TASK_RETRY_DELAY_SECONDS,
-                max_retries=settings.TASK_MAX_RETRIES,
-            )
-    else:
-        task_info.note = 'Stale object, not saved.'
-        task_info.save()
+    # korben_connector = KorbenConnector()
+    # data = object_to_save.convert_model_to_korben_format()
+    # remote_object = korben_connector.get(
+    #     data=data,
+    #     table_name=db_table
+    # )
+    # cdms_time = parser.parse(remote_object.json()['modified_on'])
+    # if make_naive(cdms_time) <= object_to_save.modified_on:
+    try:
+        object_to_save.save_to_korben(update)
+    except (KorbenException, RequestException) as e:
+        client.captureException()
+        raise self.retry(
+            exc=e,
+            countdown=settings.TASK_RETRY_DELAY_SECONDS,
+            max_retries=settings.TASK_MAX_RETRIES,
+        )
+    # else:
+    #     itask_info.note = 'Stale object, not saved.'
+    #     task_info.save()

datahub/company/test/test_tasks.py

@@ -1,4 +1,4 @@
-import datetime
+# import datetime
 from unittest import mock
 import pytest
 
@@ -34,28 +34,28 @@ def test_save_to_korben_task_happy_path(mocked_save_to_korben):
     assert mocked_save_to_korben.called_once_with(False)
 
 
-@mock.patch('datahub.core.mixins.DeferredSaveModelMixin.save_to_korben')
-@mock.patch('datahub.company.tasks.KorbenConnector')
-def test_save_to_korben_task_stale_object(mocked_korben_connector, mocked_save_to_korben):
-    """Save to Korben task works."""
-    date_in_the_future = datetime.datetime.now() + datetime.timedelta(1)
-    mocked_korben_connector().get.return_value.json.return_value = {
-        'modified_on': date_in_the_future.isoformat()
-    }
-    company = CompanyFactory()
-    user = get_test_user()
-
-    save_to_korben(
-        object_id=str(company.id),
-        user_id=str(user.id),
-        db_table='company_company',
-        update=True
-    )
-
-    task_info = TaskInfo.objects.get(user=user)
-    assert task_info.note == 'Stale object, not saved.'
-    # check save_to_korben called
-    assert mocked_save_to_korben.called is False
+# @mock.patch('datahub.core.mixins.DeferredSaveModelMixin.save_to_korben')
+# @mock.patch('datahub.company.tasks.KorbenConnector')
+# def test_save_to_korben_task_stale_object(mocked_korben_connector, mocked_save_to_korben):
+#     """Save to Korben task works."""
+#     date_in_the_future = datetime.datetime.now() + datetime.timedelta(1)
+#     mocked_korben_connector().get.return_value.json.return_value = {
+#         'modified_on': date_in_the_future.isoformat()
+#     }
+#     company = CompanyFactory()
+#     user = get_test_user()
+#
+#     save_to_korben(
+#         object_id=str(company.id),
+#         user_id=str(user.id),
+#         db_table='company_company',
+#         update=True
+#     )
+#
+#     task_info = TaskInfo.objects.get(user=user)
+#     assert task_info.note == 'Stale object, not saved.'
+#     # check save_to_korben called
+#     assert mocked_save_to_korben.called is False
 
 
 @mock.patch('datahub.core.mixins.DeferredSaveModelMixin.save_to_korben')