[#5190] Handle custom fields in metadata_modified logic

amercader · amercader · commit 873199fb6fe1 · 2020-03-10T11:44:08.000+01:00
Up until now it only applied to core fields exisiting in the db, but if
you added, removed or changed custom fields (all dumped in the extras
field) the date didn't change. Added tests for this.
diff --git a/ckan/lib/dictization/model_save.py b/ckan/lib/dictization/model_save.py
@@ -65,6 +65,15 @@ def resource_dict_save(res_dict, context):
             # of in a separate extras field like packages and groups
             new_extras[key] = value
 
+    # Check changes in extra fields
+    if set(new_extras.keys()) != set(obj.extras.keys()):
+        has_changed = True
+    else:
+        for key, value in six.iteritems(new_extras):
+            if obj.extras.get(key) != value:
+                has_changed = True
+                break
+
     if has_changed:
         obj.metadata_modified = datetime.datetime.utcnow()
     obj.state = u'active'
@@ -73,6 +82,7 @@ def resource_dict_save(res_dict, context):
     session.add(obj)
     return obj
 
+
 def package_resource_list_save(res_dicts, package, context):
     allow_partial_update = context.get("allow_partial_update", False)
     if res_dicts is None and allow_partial_update:
diff --git a/ckan/tests/logic/action/test_update.py b/ckan/tests/logic/action/test_update.py
@@ -1412,7 +1412,7 @@ def test_resource_format_update(self):
 
     def test_edit_metadata_updates_metadata_modified_field(self):
         dataset = factories.Dataset()
-        resource = factories.Resource(package=dataset)
+        resource = factories.Resource(package_id=dataset['id'])
 
         with freeze_time('2020-02-25 12:00:00'):
             resource = helpers.call_action(
@@ -1426,7 +1426,11 @@ def test_same_values_dont_update_metadata_modified_field(self):
         dataset = factories.Dataset()
 
         with freeze_time('1987-03-04 23:30:00'):
-            resource = factories.Resource(package=dataset, description='Test')
+            resource = factories.Resource(
+                package_id=dataset['id'],
+                description='Test',
+                some_custom_field='test',
+            )
             assert (resource['metadata_modified'] ==
                     datetime.datetime.utcnow().isoformat())
 
@@ -1435,13 +1439,84 @@ def test_same_values_dont_update_metadata_modified_field(self):
                 "resource_update",
                 id=resource["id"],
                 description='Test',
+                some_custom_field='test',
                 url='http://link.to.some.data'  # Default Value from Factory
             )
             assert (resource['metadata_modified'] !=
                     datetime.datetime.utcnow().isoformat())
             assert (resource['metadata_modified'] ==
                     '1987-03-04T23:30:00')
 
+    def test_new_keys_update_metadata_modified_field(self):
+        dataset = factories.Dataset()
+
+        with freeze_time('1987-03-04 23:30:00'):
+            resource = factories.Resource(package_id=dataset['id'], description='test')
+            assert (resource['metadata_modified'] ==
+                    datetime.datetime.utcnow().isoformat())
+
+        with freeze_time('2020-02-25 12:00:00'):
+            resource = helpers.call_action(
+                "resource_update",
+                id=resource["id"],
+                description='test',
+                some_custom_field='test',
+                url='http://link.to.some.data'  # default value from factory
+            )
+            assert (resource['metadata_modified'] ==
+                    datetime.datetime.utcnow().isoformat())
+            assert (resource['metadata_modified'] ==
+                    '2020-02-25T12:00:00')
+
+    def test_remove_keys_update_metadata_modified_field(self):
+        dataset = factories.Dataset()
+
+        with freeze_time('1987-03-04 23:30:00'):
+            resource = factories.Resource(
+                package_id=dataset['id'],
+                description='test',
+                some_custom_field='test',
+            )
+            assert (resource['metadata_modified'] ==
+                    datetime.datetime.utcnow().isoformat())
+
+        with freeze_time('2020-02-25 12:00:00'):
+            resource = helpers.call_action(
+                "resource_update",
+                id=resource["id"],
+                description='test',
+                url='http://link.to.some.data'  # default value from factory
+            )
+            assert (resource['metadata_modified'] ==
+                    datetime.datetime.utcnow().isoformat())
+            assert (resource['metadata_modified'] ==
+                    '2020-02-25T12:00:00')
+
+    def test_update_keys_update_metadata_modified_field(self):
+        dataset = factories.Dataset()
+
+        with freeze_time('1987-03-04 23:30:00'):
+            resource = factories.Resource(
+                package_id=dataset['id'],
+                description='test',
+                some_custom_field='test',
+            )
+            assert (resource['metadata_modified'] ==
+                    datetime.datetime.utcnow().isoformat())
+
+        with freeze_time('2020-02-25 12:00:00'):
+            resource = helpers.call_action(
+                "resource_update",
+                id=resource["id"],
+                description='test',
+                some_custom_field='test2',
+                url='http://link.to.some.data'  # default value from factory
+            )
+            assert (resource['metadata_modified'] ==
+                    datetime.datetime.utcnow().isoformat())
+            assert (resource['metadata_modified'] ==
+                    '2020-02-25T12:00:00')
+
 
 @pytest.mark.usefixtures("clean_db", "with_request_context")
 class TestConfigOptionUpdate(object):
