Merge pull request #4699 from specify/issue-4685

Fixes agent merging failing unexpectedly

Author: CarolineDenis

specifyweb/specify/api_tests.py

@@ -584,7 +584,8 @@ def test_replace_agents(self):
             agent=agent_1,
             collectingevent=collecting_event
         )
-
+        self.collectionobjects[0].cataloger = agent_1
+        self.collectionobjects[0].save()
         # Assert that the api request ran successfully
         response = c.post(
             f'/api/specify/agent/replace/{agent_2.id}/',

specifyweb/specify/record_merging.py

@@ -192,18 +192,6 @@ def record_merge_fx(model_name: str, old_model_ids: List[int], new_model_id: int
         except ValueError:
             continue
 
-        # Handle case of updating a large amount of record ids in a foreign table.
-        # Example: handle case of updating a large amount of agent ids in the audit logs.
-        # Fix by optimizing the query by consolidating it here
-        if model_name.lower() in MERGING_OPTIMIZATION_FIELDS and \
-            table_name.lower() in MERGING_OPTIMIZATION_FIELDS[model_name.lower()]:
-            for field_name in MERGING_OPTIMIZATION_FIELDS[model_name.lower()][table_name.lower()]:
-                query = Q(**{field_name: old_model_ids[0]})
-                for old_model_id in old_model_ids[1:]:
-                    query.add(Q(**{field_name: old_model_id}), Q.OR)
-                foreign_model.objects.filter(query).update(**{field_name: new_model_id})
-                progress(1, 0) if progress is not None else None
-            continue
 
         apply_order = add_ordering_to_key(table_name.lower().title())
         # BUG: timestampmodified could be null for one record, and not the other
@@ -221,6 +209,18 @@ def record_merge_fx(model_name: str, old_model_ids: List[int], new_model_id: int
             field_name_id = f'{field_name}_id'
             if not hasattr(foreign_model, field_name_id):
                 continue
+            # Handle case of updating a large amount of record ids in a foreign table.
+            # Example: handle case of updating a large amount of agent ids in the audit logs.
+            # Fix by optimizing the query by consolidating it here
+            if model_name.lower() in MERGING_OPTIMIZATION_FIELDS and \
+                table_name.lower() in MERGING_OPTIMIZATION_FIELDS[model_name.lower()]:
+                if field_name_id in MERGING_OPTIMIZATION_FIELDS[model_name.lower()][table_name.lower()]:
+                    query = Q(**{field_name_id: old_model_ids[0]})
+                    for old_model_id in old_model_ids[1:]:
+                        query.add(Q(**{field_name_id: old_model_id}), Q.OR)
+                    foreign_model.objects.filter(query).update(**{field_name_id: new_model_id})
+                    progress(1, 0) if progress is not None else None
+                    continue
 
             # Filter the objects in the foreign model that references the old target model
             foreign_objects = filter_and_lock_target_objects(foreign_model, old_model_ids, field_name_id)
@@ -308,7 +308,7 @@ def update_record(record: models.Model):
 
                 response: http.HttpResponse = update_record(obj)
                 if response is not None and response.status_code != 204:
-                    return response
+                    raise FailedMergingException(response)
 
     # Dedupe by deleting the record that is being replaced and updating the old model ID to the new one
     for old_model_id in old_model_ids: