chore: merge kept data into existing data

DataShades · Aug 29, 2024 · 468162a · 468162a
1 parent 810ee4b
commit 468162a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/ckanext/files/logic/action.py b/ckanext/files/logic/action.py
@@ -695,12 +695,6 @@ def files_multipart_complete(
         storage=multipart.storage,
     )
 
-    if data_dict["keep_storage_data"]:
-        fileobj.storage_data = copy.deepcopy(multipart.storage_data)
-
-    if data_dict["keep_plugin_data"]:
-        fileobj.plugin_data = copy.deepcopy(multipart.plugin_data)
-
     try:
         storage.multipart_complete(
             shared.MultipartData.from_model(multipart),
@@ -709,6 +703,16 @@ def files_multipart_complete(
     except shared.exc.UploadError as err:
         raise tk.ValidationError({"upload": [str(err)]}) from err
 
+    if data_dict["keep_storage_data"]:
+        data: Any = copy.deepcopy(multipart.storage_data)
+        data.update(fileobj.storage_data)
+        fileobj.storage_data = data
+
+    if data_dict["keep_plugin_data"]:
+        data: Any = copy.deepcopy(multipart.plugin_data)
+        data.update(fileobj.plugin_data)
+        fileobj.plugin_data = data
+
     sess.query(Owner).where(
         Owner.item_type == "multipart",
         Owner.item_id == multipart.id,