Revert migration changes, reforat migration stages

Author: AlanCoding

ansible_ai_connect/organizations/migrations/0006_alter_externalorganization_table.py

@@ -0,0 +1,17 @@
+# Generated manually to rename ExternalOrganization table to organizations_organization
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("organizations", "0005_organization"),
+    ]
+
+    operations = [
+        migrations.AlterModelTable(
+            name="externalorganization",
+            table="organizations_organization",
+        ),
+    ]

ansible_ai_connect/organizations/models.py

@@ -36,6 +36,9 @@ class ExternalOrganization(models.Model):
     telemetry_opt_out = models.BooleanField(default=False, db_column="telemetry_opt_out")
     enable_anonymization = models.BooleanField(default=True)
 
+    class Meta:
+        db_table = "organizations_organization"
+
     @property  # NOTE: The info dict is already cache in the seat_checker
     def name(self):
         seat_checker = apps.get_app_config("ai").get_seat_checker()

ansible_ai_connect/users/migrations/0009_user_organization.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                 default=None,
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
-                to="organizations.externalorganization",
+                to="organizations.organization",
             ),
         ),
     ]

ansible_ai_connect/users/migrations/0017_alter_user_options_team.py

@@ -12,6 +12,8 @@ class Migration(migrations.Migration):
         ("users", "0016_user_aap_user"),
     ]
 
+    run_before = [("dab_rbac", "__first__")]
+
     operations = [
         migrations.AlterModelOptions(
             name="user",
@@ -43,6 +45,15 @@ class Migration(migrations.Migration):
                     "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(
@@ -76,6 +87,21 @@ class Migration(migrations.Migration):
                         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"],

ansible_ai_connect/users/migrations/0018_remove_team_relationships.py

@@ -0,0 +1,25 @@
+# Generated by Django makemigrations after removing Team.admins, Team.users, and Team.team_parents
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0017_alter_user_options_team"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="team",
+            name="admins",
+        ),
+        migrations.RemoveField(
+            model_name="team",
+            name="team_parents",
+        ),
+        migrations.RemoveField(
+            model_name="team",
+            name="users",
+        ),
+    ]