Celery Agent Merging

specifyweb/notifications/migrations/0003_spmerging.py

@@ -0,0 +1,32 @@
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('specify', '__first__'),
+        ('notifications', '0002_message_read'),
+        # migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Spmerging',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=256)),
+                ('taskid', models.CharField(max_length=256)),
+                ('mergingstatus', models.CharField(max_length=256)),
+                ('timestampcreated', models.DateTimeField(default=django.utils.timezone.now)),
+                ('timestampmodified', models.DateTimeField(auto_now=True)),
+                ('createdbyagent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='specify.agent')),
+                ('modifiedbyagent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='specify.agent')),
+            ],
+            options={
+                'db_table': 'spmerging'
+            },
+        ),
+    ] 

specifyweb/specify/api_tests.py

@@ -579,7 +579,8 @@ def test_replace_agents(self):
         response = c.post(
             f'/api/specify/agent/replace/{agent_2.id}/',
             data=json.dumps({
-                'old_record_ids': [agent_1.id]
+                'old_record_ids': [agent_1.id],
+                'bg': False
             }),
             content_type='application/json'
         )
@@ -597,7 +598,8 @@ def test_replace_agents(self):
         response = c.post(
             f'/api/specify/agent/replace/{agent_2.id}/',
             data=json.dumps({
-                'old_record_ids': [agent_1.id]
+                'old_record_ids': [agent_1.id],
+                'bg': False
             }),
             content_type='application/json'
         )
@@ -651,7 +653,8 @@ def test_record_recursive_merge(self):
             f'/api/specify/agent/replace/{agent_2.id}/',
             data=json.dumps({
                 'old_record_ids': [agent_1.id],
-                'new_record_data': None
+                'new_record_data': None,
+                'bg': False
             }),
             content_type='application/json'
         )
@@ -702,7 +705,8 @@ def test_agent_address_replacement(self):
             f'/api/specify/agent/replace/{agent_1.id}/',
             data=json.dumps({
                 'old_record_ids': [agent_2.id],
-                'new_record_data': None
+                'new_record_data': None,
+                'bg': False
             }),
             content_type='application/json'
         )
@@ -788,7 +792,8 @@ def test_agent_address_multiple_replacement(self):
                         }
                     ],
                     'jobtitle': 'shardbearer'
-                }
+                },
+                'bg': False
             }),
             content_type='application/json')
         self.assertEqual(response.status_code, 204)

specifyweb/specify/merge_model.py

@@ -0,0 +1,18 @@
+from django.db import models
+from django.utils import timezone
+
+from specifyweb.specify import models as spmodels
+
+Agent = getattr(spmodels, 'Agent')
+
+class Spmerging(models.Model):
+    name = models.CharField(max_length=256) 
+    taskid = models.CharField(max_length=256) 
+    mergingstatus = models.CharField(max_length=256) 
+    timestampcreated = models.DateTimeField(default=timezone.now) 
+    timestampmodified = models.DateTimeField(auto_now=True) 
+    createdbyagent = models.ForeignKey(Agent, null=True, on_delete=models.SET_NULL, related_name="+") 
+    modifiedbyagent = models.ForeignKey(Agent, null=True, on_delete=models.SET_NULL, related_name="+")
+
+    class Meta:
+        db_table = 'spmerging'

specifyweb/specify/urls.py

@@ -10,6 +10,7 @@
 urlpatterns = [
     # replace record
     url(r'^specify/(?P<model_name>\w+)/replace/(?P<new_model_id>\d+)/$', views.record_merge),
+    url(r'^specify/merging_status/(?P<merge_id>\d+)/', views.merging_status),
 
     # the main business data API
     url(r'^specify_schema/openapi.json$', schema.openapi),