Fix data migration bug to new content type

Author: AlanCoding

ansible_base/rbac/managed.py

@@ -67,7 +67,7 @@ def get_or_create(self, apps):
                     # Better error handling for debugging
                     db_codenames = list(permission_cls.objects.values_list('codename', flat=True))
                     raise permission_cls.DoesNotExist(
-                        f'Permission codename {str_perm} does not exist. Manged role {self} expected: {permissions}\n Database permissions: {db_codenames}'
+                        f'Permission codename {str_perm} does not exist. Manged role {self}\n expected: {permissions}\n Database permissions: {db_codenames}'
                     )
             rd.permissions.add(*perm_list)
             logger.info(f'Created {self.shortname} managed role definition, name={self.name}')

ansible_base/rbac/management/__init__.py

@@ -31,7 +31,7 @@ def create_dab_permissions(app_config, verbosity=2, interactive=True, using=DEFA
     try:
         DABContentType = apps.get_model("dab_rbac", "DABContentType")
     except LookupError:
-        logger.debug('Skipping DAB RBAC type and permission creation since models are not available')
+        logger.warning('Skipping DAB RBAC type and permission creation since models are not available')
         return
 
     if not router.allow_migrate_model(using, DABContentType):

ansible_base/rbac/migrations/0005_remote_permissions_migration.py

@@ -10,7 +10,7 @@ def create_types_and_permissions(apps, schema_editor):
     """
     from ansible_base.rbac.management import create_dab_permissions
 
-    create_dab_permissions(apps=apps)
+    create_dab_permissions(apps.get_app_config('dab_rbac'), apps=apps)
 
 
 def migrate_content_type(apps, schema_editor):
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(migrate_content_type, migrations.RunPython.noop),
+        migrations.RunPython(create_types_and_permissions, migrations.RunPython.noop),
         migrations.RunPython(migrate_content_type, migrations.RunPython.noop),
         migrations.RemoveField(
             model_name='dabpermission',

ansible_base/rbac/models/content_type.py

@@ -143,16 +143,20 @@ def get_by_natural_key(self, *args: str) -> "DABContentType":
             kwargs = {'service__in': [get_local_resource_prefix(), 'shared'], 'app_label': app_label, 'model': model}
             # This ask here is actually ambiguous, so we try this extra lookup
             shared_key = ('shared', app_label, model)
-            if (self.db in self._cache) and (('shared', app_label, model) in self._cache[self.db]):
-                return self._cache[self.db][shared_key]
+            if self.db in self._cache:
+                if shared_key in self._cache[self.db]:
+                    return self._cache[self.db][shared_key]
         else:
             service, app_label, model = args
             kwargs = {'service': service, 'app_label': app_label, 'model': model}
         key = (service, app_label, model)
         try:
             return self._cache[self.db][key]
         except KeyError:
-            ct = self.get(**kwargs)
+            # Here we are adding additional error details for migration problems
+            ct = self.filter(**kwargs).first()
+            if ct is None:
+                raise self.model.DoesNotExist(f'Could not get ContentType {args}, existing: {list(self.values_list("model", flat=True))}')
             self._add_to_cache(self.db, ct)
             return ct