final migration issues fixed

migrations/versions/444d76da74ba_add_notifications_table.py

@@ -19,7 +19,25 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    tables = inspector.get_table_names()
+    
+    if 'template_variables' in tables:
         op.drop_table('template_variables')
+    
+    op.create_table('notification',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('title', sa.String(length=200), nullable=False),
+        sa.Column('message', sa.Text(), nullable=False),
+        sa.Column('type', sa.String(length=50), nullable=False),
+        sa.Column('read', sa.Boolean(), nullable=False, server_default='false'),
+        sa.Column('created_at', sa.DateTime(), nullable=True),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('id')
+    )
     # ### end Alembic commands ###
 
 
@@ -29,6 +47,9 @@ def downgrade():
     inspector = inspect(conn)
     tables = inspector.get_table_names()
     
+    if 'notification' in tables:
+        op.drop_table('notification')
+    
     if 'template_variables' not in tables:
         op.create_table('template_variables',
             sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),

migrations/versions/c770e08966b4_add_email_templates_table.py

@@ -2,7 +2,7 @@
 
 Revision ID: c770e08966b4
 Revises: e7e4ff171f7a
-Create Date: 2025-06-01 20:09:08.019884
+Create Date: 2025-06-02 14:00:05.521776
 
 """
 from alembic import op
@@ -23,27 +23,37 @@ def upgrade():
     inspector = inspect(conn)
     tables = inspector.get_table_names()
     
-    if 'email_templates' not in tables:
+    if 'notification' in tables:
-        op.create_table('email_templates',
+        op.drop_table('notification')
+    
+    op.create_table('email_template',
         sa.Column('id', sa.Integer(), nullable=False),
         sa.Column('name', sa.String(length=100), nullable=False),
         sa.Column('subject', sa.String(length=200), nullable=False),
         sa.Column('body', sa.Text(), nullable=False),
         sa.Column('created_at', sa.DateTime(), nullable=True),
         sa.Column('updated_at', sa.DateTime(), nullable=True),
-            sa.Column('created_by', sa.Integer(), nullable=False),
+        sa.PrimaryKeyConstraint('id'),
-            sa.Column('is_active', sa.Boolean(), nullable=True),
+        sa.UniqueConstraint('name')
-            sa.ForeignKeyConstraint(['created_by'], ['user.id'], ),
-            sa.PrimaryKeyConstraint('id')
     )
-    op.drop_table('notification')
+    
+    # Check for existing indexes before dropping them
     with op.batch_alter_table('events', schema=None) as batch_op:
         batch_op.alter_column('details',
                existing_type=postgresql.JSONB(astext_type=sa.Text()),
                type_=sa.JSON(),
                existing_nullable=True)
+        
+        # Get existing indexes
+        indexes = inspector.get_indexes('events')
+        index_names = [idx['name'] for idx in indexes]
+        
+        # Only drop indexes if they exist
+        if 'idx_events_event_type' in index_names:
             batch_op.drop_index(batch_op.f('idx_events_event_type'))
+        if 'idx_events_timestamp' in index_names:
             batch_op.drop_index(batch_op.f('idx_events_timestamp'))
+        if 'idx_events_user_id' in index_names:
             batch_op.drop_index(batch_op.f('idx_events_user_id'))
 
     # ### end Alembic commands ###
@@ -60,22 +70,5 @@ def downgrade():
                type_=postgresql.JSONB(astext_type=sa.Text()),
                existing_nullable=True)
 
-    conn = op.get_bind()
+    op.drop_table('email_template')
-    inspector = inspect(conn)
-    tables = inspector.get_table_names()
-    
-    if 'notification' not in tables:
-        op.create_table('notification',
-            sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-            sa.Column('user_id', sa.INTEGER(), autoincrement=False, nullable=False),
-            sa.Column('title', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
-            sa.Column('message', sa.TEXT(), autoincrement=False, nullable=False),
-            sa.Column('type', sa.VARCHAR(length=50), autoincrement=False, nullable=False),
-            sa.Column('is_read', sa.BOOLEAN(), autoincrement=False, nullable=True),
-            sa.Column('created_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
-            sa.Column('link', sa.VARCHAR(length=512), autoincrement=False, nullable=True),
-            sa.ForeignKeyConstraint(['user_id'], ['user.id'], name=op.f('notification_user_id_fkey')),
-            sa.PrimaryKeyConstraint('id', name=op.f('notification_pkey'))
-        )
-    op.drop_table('email_templates')
     # ### end Alembic commands ###