Fixes AAP integration (#1727)

ldjebran · web-flow · commit 34d3eb873bf5 · 2025-08-01T17:43:06.000+02:00
Fixes AAP integration with latest DAB version 2025.7.29 issue: https://issues.redhat.com/browse/AAP-50663 Signed-off-by: Djebran Lezzoum <ldjebran@gmail.com>
diff --git a/ansible_ai_connect/main/settings/base.py b/ansible_ai_connect/main/settings/base.py
@@ -77,6 +77,7 @@
     "ansible_ai_connect.healthcheck",
     "oauth2_provider",
     "import_export",
+    "ansible_base.rbac",
     "ansible_base.resource_registry",
     "ansible_base.jwt_consumer",
 ]
@@ -292,8 +293,9 @@ def is_ssl_enabled(value: str) -> bool:
 # ==========================================
 # Django Ansible Base configuration
 # ------------------------------------------
-ANSIBLE_BASE_TEAM_MODEL = None
-ANSIBLE_BASE_ORGANIZATION_MODEL = "ansible_ai_connect.organizations.models.Organization"
+ANSIBLE_BASE_TEAM_MODEL = "users.Team"
+ANSIBLE_BASE_ORGANIZATION_MODEL = "organizations.Organization"
+ANSIBLE_BASE_RBAC_MODEL_REGISTRY = {}
 ANSIBLE_BASE_RESOURCE_CONFIG_MODULE = "ansible_ai_connect.ai.resource_api"
 ANSIBLE_BASE_REST_FILTERS_RESERVED_NAMES = (
     "page",
diff --git a/ansible_ai_connect/users/apps.py b/ansible_ai_connect/users/apps.py
@@ -18,6 +18,7 @@
 class UsersConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "ansible_ai_connect.users"
+    label = "users"
 
     def ready(self) -> None:
         import ansible_ai_connect.users.signals  # noqa: F401
diff --git a/ansible_ai_connect/users/migrations/0017_alter_user_options_team.py b/ansible_ai_connect/users/migrations/0017_alter_user_options_team.py
@@ -0,0 +1,111 @@
+# Generated by Django 4.2.22 on 2025-08-01 11:21
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("organizations", "0004_organization_enable_anonymization"),
+        ("users", "0016_user_aap_user"),
+    ]
+
+    run_before = [("dab_rbac", "__first__")]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="user",
+            options={},
+        ),
+        migrations.CreateModel(
+            name="Team",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        auto_now=True, help_text="The date/time this resource was created."
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        auto_now_add=True, help_text="The date/time this resource was created."
+                    ),
+                ),
+                ("name", models.CharField(help_text="The name of this resource.", max_length=512)),
+                (
+                    "description",
+                    models.TextField(blank=True, default="", help_text="The team description."),
+                ),
+                (
+                    "admins",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="The list of admins for this team",
+                        related_name="teams_administered",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        default=None,
+                        editable=False,
+                        help_text="The user who created this resource.",
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(app_label)s_%(class)s_created+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "modified_by",
+                    models.ForeignKey(
+                        default=None,
+                        editable=False,
+                        help_text="The user who last modified this resource.",
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(app_label)s_%(class)s_modified+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "organization",
+                    models.ForeignKey(
+                        help_text="The organization of this team.",
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="teams",
+                        to="organizations.organization",
+                    ),
+                ),
+                (
+                    "team_parents",
+                    models.ManyToManyField(
+                        blank=True, related_name="team_children", to="users.team"
+                    ),
+                ),
+                (
+                    "users",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="The list of users on this team",
+                        related_name="teams",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["id"],
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/ansible_ai_connect/users/models.py b/ansible_ai_connect/users/models.py
@@ -15,6 +15,8 @@
 import logging
 import uuid
 
+from ansible_base.lib.abstract_models import AbstractTeam
+from ansible_base.resource_registry.fields import AnsibleResourceField
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser
@@ -70,6 +72,9 @@ class User(ExportModelOperationsMixin("user"), AbstractUser):
     email_verified = models.BooleanField(default=False, null=True)
     aap_user = models.BooleanField(default=False)
 
+    class Meta:
+        app_label = "users"
+
     @property
     def org_id(self) -> int | None:
         if self.organization and self.organization.id:
@@ -147,7 +152,7 @@ def rh_aap_superuser(self) -> bool:
 
     plans = models.ManyToManyField(
         Plan,
-        through="UserPlan",
+        through="users.UserPlan",
         through_fields=("user", "plan"),
     )
 
@@ -171,3 +176,31 @@ def is_active(self):
         if not self.expired_at:
             return True
         return self.expired_at > timezone.now()
+
+
+class Team(AbstractTeam):
+    """A Team compatible with Django Ansible Base Teams"""
+
+    resource = AnsibleResourceField(primary_key_field="id")
+    team_parents = models.ManyToManyField("Team", related_name="team_children", blank=True)
+
+    ignore_relations = []
+
+    class Meta:
+        app_label = "users"
+        ordering = ["id"]
+        abstract = False
+
+    users = models.ManyToManyField(
+        User,
+        related_name="teams",
+        blank=True,
+        help_text="The list of users on this team",
+    )
+
+    admins = models.ManyToManyField(
+        User,
+        related_name="teams_administered",
+        blank=True,
+        help_text="The list of admins for this team",
+    )
diff --git a/pyproject.toml b/pyproject.toml
@@ -48,7 +48,7 @@ dependencies = [
   'uwsgi-readiness-check~=0.2.0',
   'django-allow-cidr',
   'django-csp~=3.7',
-  'django-ansible-base[jwt-consumer,resource-registry]>=2025.3.7',
+  'django-ansible-base[jwt-consumer,resource-registry]>=2025.7.29',
 ]
 readme = "README.rst"
 license = {text = "Apache-2.0"}
diff --git a/requirements-aarch64.txt b/requirements-aarch64.txt
@@ -123,7 +123,7 @@ django==4.2.22
     #   social-auth-app-django
 django-allow-cidr==0.6.0
     # via -r requirements.in
-django-ansible-base[jwt-consumer,resource-registry]==2025.3.7
+django-ansible-base[jwt-consumer,resource-registry]==2025.7.29
     # via -r requirements.in
 django-crum==0.7.9
     # via django-ansible-base
diff --git a/requirements-x86_64.txt b/requirements-x86_64.txt
@@ -123,7 +123,7 @@ django==4.2.22
     #   social-auth-app-django
 django-allow-cidr==0.6.0
     # via -r requirements.in
-django-ansible-base[jwt-consumer,resource-registry]==2025.3.7
+django-ansible-base[jwt-consumer,resource-registry]==2025.7.29
     # via -r requirements.in
 django-crum==0.7.9
     # via django-ansible-base
diff --git a/requirements.in b/requirements.in
@@ -71,4 +71,4 @@ uwsgi==2.0.22
 uwsgi-readiness-check==0.2.0
 django-allow-cidr==0.6.0
 django-csp==3.7
-django-ansible-base[jwt-consumer,resource-registry]==2025.3.7
+django-ansible-base[jwt-consumer,resource-registry]==2025.7.29

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ dependencies = [`
`48`	`48`	`'uwsgi-readiness-check~=0.2.0',`
`49`	`49`	`'django-allow-cidr',`
`50`	`50`	`'django-csp~=3.7',`
`51`		`- 'django-ansible-base[jwt-consumer,resource-registry]>=2025.3.7',`
	`51`	`+ 'django-ansible-base[jwt-consumer,resource-registry]>=2025.7.29',`
`52`	`52`	`]`
`53`	`53`	`readme = "README.rst"`
`54`	`54`	`license = {text = "Apache-2.0"}`