Fix migration (#196)

Author: kcagran

src/backend/apps/clusters/migrations/0015_auto_20251020_1008.py

@@ -1,7 +1,8 @@
 # Generated by Django 4.2.17 on 2025-10-20 10:08
 
 from django.db import migrations, transaction
-from django.db.models import Count, Q
+from django.db.models import Count
+
 
 def resolve_duplicates(apps, schema_editor):
     models = [
@@ -47,26 +48,12 @@ def resolve_duplicates(apps, schema_editor):
                 .filter(count__gt=1)
             )
             for dup in duplicates:
-                ids = list(app_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id']).values_list('id', flat=True))
+                ids = list(app_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id']).values_list('id',
+                                                                                                                flat=True))
                 primary_id = ids.pop(0)  # Keep the first ID as primary
                 jobs_model.objects.filter(**{f"{key}__in": ids}).update(**{key: primary_id})
                 app_model.objects.filter(id__in=ids).delete()
 
-def resolve_label_duplicates(apps, schema_editor):
-    labels_model = apps.get_model('clusters', 'Label')
-    job_label_model = apps.get_model('clusters', 'JobLabel')
-    duplicates = (
-        labels_model.objects
-        .values('name', 'cluster_id')
-        .annotate(count=Count('id'))
-        .filter(count__gt=1)
-    )
-    with transaction.atomic():
-        for dup in duplicates:
-            ids = list(labels_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id']).values_list('id', flat=True))
-            primary_id = ids.pop(0)
-            job_label_model.objects.filter(label_id__in=ids).update(label_id=primary_id)
-            labels_model.objects.filter(id__in=ids).delete()
 
 def resolve_label_duplicates(apps, schema_editor):
     labels_model = apps.get_model('clusters', 'Label')
@@ -79,11 +66,13 @@ def resolve_label_duplicates(apps, schema_editor):
     )
     with transaction.atomic():
         for dup in duplicates:
-            ids = list(labels_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id']).values_list('id', flat=True))
+            ids = list(labels_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id']).values_list('id',
+                                                                                                               flat=True))
             primary_id = ids.pop(0)
             job_label_model.objects.filter(label_id__in=ids).update(label_id=primary_id)
             labels_model.objects.filter(id__in=ids).delete()
 
+
 def resolve_host_duplicates(apps, schema_editor):
     host_model = apps.get_model('clusters', 'Host')
     job_host_summary_model = apps.get_model('clusters', 'JobHostSummary')
@@ -95,7 +84,8 @@ def resolve_host_duplicates(apps, schema_editor):
     )
     with transaction.atomic():
         for dup in duplicates:
-            ids = list(host_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id']).values_list('id', flat=True))
+            ids = list(
+                host_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id']).values_list('id', flat=True))
             primary_id = ids.pop(0)
             job_host_summary_model.objects.filter(host_id__in=ids).update(host_id=primary_id)
             host_model.objects.filter(id__in=ids).delete()
@@ -112,13 +102,15 @@ def resolve_aap_user_duplicates(apps, schema_editor):
         .filter(count__gt=1)
     )
     for dup in duplicates:
-        ids = list(aap_user_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id'], type=dup['type']).values_list('id', flat=True))
+        ids = list(
+            aap_user_model.objects.filter(name=dup['name'], cluster_id=dup['cluster_id'], type=dup['type']).values_list(
+                'id', flat=True))
         primary_id = ids.pop(0)  # Keep the first ID as primary
         jobs_model.objects.filter(launched_by_id__in=ids).update(launched_by_id=primary_id)
         aap_user_model.objects.filter(id__in=ids).delete()
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ('clusters', '0014_alter_jobtemplate_time_taken_manually_execute_minutes'),
     ]

src/backend/apps/clusters/migrations/0016_alter_aapuser_index_together_and_more.py

@@ -1,15 +1,58 @@
 # Generated by Django 4.2.17 on 2025-10-21 06:04
 
-from django.db import migrations
+from django.db import migrations, transaction
+from django.db.models import Min
 
 
-class Migration(migrations.Migration):
+def unique_negative_external_ids(apps, schema_editor):
+    models = [
+        {
+            "app_model": apps.get_model('clusters', 'Organization'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'JobTemplate'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'AAPUser'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'Inventory'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'ExecutionEnvironment'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'InstanceGroup'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'Project'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'Label'),
+        },
+        {
+            "app_model": apps.get_model('clusters', 'Host'),
+        },
+    ]
+    with transaction.atomic():
+        for model in models:
+            app_model = model['app_model']
+            negative_ids = app_model.objects.filter(external_id__lt=0).order_by('internal_created')
+            _min = app_model.objects.all().aggregate(Min('external_id'))
+            min_id = _min['external_id__min'] if _min['external_id__min'] is not None else 0
+            for index, obj in enumerate(negative_ids):
+                min_id = min_id - 1
+                obj.external_id = min_id
+                obj.save()
 
+
+class Migration(migrations.Migration):
     dependencies = [
         ('clusters', '0015_auto_20251020_1008'),
     ]
 
     operations = [
+        migrations.RunPython(unique_negative_external_ids),
         migrations.AlterIndexTogether(
             name='aapuser',
             index_together=set(),