From e6b8aa9076cf8e4e4a5184168d27f2604f6a3ccb Mon Sep 17 00:00:00 2001 From: HombreLaser Date: Thu, 21 Dec 2023 19:33:01 -0600 Subject: Add migrations --- app/controllers/sessions_controller.py | 2 ++ app/database/models/__init__.py | 1 + app/database/models/user.py | 14 +++++++++++ app/models/__init__.py | 0 app/models/user.py | 13 ---------- main.py | 2 +- migrations/versions/31bf24732e3d_add_users.py | 36 +++++++++++++++++++++++++++ 7 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 app/database/models/__init__.py create mode 100644 app/database/models/user.py delete mode 100644 app/models/__init__.py delete mode 100644 app/models/user.py create mode 100644 migrations/versions/31bf24732e3d_add_users.py diff --git a/app/controllers/sessions_controller.py b/app/controllers/sessions_controller.py index dc0a3eb..8d30f86 100644 --- a/app/controllers/sessions_controller.py +++ b/app/controllers/sessions_controller.py @@ -1,5 +1,7 @@ from flask import Blueprint from app.controllers import sessions_blueprint +from app.database.models.user import User + @sessions_blueprint.route('/') def hello(): diff --git a/app/database/models/__init__.py b/app/database/models/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/app/database/models/__init__.py @@ -0,0 +1 @@ + diff --git a/app/database/models/user.py b/app/database/models/user.py new file mode 100644 index 0000000..a04e185 --- /dev/null +++ b/app/database/models/user.py @@ -0,0 +1,14 @@ +from sqlalchemy import BigInteger, String, Date +from sqlalchemy.orm import mapped_column +from app.database import db + + +class User(db.Model): + __tablename__ = 'users' + + id = mapped_column(BigInteger, primary_key=True) + email = mapped_column(String, nullable=False) + first_name = mapped_column(String, nullable=False) + last_name = mapped_column(String, nullable=False) + role = mapped_column(String(10), nullable=False) + created_at = mapped_column(Date, nullable=False) diff --git a/app/models/__init__.py b/app/models/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/models/user.py b/app/models/user.py deleted file mode 100644 index a76fb2e..0000000 --- a/app/models/user.py +++ /dev/null @@ -1,13 +0,0 @@ -from sqlalchemy import BigInteger, String, Date -from sqlalchemy.orm import mapped_column -from app.database import db - -class User(db.Model): - __tablename__ = 'users' - - id = mapped_column(BigInteger, primary_key=True) - email = mapped_column(String, nullable=False) - first_name = mapped_column(String, nullable=False) - last_name = mapped_column(String, nullable=False) - role = mapped_column(String(10), nullable=False) - created_at = mapped_column(Date, nullable=False) diff --git a/main.py b/main.py index 86375f9..0f2ec16 100644 --- a/main.py +++ b/main.py @@ -7,6 +7,6 @@ app = Flask(__name__) app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///database.db' migrate = Migrate(app, db) db.init_app(app) + # Blueprints registration app.register_blueprint(sessions_blueprint) - diff --git a/migrations/versions/31bf24732e3d_add_users.py b/migrations/versions/31bf24732e3d_add_users.py new file mode 100644 index 0000000..34383d9 --- /dev/null +++ b/migrations/versions/31bf24732e3d_add_users.py @@ -0,0 +1,36 @@ +"""Add Users + +Revision ID: 31bf24732e3d +Revises: +Create Date: 2023-12-21 19:20:51.840838 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '31bf24732e3d' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('users', + sa.Column('id', sa.BigInteger(), nullable=False), + sa.Column('email', sa.String(), nullable=False), + sa.Column('first_name', sa.String(), nullable=False), + sa.Column('last_name', sa.String(), nullable=False), + sa.Column('role', sa.String(length=10), nullable=False), + sa.Column('created_at', sa.Date(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('users') + # ### end Alembic commands ### -- cgit v1.2.3