From 883f87726b35bc7f516bdf1017115d56d8a73f56 Mon Sep 17 00:00:00 2001
From: alfredeen <johan.alfredeen@gmail.com>
Date: Fri, 21 Feb 2025 18:36:09 +0100
Subject: [PATCH] Rework migration files after another merge from develop

---
 apps/migrations/0023_k8suserappstatus.py      | 26 -------------------
 ...0024_baseappinstance_latest_user_action.py | 16 +++++++++++-
 2 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 apps/migrations/0023_k8suserappstatus.py

diff --git a/apps/migrations/0023_k8suserappstatus.py b/apps/migrations/0023_k8suserappstatus.py
deleted file mode 100644
index 888a866a..00000000
--- a/apps/migrations/0023_k8suserappstatus.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by Django 5.1.1 on 2024-12-12 13:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("apps", "0022_mlflowinstance_apps_user_can_see_secrets"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="K8sUserAppStatus",
-            fields=[
-                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
-                ("info", models.JSONField(blank=True, null=True)),
-                ("status", models.CharField(max_length=15, null=True)),
-                ("time", models.DateTimeField(auto_now_add=True)),
-            ],
-            options={
-                "verbose_name": "k8s User App Status",
-                "verbose_name_plural": "k8s User App Statuses",
-                "get_latest_by": "time",
-            },
-        ),
-    ]
diff --git a/apps/migrations/0024_baseappinstance_latest_user_action.py b/apps/migrations/0024_baseappinstance_latest_user_action.py
index 62a048fe..8ac1472e 100644
--- a/apps/migrations/0024_baseappinstance_latest_user_action.py
+++ b/apps/migrations/0024_baseappinstance_latest_user_action.py
@@ -6,10 +6,24 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("apps", "0023_k8suserappstatus"),
+        ("apps", "0023_apps_gpu_enabled"),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name="K8sUserAppStatus",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("info", models.JSONField(blank=True, null=True)),
+                ("status", models.CharField(max_length=15, null=True)),
+                ("time", models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                "verbose_name": "k8s User App Status",
+                "verbose_name_plural": "k8s User App Statuses",
+                "get_latest_by": "time",
+            },
+        ),
         migrations.AddField(
             model_name="baseappinstance",
             name="latest_user_action",