[#6439] Concurrent-safe resource updates

amercader · amercader · commit 53adf09c2ab1 · 2022-08-25T12:10:02.000+02:00
diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py
@@ -289,8 +289,9 @@ def resource_create(context, data_dict):
     if not data_dict.get('url'):
         data_dict['url'] = ''
 
+    package_show_context = dict(context, for_update=True, return_type='dict')
     pkg_dict = _get_action('package_show')(
-        dict(context, return_type='dict'),
+        package_show_context,
         {'id': package_id})
 
     _check_access('resource_create', context, data_dict)
diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py
@@ -189,7 +189,8 @@ def resource_delete(context, data_dict):
 
     package_id = entity.get_package_id()
 
-    pkg_dict = _get_action('package_show')(context, {'id': package_id})
+    package_show_context = dict(context, for_update=True)
+    pkg_dict = _get_action('package_show')(package_show_context, {'id': package_id})
 
     for plugin in plugins.PluginImplementations(plugins.IResourceController):
         plugin.before_delete(context, data_dict,
diff --git a/ckan/logic/action/patch.py b/ckan/logic/action/patch.py
@@ -39,6 +39,7 @@ def package_patch(context, data_dict):
         'user': context['user'],
         'auth_user_obj': context['auth_user_obj'],
         'ignore_auth': context.get('ignore_auth', False),
+        'for_update': True,
     }
 
     package_dict = _get_action('package_show')(
@@ -69,6 +70,7 @@ def resource_patch(context, data_dict):
         'session': context['session'],
         'user': context['user'],
         'auth_user_obj': context['auth_user_obj'],
+        'for_update': True,
     }
 
     resource_dict = _get_action('resource_show')(
diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py
@@ -82,7 +82,8 @@ def resource_update(context, data_dict):
     del context["resource"]
 
     package_id = resource.package.id
-    pkg_dict = _get_action('package_show')(dict(context, return_type='dict'),
+    package_show_context = dict(context, for_update=True, return_type='dict')
+    pkg_dict = _get_action('package_show')(package_show_context,
         {'id': package_id})
 
     for n, p in enumerate(pkg_dict['resources']):
@@ -547,7 +548,8 @@ def package_resource_reorder(context, data_dict):
     if len(set(order)) != len(order):
         raise ValidationError({'order': 'Must supply unique resource_ids'})
 
-    package_dict = _get_action('package_show')(context, {'id': id})
+    package_show_context = dict(context, for_update=True, return_type='dict')
+    package_dict = _get_action('package_show')(package_show_context, {'id': id})
     existing_resources = package_dict.get('resources', [])
     ordered_resources = []
 
diff --git a/ckan/tests/logic/action/test_patch.py b/ckan/tests/logic/action/test_patch.py
@@ -1,8 +1,10 @@
 # encoding: utf-8
 """Unit tests for ckan/logic/action/patch.py."""
 import pytest
+import mock
 
 from ckan.tests import helpers, factories
+from ckan.logic.action.get import package_show as core_package_show
 
 
 @pytest.mark.usefixtures("clean_db", "with_request_context")
@@ -171,3 +173,38 @@ def test_organization_patch_updating_single_field_when_public_user_details_is_fa
         assert organization2["description"] == "somethingnew"
         assert len(organization2["users"]) == 1
         assert organization2["users"][0]["name"] == user["name"]
+
+    def test_package_patch_for_update(self):
+
+        dataset = factories.Dataset()
+
+        mock_package_show = mock.MagicMock()
+        mock_package_show.side_effect = lambda context, data_dict: core_package_show(context, data_dict)
+
+        with mock.patch.dict('ckan.logic._actions', {'package_show': mock_package_show}):
+            helpers.call_action('package_patch', id=dataset['id'], notes='hey')
+            assert mock_package_show.call_args_list[0][0][0].get('for_update') is True
+
+    def test_resource_patch_for_update(self):
+
+        dataset = factories.Dataset()
+        resource = factories.Resource(package_id=dataset['id'])
+
+        mock_package_show = mock.MagicMock()
+        mock_package_show.side_effect = lambda context, data_dict: core_package_show(context, data_dict)
+
+        with mock.patch.dict('ckan.logic._actions', {'package_show': mock_package_show}):
+            helpers.call_action('resource_patch', id=resource['id'], description='hey')
+            assert mock_package_show.call_args_list[0][0][0].get('for_update') is True
+
+    def test_resource_update_for_update(self):
+
+        dataset = factories.Dataset()
+        resource = factories.Resource(package_id=dataset['id'])
+
+        mock_package_show = mock.MagicMock()
+        mock_package_show.side_effect = lambda context, data_dict: core_package_show(context, data_dict)
+
+        with mock.patch.dict('ckan.logic._actions', {'package_show': mock_package_show}):
+            helpers.call_action('resource_update', id=resource['id'], description='hey')
+            assert mock_package_show.call_args_list[0][0][0].get('for_update') is True

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ def package_patch(context, data_dict):`
`39`	`39`	`'user': context['user'],`
`40`	`40`	`'auth_user_obj': context['auth_user_obj'],`
`41`	`41`	`'ignore_auth': context.get('ignore_auth', False),`
	`42`	`+ 'for_update': True,`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`package_dict = _get_action('package_show')(`
`@@ -69,6 +70,7 @@ def resource_patch(context, data_dict):`
`69`	`70`	`'session': context['session'],`
`70`	`71`	`'user': context['user'],`
`71`	`72`	`'auth_user_obj': context['auth_user_obj'],`
	`73`	`+ 'for_update': True,`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`resource_dict = _get_action('resource_show')(`