chore(controller): unified naming convention for ptype

Author: duanhongyi

rootfs/api/admissions.py

@@ -28,20 +28,20 @@ def detect(self, request: Request) -> bool:
     def handle(self, request: Request) -> bool:
         app_id = request["object"]["metadata"]["namespace"]
         app = models.app.App.objects.filter(id=app_id).first()
-        container_type = request["object"]["metadata"].get("labels", {}).get("type", "")
-        if app and container_type:
+        ptype = request["object"]["metadata"].get("labels", {}).get("type", "")
+        if app and ptype:
             status = request["object"]["status"]
             replicas = request["object"]["spec"].get("replicas", 0)
             if "active" in status:
                 replicas += 1
             elif "succeeded" in status or "failed" in status:
                 replicas -= 1
             replicas = 0 if replicas < 0 else replicas
-            if app.structure.get(container_type, 0) != replicas:
+            if app.structure.get(ptype, 0) != replicas:
                 models.app.App.objects.filter(id=app.id).update(
                     structure=Func(
                         F("structure"),
-                        Value([container_type]),
+                        Value([ptype]),
                         Value(replicas, JSONField()),
                         function="jsonb_set",
                     )
@@ -64,18 +64,18 @@ def detect(self, request: Request) -> bool:
     def handle(self, request: Request) -> bool:
         app_id = request["object"]["metadata"]["namespace"]
         app = models.app.App.objects.filter(id=app_id).first()
-        container_type = None
+        ptype = None
         for item in request["object"]["status"]["selector"].split(","):
             key, value = item.split("=")
             if key == "type":
-                container_type = value
-        if app and container_type:
+                ptype = value
+        if app and ptype:
             replicas = request["object"]["spec"].get("replicas", 0)
-            if app.structure.get(container_type, 0) != replicas:
+            if app.structure.get(ptype, 0) != replicas:
                 models.app.App.objects.filter(id=app.id).update(
                     structure=Func(
                         F("structure"),
-                        Value([container_type]),
+                        Value([ptype]),
                         Value(replicas, JSONField()),
                         function="jsonb_set",
                     )

rootfs/api/migrations/0012_alter_app_options_rename_procfile_type_domain_ptype_and_more.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.2.15 on 2024-09-03 03:48
+
+import api.utils
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0011_appsettings_autodeploy'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='app',
+            options={'ordering': ['id'], 'verbose_name': 'Application'},
+        ),
+        migrations.RenameField(
+            model_name='domain',
+            old_name='procfile_type',
+            new_name='ptype',
+        ),
+        migrations.RenameField(
+            model_name='route',
+            old_name='procfile_type',
+            new_name='ptype',
+        ),
+        migrations.RenameField(
+            model_name='service',
+            old_name='procfile_type',
+            new_name='ptype',
+        ),
+        migrations.AddField(
+            model_name='certificate',
+            name='app',
+            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='api.app'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='release',
+            name='conditions',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AlterField(
+            model_name='certificate',
+            name='name',
+            field=models.CharField(max_length=253, validators=[api.utils.validate_label]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='certificate',
+            unique_together={('app', 'name')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='service',
+            unique_together={('app', 'ptype')},
+        ),
+    ]

…icate_app_release_conditions_and_more.py …igration_permissions_and_certificates.pyrootfs/api/migrations/0012_alter_app_options_certificate_app_release_conditions_and_more.py renamed to rootfs/api/migrations/0013_migration_permissions_and_certificates.py rootfs/api/migrations/0012_alter_app_options_certificate_app_release_conditions_and_more.py renamed to rootfs/api/migrations/0013_migration_permissions_and_certificates.py

@@ -1,8 +1,6 @@
-# Generated by Django 4.2.15 on 2024-08-30 00:53
+# Generated by Django 4.2.15 on 2024-09-03 03:48
 
-import api.utils
-from django.db import migrations, models
-import django.db.models.deletion
+from django.db import migrations
 from guardian.shortcuts import assign_perm, get_users_with_perms, remove_perm
 from api.models.app import App, VIEW_APP_PERMISSION, CHANGE_APP_PERMISSION
 from api.models.domain import Domain
@@ -34,34 +32,10 @@ def migration_certificate(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0011_appsettings_autodeploy'),
+        ('api', '0012_alter_app_options_rename_procfile_type_domain_ptype_and_more'),
     ]
 
     operations = [
-        migrations.AlterModelOptions(
-            name='app',
-            options={'ordering': ['id'], 'verbose_name': 'Application'},
-        ),
-        migrations.AddField(
-            model_name='certificate',
-            name='app',
-            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='api.app'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='release',
-            name='conditions',
-            field=models.JSONField(default=list),
-        ),
-        migrations.AlterField(
-            model_name='certificate',
-            name='name',
-            field=models.CharField(max_length=253, validators=[api.utils.validate_label]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='certificate',
-            unique_together={('app', 'name')},
-        ),
         migrations.RunPython(migration_permission),
         migrations.RunPython(migration_certificate),
     ]