Patch migration to dedupe and merge picklists

specifyweb/backend/patches/migrations/0008_merge_duplicate_picklists.py

@@ -0,0 +1,78 @@
+from django.db import migrations
+from django.db.models import Count
+
+def deduplicate_picklists(apps, schema_editor):
+    Picklist = apps.get_model('specify', 'Picklist')
+    PicklistItem = apps.get_model('specify', 'PicklistItem')
+
+    duplicate_groups = (
+        Picklist.objects
+        .values('name', 'tablename', 'fieldname', 'collection')
+        .annotate(pl_count=Count('id'))
+        .filter(pl_count__gt=1)
+    )
+
+    for group in duplicate_groups:
+        picklists = (
+            Picklist.objects
+            .filter(
+                name=group['name'],
+                tablename=group['tablename'],
+                fieldname=group['fieldname'],
+                collection=group['collection'],
+            )
+            .order_by('id')
+        )
+
+        if picklists.count() < 2:
+            continue
+
+        primary = picklists.first()
+        duplicates = picklists.exclude(id=primary.id)
+
+        existing_pairs = set(
+            PicklistItem.objects
+            .filter(picklist=primary)
+            .values_list('title', 'value')
+        )
+
+        for dup in duplicates:
+            dup_items = list(
+                PicklistItem.objects
+                .filter(picklist=dup)
+                .only('id', 'title', 'value', 'picklist')
+                .order_by('id')
+            )
+
+            # Partition into items to be either move or delete
+            to_move = []
+            to_delete_ids = []
+            for it in dup_items:
+                key = (it.title, it.value)
+                if key in existing_pairs:
+                    to_delete_ids.append(it.id)
+                else:
+                    it.picklist = primary
+                    to_move.append(it)
+                    existing_pairs.add(key)
+
+            if to_move:
+                PicklistItem.objects.bulk_update(to_move, ['picklist'])
+            if to_delete_ids:
+                PicklistItem.objects.filter(id__in=to_delete_ids).delete()
+
+            # Remove the empty duplicate picklist
+            dup.delete()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('patches', '0007_fix_tectonicunit_tree_root'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            deduplicate_picklists,
+            reverse_code=migrations.RunPython.noop,
+            atomic=True,
+        ),
+    ]

specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts

@@ -7,7 +7,11 @@ import { softFail } from '../Errors/Crash';
 import { isTreeResource } from '../InitialContext/treeRanks';
 import type { BusinessRuleDefs } from './businessRuleDefs';
 import { businessRuleDefs } from './businessRuleDefs';
-import { backboneFieldSeparator, backendFilter, djangoLookupSeparator } from './helpers';
+import {
+  backboneFieldSeparator,
+  backendFilter,
+  djangoLookupSeparator,
+} from './helpers';
 import type {
   AnySchema,
   AnyTree,
@@ -316,10 +320,7 @@ export class BusinessRuleManager<SCHEMA extends AnySchema> {
         )
       );
 
-    const stringValuesAreEqual = (
-      left: string,
-      right: string
-    ): boolean =>
+    const stringValuesAreEqual = (left: string, right: string): boolean =>
       rule.isDatabaseConstraint
         ? left.localeCompare(right, undefined, { sensitivity: 'accent' }) === 0
         : left === right;