Fix pending trigger events migration error

Author: AlanCoding

ansible_base/rbac/migrations/0004_remote_permissions_additions.py

@@ -5,6 +5,31 @@
 from django.db import migrations, models
 
 
+def create_types_and_permissions(apps, schema_editor):
+    """Before we can migrate to the new DABContentType, entries in that table must be created.
+
+    This method runs what is ordinarily the post_migrate logic, but in the migration case here.
+    """
+    from ansible_base.rbac.management import create_dab_permissions
+
+    create_dab_permissions(apps.get_app_config('dab_rbac'), apps=apps)
+
+
+def migrate_content_type(apps, schema_editor):
+    ct_cls = apps.get_model('dab_rbac', 'DABContentType')
+    ct_cls.objects.clear_cache()
+    for model_name in ('dabpermission', 'objectrole', 'roledefinition', 'roleuserassignment', 'roleteamassignment'):
+        cls = apps.get_model('dab_rbac', model_name)
+        for obj in cls.objects.all():
+            old_ct = obj.content_type
+            # NOTE: could give duplicate normally, but that is impossible in migration path
+            obj.new_content_type = ct_cls.objects.get_by_natural_key(old_ct.app_label, old_ct.model)
+            obj.save()
+    for model_name in ('roleevaluation', 'roleevaluationuuid'):
+        cls = apps.get_model('dab_rbac', model_name)
+        cls.objects.all().delete()
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -175,4 +200,6 @@ class Migration(migrations.Migration):
             name='api_slug',
             field=models.CharField(default='', help_text='String to use for references to this type from other models in the API.', max_length=201),
         ),
+        migrations.RunPython(create_types_and_permissions, migrations.RunPython.noop),
+        migrations.RunPython(migrate_content_type, migrations.RunPython.noop),
     ]

ansible_base/rbac/migrations/0005_remote_permissions_migration.py renamed to ansible_base/rbac/migrations/0005_remote_permissions_removals.py

@@ -3,40 +3,13 @@
 from django.db import migrations
 
 
-def create_types_and_permissions(apps, schema_editor):
-    """Before we can migrate to the new DABContentType, entries in that table must be created.
-
-    This method runs what is ordinarily the post_migrate logic, but in the migration case here.
-    """
-    from ansible_base.rbac.management import create_dab_permissions
-
-    create_dab_permissions(apps.get_app_config('dab_rbac'), apps=apps)
-
-
-def migrate_content_type(apps, schema_editor):
-    ct_cls = apps.get_model('dab_rbac', 'DABContentType')
-    ct_cls.objects.clear_cache()
-    for model_name in ('dabpermission', 'objectrole', 'roledefinition', 'roleuserassignment', 'roleteamassignment'):
-        cls = apps.get_model('dab_rbac', model_name)
-        for obj in cls.objects.all():
-            old_ct = obj.content_type
-            # NOTE: could give duplicate normally, but that is impossible in migration path
-            obj.new_content_type = ct_cls.objects.get_by_natural_key(old_ct.app_label, old_ct.model)
-            obj.save()
-    for model_name in ('roleevaluation', 'roleevaluationuuid'):
-        cls = apps.get_model('dab_rbac', model_name)
-        cls.objects.all().delete()
-
-
 class Migration(migrations.Migration):
 
     dependencies = [
         ('dab_rbac', '0004_remote_permissions_additions'),
     ]
 
     operations = [
-        migrations.RunPython(create_types_and_permissions, migrations.RunPython.noop),
-        migrations.RunPython(migrate_content_type, migrations.RunPython.noop),
         migrations.RemoveField(
             model_name='dabpermission',
             name='content_type',