final migration issues fixed

This reverts commit f00d569db3.

Dockerfile

@@ -1,33 +1,57 @@
 FROM python:3.11-slim
 
-WORKDIR /app
-
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
-    gcc \
-    postgresql-client \
+    build-essential \
+    libpq-dev \
+    curl \
     netcat-traditional \
     && rm -rf /var/lib/apt/lists/*
 
+# Create a non-root user
+RUN useradd -m -u 1000 celery
+
+# Set working directory
+WORKDIR /app
+
 # Copy requirements first to leverage Docker cache
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy the rest of the application
+# Copy application code
 COPY . .
 
-# Create migrations directory if it doesn't exist
-RUN mkdir -p migrations/versions
+# Create necessary directories and set permissions
+RUN mkdir -p /app/uploads /app/static/uploads && \
+    chown -R celery:celery /app
 
-# Make entrypoint script executable
-RUN chmod +x entrypoint.sh
+# Create and set up startup script
+RUN echo '#!/bin/bash\n\
+echo "Waiting for database..."\n\
+while ! nc -z db 5432; do\n\
+  sleep 0.1\n\
+done\n\
+echo "Database is ready!"\n\
+\n\
+echo "Waiting for Redis..."\n\
+while ! nc -z redis 6379; do\n\
+  sleep 0.1\n\
+done\n\
+echo "Redis is ready!"\n\
+\n\
+echo "Running database migrations..."\n\
+flask db upgrade\n\
+\n\
+echo "Creating admin user..."\n\
+flask create-admin\n\
+\n\
+echo "Starting application..."\n\
+exec "$@"' > /app/start.sh && \
+    chmod +x /app/start.sh && \
+    chown celery:celery /app/start.sh
 
-# Set environment variables
-ENV FLASK_APP=app.py
-ENV FLASK_ENV=production
+# Switch to non-root user
+USER celery
 
-# Expose the port the app runs on
-EXPOSE 5000
-
-# Use the entrypoint script
-ENTRYPOINT ["./entrypoint.sh"] 
+# Set entrypoint
+ENTRYPOINT ["/app/start.sh"] 

app.py

@@ -1,8 +1,9 @@
-from flask import Flask, send_from_directory
+import random
+from flask import Flask, send_from_directory, jsonify
 from flask_migrate import Migrate
 from dotenv import load_dotenv
 import os
-from models import User
+from models import User, SiteSettings
 from flask_wtf.csrf import generate_csrf
 from routes.room_files import room_files_bp
 from routes.user import user_bp
@@ -11,7 +12,9 @@ from routes.trash import trash_bp
 from tasks import cleanup_trash
 import click
 from utils import timeago
-from extensions import db, login_manager, csrf, socketio
+from extensions import db, login_manager, csrf
+from utils.email_templates import create_default_templates
+from celery_worker import init_celery, celery
 
 # Load environment variables
 load_dotenv()
@@ -24,6 +27,7 @@ def create_app():
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['SECRET_KEY'] = os.getenv('SECRET_KEY', 'your-secure-secret-key-here')
     app.config['UPLOAD_FOLDER'] = os.path.join(app.root_path, 'static', 'uploads')
+    app.config['CSS_VERSION'] = os.getenv('CSS_VERSION', '1.0.3')  # Add CSS version for cache busting
 
     # Initialize extensions
     db.init_app(app)
@@ -31,24 +35,54 @@ def create_app():
     login_manager.init_app(app)
     login_manager.login_view = 'auth.login'
     csrf.init_app(app)
-    socketio.init_app(app)
+
+    # Initialize Celery
+    init_celery(app)
 
     @app.context_processor
     def inject_csrf_token():
         return dict(csrf_token=generate_csrf())
 
+    @app.context_processor
+    def inject_config():
+        site_settings = SiteSettings.query.first()
+        if not site_settings:
+            site_settings = SiteSettings()
+            db.session.add(site_settings)
+            db.session.commit()
+        return dict(config=app.config, site_settings=site_settings)
+
     # User loader for Flask-Login
     @login_manager.user_loader
     def load_user(user_id):
         return User.query.get(int(user_id))
 
+    # Health check endpoint
+    @app.route('/health')
+    def health_check():
+        try:
+            # Check database connection
+            db.session.execute('SELECT 1')
+            # Check Redis connection
+            celery.control.inspect().ping()
+            return jsonify({
+                'status': 'healthy',
+                'database': 'connected',
+                'redis': 'connected'
+            }), 200
+        except Exception as e:
+            return jsonify({
+                'status': 'unhealthy',
+                'error': str(e)
+            }), 500
+
     # Initialize routes
     from routes import init_app
     init_app(app)
     app.register_blueprint(room_files_bp, url_prefix='/api/rooms')
+    app.register_blueprint(user_bp, url_prefix='/api/users')
     app.register_blueprint(room_members_bp, url_prefix='/api/rooms')
-    app.register_blueprint(trash_bp, url_prefix='/api/rooms')
-    app.register_blueprint(user_bp)
+    app.register_blueprint(trash_bp, url_prefix='/api/trash')
 
     @app.cli.command("cleanup-trash")
     def cleanup_trash_command():
@@ -72,7 +106,7 @@ def create_app():
             is_admin=True,
             is_active=True
         )
-        admin.set_password('q]H488h[8?.A')
+        admin.set_password('changeme')
         db.session.add(admin)
         db.session.commit()
         click.echo("Default administrator user created successfully.")
@@ -80,6 +114,15 @@ def create_app():
     # Register custom filters
     app.jinja_env.filters['timeago'] = timeago
 
+    # Create default email templates if they don't exist
+    with app.app_context():
+        try:
+            # Ensure database tables exist
+            db.create_all()
+            create_default_templates()
+        except Exception as e:
+            print(f"Warning: Could not create default templates: {e}")
+
     return app
 
 app = create_app()
@@ -89,4 +132,4 @@ def profile_pic(filename):
     return send_from_directory(os.path.join(os.getcwd(), 'uploads', 'profile_pics'), filename)
 
 if __name__ == '__main__':
-    socketio.run(app, debug=True) 
+    app.run(debug=True) 

celery_worker.py

@@ -0,0 +1,51 @@
+from celery import Celery
+from flask import current_app
+import os
+import logging
+
+# Configure logging
+logger = logging.getLogger(__name__)
+
+# Get Redis URL from environment variable or use default
+REDIS_URL = os.getenv('REDIS_URL', 'redis://localhost:6379/0')
+
+# Configure Celery
+celery = Celery(
+    'docupulse',
+    backend=REDIS_URL,
+    broker=REDIS_URL,
+    # Add some default configuration
+    task_serializer='json',
+    accept_content=['json'],
+    result_serializer='json',
+    timezone='UTC',
+    enable_utc=True,
+    # Add retry configuration
+    task_acks_late=True,
+    task_reject_on_worker_lost=True,
+    task_default_retry_delay=300,  # 5 minutes
+    task_max_retries=3
+)
+
+def init_celery(app):
+    """Initialize Celery with Flask app context"""
+    celery.conf.update(app.config)
+
+    class ContextTask(celery.Task):
+        """Celery task that runs within Flask app context"""
+        def __call__(self, *args, **kwargs):
+            with app.app_context():
+                return self.run(*args, **kwargs)
+
+        def on_failure(self, exc, task_id, args, kwargs, einfo):
+            """Handle task failure"""
+            logger.error(f'Task {task_id} failed: {exc}')
+            super().on_failure(exc, task_id, args, kwargs, einfo)
+
+        def on_retry(self, exc, task_id, args, kwargs, einfo):
+            """Handle task retry"""
+            logger.warning(f'Task {task_id} is being retried: {exc}')
+            super().on_retry(exc, task_id, args, kwargs, einfo)
+
+    celery.Task = ContextTask
+    return celery 

create_notifs_table.py

@@ -0,0 +1,11 @@
+from app import app, db
+from models import Notif
+
+def create_notifs_table():
+    with app.app_context():
+        # Create the table
+        Notif.__table__.create(db.engine)
+        print("Notifications table created successfully!")
+
+if __name__ == '__main__':
+    create_notifs_table() 

docker-compose.yml

@@ -3,6 +3,7 @@ version: '3.8'
 services:
   web:
     build: .
+    command: gunicorn --bind 0.0.0.0:5000 app:app
     ports:
       - "10335:5000"
     environment:
@@ -12,11 +13,18 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
       - POSTGRES_DB=docupulse
+      - REDIS_URL=redis://redis:6379/0
     volumes:
       - uploads:/app/uploads
     depends_on:
       - db
+      - redis
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5000/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
     deploy:
       resources:
         limits:
@@ -32,6 +40,49 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  redis:
+    image: redis:7
+    ports:
+      - "6379:6379"
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  celery_worker:
+    build: .
+    command: celery -A celery_worker.celery worker --loglevel=info
+    volumes:
+      - .:/app
+    environment:
+      - FLASK_APP=app.py
+      - FLASK_ENV=development
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/docupulse
+      - REDIS_URL=redis://redis:6379/0
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "celery", "-A", "celery_worker.celery", "inspect", "ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 512M
 
 volumes:
   postgres_data:

entrypoint.sh

@@ -6,6 +6,7 @@ echo "POSTGRES_USER: $POSTGRES_USER"
 echo "POSTGRES_PASSWORD: $POSTGRES_PASSWORD"
 echo "POSTGRES_DB: $POSTGRES_DB"
 echo "DATABASE_URL: $DATABASE_URL"
+echo "REDIS_URL: $REDIS_URL"
 
 # Wait for the database to be ready
 echo "Waiting for database to be ready..."
@@ -14,6 +15,13 @@ while ! nc -z db 5432; do
 done
 echo "Database is ready!"
 
+# Wait for Redis to be ready
+echo "Waiting for Redis to be ready..."
+while ! nc -z redis 6379; do
+  sleep 0.1
+done
+echo "Redis is ready!"
+
 # Wait for PostgreSQL to be ready to accept connections
 echo "Waiting for PostgreSQL to accept connections..."
 until PGPASSWORD=$POSTGRES_PASSWORD psql -h db -U $POSTGRES_USER -d $POSTGRES_DB -c '\q'; do
@@ -29,6 +37,34 @@ flask db init
 flask db migrate -m "Initial migration"
 flask db upgrade
 
+# Create events table
+echo "Creating events table..."
+python3 -c "
+from migrations.add_events_table import upgrade
+from app import create_app
+app = create_app()
+with app.app_context():
+    try:
+        upgrade()
+        print('Events table created successfully')
+    except Exception as e:
+        print(f'Error creating events table: {e}')
+"
+
+# Create notifs table
+echo "Creating notifs table..."
+python3 -c "
+from migrations.add_notifs_table import upgrade
+from app import create_app
+app = create_app()
+with app.app_context():
+    try:
+        upgrade()
+        print('Notifs table created successfully')
+    except Exception as e:
+        print(f'Error creating notifs table: {e}')
+"
+
 # Create default site settings if they don't exist
 echo "Creating default site settings..."
 python3 -c "

extensions.py

@@ -1,4 +1,3 @@
-from flask_socketio import SocketIO
 from flask_sqlalchemy import SQLAlchemy
 from flask_login import LoginManager
 from flask_wtf.csrf import CSRFProtect
@@ -6,5 +5,4 @@ from flask_wtf.csrf import CSRFProtect
 # Initialize extensions
 db = SQLAlchemy()
 login_manager = LoginManager()
-csrf = CSRFProtect()
-socketio = SocketIO(cors_allowed_origins="*") 
+csrf = CSRFProtect() 

forms.py

@@ -56,4 +56,18 @@ class ConversationForm(FlaskForm):
 
     def __init__(self, *args, **kwargs):
         super(ConversationForm, self).__init__(*args, **kwargs)
-        self.members.choices = [(u.id, f"{u.username} {u.last_name}") for u in User.query.filter_by(is_active=True).all()] 
+        self.members.choices = [(u.id, f"{u.username} {u.last_name}") for u in User.query.filter_by(is_active=True).all()]
+
+class CompanySettingsForm(FlaskForm):
+    company_name = StringField('Company Name', validators=[Optional(), Length(max=100)])
+    company_website = StringField('Website', validators=[Optional(), Length(max=200)])
+    company_email = StringField('Email', validators=[Optional(), Email(), Length(max=100)])
+    company_phone = StringField('Phone', validators=[Optional(), Length(max=20)])
+    company_address = StringField('Address', validators=[Optional(), Length(max=200)])
+    company_city = StringField('City', validators=[Optional(), Length(max=100)])
+    company_state = StringField('State', validators=[Optional(), Length(max=100)])
+    company_zip = StringField('ZIP Code', validators=[Optional(), Length(max=20)])
+    company_country = StringField('Country', validators=[Optional(), Length(max=100)])
+    company_description = TextAreaField('Description', validators=[Optional()])
+    company_industry = StringField('Industry', validators=[Optional(), Length(max=100)])
+    company_logo = FileField('Company Logo', validators=[FileAllowed(['jpg', 'jpeg', 'png', 'gif'], 'Images only!')]) 

migrations/add_events_table.py

@@ -0,0 +1,61 @@
+import os
+import sys
+from pathlib import Path
+
+# Add the parent directory to Python path so we can import from root
+sys.path.append(str(Path(__file__).parent.parent))
+
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from extensions import db
+from sqlalchemy import text
+
+def upgrade():
+    # Create events table
+    with db.engine.connect() as conn:
+        conn.execute(text('''
+            CREATE TABLE IF NOT EXISTS events (
+                id SERIAL PRIMARY KEY,
+                event_type VARCHAR(50) NOT NULL,
+                user_id INTEGER NOT NULL REFERENCES "user" (id),
+                timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                details JSONB,
+                ip_address VARCHAR(45),
+                user_agent VARCHAR(255)
+            );
+            
+            -- Create index on event_type for faster filtering
+            CREATE INDEX IF NOT EXISTS idx_events_event_type ON events(event_type);
+            
+            -- Create index on timestamp for faster date-based queries
+            CREATE INDEX IF NOT EXISTS idx_events_timestamp ON events(timestamp);
+            
+            -- Create index on user_id for faster user-based queries
+            CREATE INDEX IF NOT EXISTS idx_events_user_id ON events(user_id);
+        '''))
+        conn.commit()
+
+def downgrade():
+    # Drop events table and its indexes
+    with db.engine.connect() as conn:
+        conn.execute(text('''
+            DROP INDEX IF EXISTS idx_events_event_type;
+            DROP INDEX IF EXISTS idx_events_timestamp;
+            DROP INDEX IF EXISTS idx_events_user_id;
+            DROP TABLE IF EXISTS events;
+        '''))
+        conn.commit()
+
+if __name__ == '__main__':
+    app = Flask(__name__)
+    
+    # Use the same database configuration as in app.py
+    app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE_URL', 'postgresql://postgres:1253@localhost:5432/docupulse')
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    
+    print("Connecting to database...")
+    
+    db.init_app(app)
+    
+    with app.app_context():
+        upgrade() 

migrations/add_notifs_table.py

@@ -0,0 +1,61 @@
+import os
+import sys
+from pathlib import Path
+
+# Add the parent directory to Python path so we can import from root
+sys.path.append(str(Path(__file__).parent.parent))
+
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from extensions import db
+from sqlalchemy import text
+
+def upgrade():
+    # Create notifs table
+    with db.engine.connect() as conn:
+        conn.execute(text('''
+            CREATE TABLE IF NOT EXISTS notifs (
+                id SERIAL PRIMARY KEY,
+                notif_type VARCHAR(50) NOT NULL,
+                user_id INTEGER NOT NULL REFERENCES "user" (id),
+                sender_id INTEGER REFERENCES "user" (id),
+                timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                read BOOLEAN NOT NULL DEFAULT FALSE,
+                details JSONB
+            );
+            
+            -- Create indexes for faster queries
+            CREATE INDEX IF NOT EXISTS idx_notifs_notif_type ON notifs(notif_type);
+            CREATE INDEX IF NOT EXISTS idx_notifs_timestamp ON notifs(timestamp);
+            CREATE INDEX IF NOT EXISTS idx_notifs_user_id ON notifs(user_id);
+            CREATE INDEX IF NOT EXISTS idx_notifs_sender_id ON notifs(sender_id);
+            CREATE INDEX IF NOT EXISTS idx_notifs_read ON notifs(read);
+        '''))
+        conn.commit()
+
+def downgrade():
+    # Drop notifs table and its indexes
+    with db.engine.connect() as conn:
+        conn.execute(text('''
+            DROP INDEX IF EXISTS idx_notifs_notif_type;
+            DROP INDEX IF EXISTS idx_notifs_timestamp;
+            DROP INDEX IF EXISTS idx_notifs_user_id;
+            DROP INDEX IF EXISTS idx_notifs_sender_id;
+            DROP INDEX IF EXISTS idx_notifs_read;
+            DROP TABLE IF EXISTS notifs;
+        '''))
+        conn.commit()
+
+if __name__ == '__main__':
+    app = Flask(__name__)
+    
+    # Use the same database configuration as in app.py
+    app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE_URL', 'postgresql://postgres:1253@localhost:5432/docupulse')
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    
+    print("Connecting to database...")
+    
+    db.init_app(app)
+    
+    with app.app_context():
+        upgrade() 

migrations/versions/0a8006bd1732_add_key_value_settings_table.py

@@ -0,0 +1,41 @@
+"""add key value settings table
+
+Revision ID: 0a8006bd1732
+Revises: 20519a2437c2
+Create Date: 2025-06-02 14:10:54.033943
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import inspect
+
+
+# revision identifiers, used by Alembic.
+revision = '0a8006bd1732'
+down_revision = '20519a2437c2'
+branch_labels = None
+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 'key_value_settings' not in tables:
+        op.create_table('key_value_settings',
+            sa.Column('id', sa.Integer(), nullable=False),
+            sa.Column('key', sa.String(length=100), nullable=False),
+            sa.Column('value', sa.Text(), nullable=True),
+            sa.Column('updated_at', sa.DateTime(), nullable=True),
+            sa.PrimaryKeyConstraint('id'),
+            sa.UniqueConstraint('key')
+        )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('key_value_settings')
+    # ### end Alembic commands ### 

migrations/versions/0f48943140fa_add_file_attachment_fields_to_message_.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-26 14:00:05.521776
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,23 +19,41 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('message')]
+    
     with op.batch_alter_table('message', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('has_attachment', sa.Boolean(), nullable=True))
-        batch_op.add_column(sa.Column('attachment_name', sa.String(length=255), nullable=True))
-        batch_op.add_column(sa.Column('attachment_path', sa.String(length=512), nullable=True))
-        batch_op.add_column(sa.Column('attachment_type', sa.String(length=100), nullable=True))
-        batch_op.add_column(sa.Column('attachment_size', sa.Integer(), nullable=True))
+        if 'has_attachment' not in columns:
+            batch_op.add_column(sa.Column('has_attachment', sa.Boolean(), nullable=True))
+        if 'attachment_name' not in columns:
+            batch_op.add_column(sa.Column('attachment_name', sa.String(length=255), nullable=True))
+        if 'attachment_path' not in columns:
+            batch_op.add_column(sa.Column('attachment_path', sa.String(length=512), nullable=True))
+        if 'attachment_type' not in columns:
+            batch_op.add_column(sa.Column('attachment_type', sa.String(length=100), nullable=True))
+        if 'attachment_size' not in columns:
+            batch_op.add_column(sa.Column('attachment_size', sa.Integer(), nullable=True))
 
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('message')]
+    
     with op.batch_alter_table('message', schema=None) as batch_op:
-        batch_op.drop_column('attachment_size')
-        batch_op.drop_column('attachment_type')
-        batch_op.drop_column('attachment_path')
-        batch_op.drop_column('attachment_name')
-        batch_op.drop_column('has_attachment')
+        if 'attachment_size' in columns:
+            batch_op.drop_column('attachment_size')
+        if 'attachment_type' in columns:
+            batch_op.drop_column('attachment_type')
+        if 'attachment_path' in columns:
+            batch_op.drop_column('attachment_path')
+        if 'attachment_name' in columns:
+            batch_op.drop_column('attachment_name')
+        if 'has_attachment' in columns:
+            batch_op.drop_column('has_attachment')
 
     # ### end Alembic commands ###

migrations/versions/1c297825e3a9_add_user_authentication_fields.py

@@ -2,11 +2,12 @@
 
 Revision ID: 1c297825e3a9
 Revises: 
-Create Date: 2025-05-23 08:39:40.494853
+Create Date: 2025-06-02 13:26:30.353000
 
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -17,20 +18,27 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('user',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('username', sa.String(length=150), nullable=False),
-    sa.Column('email', sa.String(length=150), nullable=False),
-    sa.Column('password_hash', sa.String(length=128), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('email'),
-    sa.UniqueConstraint('username')
-    )
-    # ### end Alembic commands ###
+    # Check if the table exists before creating it
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    if 'user' not in inspector.get_table_names():
+        conn = op.get_bind()
+        inspector = inspect(conn)
+        tables = inspector.get_table_names()
+        
+        if 'user' not in tables:
+            op.create_table('user',
+                sa.Column('id', sa.Integer(), nullable=False),
+                sa.Column('username', sa.String(length=150), nullable=False),
+                sa.Column('email', sa.String(length=150), nullable=False),
+                sa.Column('password_hash', sa.String(length=128), nullable=True),
+                sa.PrimaryKeyConstraint('id'),
+                sa.UniqueConstraint('email'),
+                sa.UniqueConstraint('username')
+            )
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('user')
-    # ### end Alembic commands ###
+    # ### end Alembic commands ### 

migrations/versions/20519a2437c2_add_mails_table.py

@@ -0,0 +1,47 @@
+"""add_mails_table
+
+Revision ID: 20519a2437c2
+Revises: 444d76da74ba
+Create Date: 2025-06-02 09:04:39.972021
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import inspect
+
+
+# revision identifiers, used by Alembic.
+revision = '20519a2437c2'
+down_revision = '444d76da74ba'
+branch_labels = None
+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 'mails' not in tables:
+        op.create_table('mails',
+            sa.Column('id', sa.Integer(), nullable=False),
+            sa.Column('recipient', sa.String(length=150), nullable=False),
+            sa.Column('subject', sa.String(length=200), nullable=False),
+            sa.Column('body', sa.Text(), nullable=False),
+            sa.Column('status', sa.String(length=20), nullable=False),
+            sa.Column('created_at', sa.DateTime(), nullable=True),
+            sa.Column('sent_at', sa.DateTime(), nullable=True),
+            sa.Column('template_id', sa.Integer(), nullable=True),
+            sa.Column('notif_id', sa.Integer(), nullable=True),
+            sa.ForeignKeyConstraint(['notif_id'], ['notifs.id'], ),
+            sa.ForeignKeyConstraint(['template_id'], ['email_templates.id'], ),
+            sa.PrimaryKeyConstraint('id')
+        )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('mails')
+    # ### end Alembic commands ### 

migrations/versions/25da158dd705_add_is_admin_to_contact_model.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-23 16:10:53.731035
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,15 +19,25 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('contact')]
+    
     with op.batch_alter_table('contact', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('is_admin', sa.Boolean(), nullable=True))
+        if 'is_admin' not in columns:
+            batch_op.add_column(sa.Column('is_admin', sa.Boolean(), nullable=True))
 
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('contact')]
+    
     with op.batch_alter_table('contact', schema=None) as batch_op:
-        batch_op.drop_column('is_admin')
+        if 'is_admin' in columns:
+            batch_op.drop_column('is_admin')
 
     # ### end Alembic commands ###

migrations/versions/26b0e5357f52_add_room_member_permissions_table.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-23 21:44:58.832286
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,17 +19,22 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('room_member_permissions',
-    sa.Column('room_id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('can_view', sa.Boolean(), nullable=False),
-    sa.Column('can_upload', sa.Boolean(), nullable=False),
-    sa.Column('can_delete', sa.Boolean(), nullable=False),
-    sa.Column('can_share', sa.Boolean(), nullable=False),
-    sa.ForeignKeyConstraint(['room_id'], ['room.id'], ),
-    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
-    sa.PrimaryKeyConstraint('room_id', 'user_id')
-    )
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    tables = inspector.get_table_names()
+    
+    if 'room_member_permissions' not in tables:
+        op.create_table('room_member_permissions',
+        sa.Column('room_id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('can_view', sa.Boolean(), nullable=False),
+        sa.Column('can_upload', sa.Boolean(), nullable=False),
+        sa.Column('can_delete', sa.Boolean(), nullable=False),
+        sa.Column('can_share', sa.Boolean(), nullable=False),
+        sa.ForeignKeyConstraint(['room_id'], ['room.id'], ),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('room_id', 'user_id')
+        )
     # ### end Alembic commands ###
 
 

migrations/versions/2c5f57dddb78_add_room_members_table.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-23 21:27:17.497481
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,15 +19,24 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('room_members',
-    sa.Column('room_id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.ForeignKeyConstraint(['room_id'], ['room.id'], ),
-    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
-    sa.PrimaryKeyConstraint('room_id', 'user_id')
-    )
-    with op.batch_alter_table('room', schema=None) as batch_op:
-        batch_op.drop_column('is_private')
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    tables = inspector.get_table_names()
+    
+    if 'room_members' not in tables:
+        op.create_table('room_members',
+        sa.Column('room_id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(['room_id'], ['room.id'], ),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('room_id', 'user_id')
+        )
+    
+    # Check if is_private column exists before dropping it
+    columns = [col['name'] for col in inspector.get_columns('room')]
+    if 'is_private' in columns:
+        with op.batch_alter_table('room', schema=None) as batch_op:
+            batch_op.drop_column('is_private')
 
     # ### end Alembic commands ###
 

migrations/versions/3a5b8d8e53cd_add_rooms_table.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-23 21:25:27.880150
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,16 +19,21 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('room',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', sa.String(length=100), nullable=False),
-    sa.Column('description', sa.Text(), nullable=True),
-    sa.Column('created_at', sa.DateTime(), nullable=True),
-    sa.Column('created_by', sa.Integer(), nullable=False),
-    sa.Column('is_private', sa.Boolean(), nullable=True),
-    sa.ForeignKeyConstraint(['created_by'], ['user.id'], ),
-    sa.PrimaryKeyConstraint('id')
-    )
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    tables = inspector.get_table_names()
+    
+    if 'room' not in tables:
+        op.create_table('room',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('name', sa.String(length=100), nullable=False),
+        sa.Column('description', sa.Text(), nullable=True),
+        sa.Column('created_at', sa.DateTime(), nullable=True),
+        sa.Column('created_by', sa.Integer(), nullable=False),
+        sa.Column('is_private', sa.Boolean(), nullable=True),
+        sa.ForeignKeyConstraint(['created_by'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('id')
+        )
     # ### end Alembic commands ###
 
 

migrations/versions/43dfd2543fad_add_contact_fields_to_user_model.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-23 09:24:23.926302
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,12 +19,21 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('user')]
+    
     with op.batch_alter_table('user', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('phone', sa.String(length=20), nullable=True))
-        batch_op.add_column(sa.Column('company', sa.String(length=100), nullable=True))
-        batch_op.add_column(sa.Column('position', sa.String(length=100), nullable=True))
-        batch_op.add_column(sa.Column('notes', sa.Text(), nullable=True))
-        batch_op.add_column(sa.Column('is_active', sa.Boolean(), nullable=True))
+        if 'phone' not in columns:
+            batch_op.add_column(sa.Column('phone', sa.String(length=20), nullable=True))
+        if 'company' not in columns:
+            batch_op.add_column(sa.Column('company', sa.String(length=100), nullable=True))
+        if 'position' not in columns:
+            batch_op.add_column(sa.Column('position', sa.String(length=100), nullable=True))
+        if 'notes' not in columns:
+            batch_op.add_column(sa.Column('notes', sa.Text(), nullable=True))
+        if 'is_active' not in columns:
+            batch_op.add_column(sa.Column('is_active', sa.Boolean(), nullable=True))
 
     # ### end Alembic commands ###
 

migrations/versions/444d76da74ba_add_notifications_table.py

@@ -0,0 +1,63 @@
+"""add_notifications_table
+
+Revision ID: 444d76da74ba
+Revises: c770e08966b4
+Create Date: 2025-06-02 08:25:48.241102
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import inspect
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '444d76da74ba'
+down_revision = 'c770e08966b4'
+branch_labels = None
+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 ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    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),
+            sa.Column('notification_type', sa.VARCHAR(length=50), autoincrement=False, nullable=False),
+            sa.Column('variable_name', sa.VARCHAR(length=50), autoincrement=False, nullable=False),
+            sa.Column('description', sa.VARCHAR(length=200), autoincrement=False, nullable=False),
+            sa.Column('example_value', sa.VARCHAR(length=200), autoincrement=False, nullable=True),
+            sa.Column('created_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
+            sa.PrimaryKeyConstraint('id', name=op.f('template_variables_pkey'))
+        )
+    # ### end Alembic commands ### 

migrations/versions/64b5c28510b0_add_room_file_table_for_file_folder_.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-24 10:07:02.159730
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,22 +19,31 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('room_file',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('room_id', sa.Integer(), nullable=False),
-    sa.Column('name', sa.String(length=255), nullable=False),
-    sa.Column('path', sa.String(length=1024), nullable=False),
-    sa.Column('type', sa.String(length=10), nullable=False),
-    sa.Column('size', sa.BigInteger(), nullable=True),
-    sa.Column('modified', sa.Float(), nullable=True),
-    sa.Column('uploaded_by', sa.Integer(), nullable=False),
-    sa.Column('uploaded_at', sa.DateTime(), nullable=False),
-    sa.ForeignKeyConstraint(['room_id'], ['room.id'], ),
-    sa.ForeignKeyConstraint(['uploaded_by'], ['user.id'], ),
-    sa.PrimaryKeyConstraint('id')
-    )
-    with op.batch_alter_table('room_member_permissions', schema=None) as batch_op:
-        batch_op.drop_column('preferred_view')
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    tables = inspector.get_table_names()
+    
+    if 'room_file' not in tables:
+        op.create_table('room_file',
+            sa.Column('id', sa.Integer(), nullable=False),
+            sa.Column('room_id', sa.Integer(), nullable=False),
+            sa.Column('name', sa.String(length=255), nullable=False),
+            sa.Column('path', sa.String(length=1024), nullable=False),
+            sa.Column('type', sa.String(length=10), nullable=False),
+            sa.Column('size', sa.BigInteger(), nullable=True),
+            sa.Column('modified', sa.Float(), nullable=True),
+            sa.Column('uploaded_by', sa.Integer(), nullable=False),
+            sa.Column('uploaded_at', sa.DateTime(), nullable=False),
+            sa.ForeignKeyConstraint(['room_id'], ['room.id'], ),
+            sa.ForeignKeyConstraint(['uploaded_by'], ['user.id'], ),
+            sa.PrimaryKeyConstraint('id')
+        )
+    
+    # Check if preferred_view column exists before trying to drop it
+    columns = [col['name'] for col in inspector.get_columns('room_member_permissions')]
+    if 'preferred_view' in columns:
+        with op.batch_alter_table('room_member_permissions', schema=None) as batch_op:
+            batch_op.drop_column('preferred_view')
 
     # ### end Alembic commands ###
 
@@ -44,4 +54,4 @@ def downgrade():
         batch_op.add_column(sa.Column('preferred_view', sa.VARCHAR(length=10), autoincrement=False, nullable=False))
 
     op.drop_table('room_file')
-    # ### end Alembic commands ###
+    # ### end Alembic commands ### 

migrations/versions/6651332488d9_add_starred_column_to_room_file_table.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-24 18:14:38.320999
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
@@ -18,43 +19,63 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('room_file')]
+    
     with op.batch_alter_table('room_file', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('starred', sa.Boolean(), nullable=True))
-        batch_op.alter_column('path',
-               existing_type=sa.VARCHAR(length=1024),
-               type_=sa.String(length=255),
-               existing_nullable=False)
-        batch_op.alter_column('size',
-               existing_type=sa.BIGINT(),
-               type_=sa.Integer(),
-               existing_nullable=True)
-        batch_op.alter_column('uploaded_by',
-               existing_type=sa.INTEGER(),
-               nullable=True)
-        batch_op.alter_column('uploaded_at',
-               existing_type=postgresql.TIMESTAMP(),
-               nullable=True)
+        if 'starred' not in columns:
+            batch_op.add_column(sa.Column('starred', sa.Boolean(), nullable=True))
+        
+        # Only alter columns if they exist
+        if 'path' in columns:
+            batch_op.alter_column('path',
+                   existing_type=sa.VARCHAR(length=1024),
+                   type_=sa.String(length=255),
+                   existing_nullable=False)
+        if 'size' in columns:
+            batch_op.alter_column('size',
+                   existing_type=sa.BIGINT(),
+                   type_=sa.Integer(),
+                   existing_nullable=True)
+        if 'uploaded_by' in columns:
+            batch_op.alter_column('uploaded_by',
+                   existing_type=sa.INTEGER(),
+                   nullable=True)
+        if 'uploaded_at' in columns:
+            batch_op.alter_column('uploaded_at',
+                   existing_type=postgresql.TIMESTAMP(),
+                   nullable=True)
 
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('room_file')]
+    
     with op.batch_alter_table('room_file', schema=None) as batch_op:
-        batch_op.alter_column('uploaded_at',
-               existing_type=postgresql.TIMESTAMP(),
-               nullable=False)
-        batch_op.alter_column('uploaded_by',
-               existing_type=sa.INTEGER(),
-               nullable=False)
-        batch_op.alter_column('size',
-               existing_type=sa.Integer(),
-               type_=sa.BIGINT(),
-               existing_nullable=True)
-        batch_op.alter_column('path',
-               existing_type=sa.String(length=255),
-               type_=sa.VARCHAR(length=1024),
-               existing_nullable=False)
-        batch_op.drop_column('starred')
+        if 'uploaded_at' in columns:
+            batch_op.alter_column('uploaded_at',
+                   existing_type=postgresql.TIMESTAMP(),
+                   nullable=False)
+        if 'uploaded_by' in columns:
+            batch_op.alter_column('uploaded_by',
+                   existing_type=sa.INTEGER(),
+                   nullable=False)
+        if 'size' in columns:
+            batch_op.alter_column('size',
+                   existing_type=sa.Integer(),
+                   type_=sa.BIGINT(),
+                   existing_nullable=True)
+        if 'path' in columns:
+            batch_op.alter_column('path',
+                   existing_type=sa.String(length=255),
+                   type_=sa.VARCHAR(length=1024),
+                   existing_nullable=False)
+        if 'starred' in columns:
+            batch_op.drop_column('starred')
 
     # ### end Alembic commands ###

migrations/versions/7554ab70efe7_fix_existing_users.py

@@ -7,6 +7,7 @@ Create Date: 2024-03-19 10:05:00.000000
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 from sqlalchemy.sql import text
 
 

migrations/versions/76da0573e84b_merge_heads.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-25 10:03:03.423064
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.

migrations/versions/787468cfea77_add_company_information_fields_to_.py

@@ -7,6 +7,7 @@ Create Date: 2025-05-26 10:42:17.287566
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 
 
 # revision identifiers, used by Alembic.
@@ -18,17 +19,31 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    columns = [col['name'] for col in inspector.get_columns('site_settings')]
+    
     with op.batch_alter_table('site_settings', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('company_website', sa.String(length=200), nullable=True))
-        batch_op.add_column(sa.Column('company_email', sa.String(length=100), nullable=True))
-        batch_op.add_column(sa.Column('company_phone', sa.String(length=20), nullable=True))
-        batch_op.add_column(sa.Column('company_address', sa.String(length=200), nullable=True))
-        batch_op.add_column(sa.Column('company_city', sa.String(length=100), nullable=True))
-        batch_op.add_column(sa.Column('company_state', sa.String(length=100), nullable=True))
-        batch_op.add_column(sa.Column('company_zip', sa.String(length=20), nullable=True))
-        batch_op.add_column(sa.Column('company_country', sa.String(length=100), nullable=True))
-        batch_op.add_column(sa.Column('company_description', sa.Text(), nullable=True))
-        batch_op.add_column(sa.Column('company_industry', sa.String(length=100), nullable=True))
+        if 'company_website' not in columns:
+            batch_op.add_column(sa.Column('company_website', sa.String(length=200), nullable=True))
+        if 'company_email' not in columns:
+            batch_op.add_column(sa.Column('company_email', sa.String(length=100), nullable=True))
+        if 'company_phone' not in columns:
+            batch_op.add_column(sa.Column('company_phone', sa.String(length=20), nullable=True))
+        if 'company_address' not in columns:
+            batch_op.add_column(sa.Column('company_address', sa.String(length=200), nullable=True))
+        if 'company_city' not in columns:
+            batch_op.add_column(sa.Column('company_city', sa.String(length=100), nullable=True))
+        if 'company_state' not in columns:
+            batch_op.add_column(sa.Column('company_state', sa.String(length=100), nullable=True))
+        if 'company_zip' not in columns:
+            batch_op.add_column(sa.Column('company_zip', sa.String(length=20), nullable=True))
+        if 'company_country' not in columns:
+            batch_op.add_column(sa.Column('company_country', sa.String(length=100), nullable=True))
+        if 'company_description' not in columns:
+            batch_op.add_column(sa.Column('company_description', sa.Text(), nullable=True))
+        if 'company_industry' not in columns:
+            batch_op.add_column(sa.Column('company_industry', sa.String(length=100), nullable=True))
 
     # ### end Alembic commands ###
 

migrations/versions/7a5747dc773f_update_last_name_field_in_user_model.py

@@ -7,6 +7,7 @@ Create Date: 2024-03-19 10:15:00.000000
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 from sqlalchemy.sql import text
 
 

migrations/versions/9faab7ef6036_add_site_settings_table.py

@@ -7,8 +7,10 @@ Create Date: 2025-05-25 21:16:39.683736
 """
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import inspect
 from sqlalchemy.dialects import postgresql
 
+
 # revision identifiers, used by Alembic.
 revision = '9faab7ef6036'
 down_revision = 'ca9026520dad'
@@ -18,25 +20,35 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('site_settings',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('primary_color', sa.String(length=7), nullable=True),
-    sa.Column('secondary_color', sa.String(length=7), nullable=True),
-    sa.Column('updated_at', sa.DateTime(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
-    )
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    tables = inspector.get_table_names()
+    
+    if 'site_settings' not in tables:
+        op.create_table('site_settings',
+            sa.Column('id', sa.Integer(), nullable=False),
+            sa.Column('primary_color', sa.String(length=7), nullable=True),
+            sa.Column('secondary_color', sa.String(length=7), nullable=True),
+            sa.Column('updated_at', sa.DateTime(), nullable=True),
+            sa.PrimaryKeyConstraint('id')
+        )
     op.drop_table('color_settings')
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('color_settings',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('primary_color', sa.VARCHAR(length=7), autoincrement=False, nullable=True),
-    sa.Column('secondary_color', sa.VARCHAR(length=7), autoincrement=False, nullable=True),
-    sa.Column('updated_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
-    sa.PrimaryKeyConstraint('id', name=op.f('color_settings_pkey'))
-    )
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    tables = inspector.get_table_names()
+    
+    if 'color_settings' not in tables:
+        op.create_table('color_settings',
+            sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
+            sa.Column('primary_color', sa.VARCHAR(length=7), autoincrement=False, nullable=True),
+            sa.Column('secondary_color', sa.VARCHAR(length=7), autoincrement=False, nullable=True),
+            sa.Column('updated_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
+            sa.PrimaryKeyConstraint('id', name=op.f('color_settings_pkey'))
+        )
     op.drop_table('site_settings')
-    # ### end Alembic commands ###
+    # ### end Alembic commands ###