From 07fe9614f7bb91b3f27e72186042728c535979b5 Mon Sep 17 00:00:00 2001
From: Mubangizi Allan <mubangizia22@gmail.com>
Date: Tue, 17 Mar 2026 19:01:37 +0300
Subject: [PATCH 1/3] fix down revision

---
 migrations/versions/64081c5f2989_.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migrations/versions/64081c5f2989_.py b/migrations/versions/64081c5f2989_.py
index 29a378ed..6e236aaf 100644
--- a/migrations/versions/64081c5f2989_.py
+++ b/migrations/versions/64081c5f2989_.py
@@ -1,7 +1,7 @@
 """empty message
 
 Revision ID: 64081c5f2989
-Revises: a49047414055
+Revises: 6478d31e8708
 Create Date: 2025-08-25 08:16:07.562694
 
 """

From a00deb1641d501ce5bd2a0f8f89c78c977ec9204 Mon Sep 17 00:00:00 2001
From: Mubangizi Allan <mubangizia22@gmail.com>
Date: Tue, 17 Mar 2026 19:37:21 +0300
Subject: [PATCH 2/3] add new migrations

---
 .github/workflows/staging.yml                 |  1 +
 .../{55990e80e47d_.py => 0cc131c2513f_.py}    | 20 ++++++++---
 migrations/versions/27141ac3059a_.py          | 36 -------------------
 3 files changed, 16 insertions(+), 41 deletions(-)
 rename migrations/versions/{55990e80e47d_.py => 0cc131c2513f_.py} (68%)
 delete mode 100644 migrations/versions/27141ac3059a_.py

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 0ef7db09..7974e6ae 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - staging
+      - fix-migration
 
   workflow_dispatch:
 
diff --git a/migrations/versions/55990e80e47d_.py b/migrations/versions/0cc131c2513f_.py
similarity index 68%
rename from migrations/versions/55990e80e47d_.py
rename to migrations/versions/0cc131c2513f_.py
index 996afe69..ccc13dbf 100644
--- a/migrations/versions/55990e80e47d_.py
+++ b/migrations/versions/0cc131c2513f_.py
@@ -1,8 +1,8 @@
 """empty message
 
-Revision ID: 55990e80e47d
-Revises: 27141ac3059a
-Create Date: 2026-03-12 23:33:31.885197
+Revision ID: 0cc131c2513f
+Revises: 64081c5f2989
+Create Date: 2026-03-17 16:36:26.608525
 
 """
 from alembic import op
@@ -10,14 +10,19 @@
 
 
 # revision identifiers, used by Alembic.
-revision = '55990e80e47d'
-down_revision = '27141ac3059a'
+revision = '0cc131c2513f'
+down_revision = '64081c5f2989'
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('app', sa.Column('deleted_at', sa.DateTime(), nullable=True))
+    op.add_column('app', sa.Column('disabled_at', sa.DateTime(), nullable=True))
+    op.add_column('app', sa.Column('disabled_reason', sa.String(), nullable=True))
+    op.add_column('app', sa.Column('enabled_at', sa.DateTime(), nullable=True))
+    op.add_column('app', sa.Column('updated_at', sa.DateTime(), nullable=True))
     op.add_column('project', sa.Column('deleted_at', sa.DateTime(), nullable=True))
     op.add_column('project', sa.Column('disabled_at', sa.DateTime(), nullable=True))
     op.add_column('project', sa.Column('disabled_reason', sa.String(), nullable=True))
@@ -43,4 +48,9 @@ def downgrade():
     op.drop_column('project', 'disabled_reason')
     op.drop_column('project', 'disabled_at')
     op.drop_column('project', 'deleted_at')
+    op.drop_column('app', 'updated_at')
+    op.drop_column('app', 'enabled_at')
+    op.drop_column('app', 'disabled_reason')
+    op.drop_column('app', 'disabled_at')
+    op.drop_column('app', 'deleted_at')
     # ### end Alembic commands ###
diff --git a/migrations/versions/27141ac3059a_.py b/migrations/versions/27141ac3059a_.py
deleted file mode 100644
index ad50ea99..00000000
--- a/migrations/versions/27141ac3059a_.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""empty message
-
-Revision ID: 27141ac3059a
-Revises: 64081c5f2989
-Create Date: 2026-03-12 22:44:43.160267
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '27141ac3059a'
-down_revision = '64081c5f2989'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('app', sa.Column('deleted_at', sa.DateTime(), nullable=True))
-    op.add_column('app', sa.Column('disabled_at', sa.DateTime(), nullable=True))
-    op.add_column('app', sa.Column('disabled_reason', sa.String(), nullable=True))
-    op.add_column('app', sa.Column('enabled_at', sa.DateTime(), nullable=True))
-    op.add_column('app', sa.Column('updated_at', sa.DateTime(), nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('app', 'updated_at')
-    op.drop_column('app', 'enabled_at')
-    op.drop_column('app', 'disabled_reason')
-    op.drop_column('app', 'disabled_at')
-    op.drop_column('app', 'deleted_at')
-    # ### end Alembic commands ###

From 436f015f789597aebca674282b66ed2fcf7ece84 Mon Sep 17 00:00:00 2001
From: Mubangizi Allan <mubangizia22@gmail.com>
Date: Tue, 17 Mar 2026 19:54:28 +0300
Subject: [PATCH 3/3] remove test branch

---
 .github/workflows/staging.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 7974e6ae..0ef7db09 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - staging
-      - fix-migration
 
   workflow_dispatch: