From 98b18ca22d15f1b20c2fb5d91dd3bf9bd0568f73 Mon Sep 17 00:00:00 2001 From: kelvyn2012 Date: Sun, 20 Jul 2025 10:26:09 +0100 Subject: [PATCH] commented out the transactions,categories and budget pending when the models are defined --- backend/app.py | 41 +++---- backend/models/user.py | 27 +++-- config.py | 8 +- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++ migrations/env.py | 113 ++++++++++++++++++ migrations/script.py.mako | 24 ++++ .../28310de0aa8f_initial_migration.py | 37 ++++++ 8 files changed, 265 insertions(+), 36 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/28310de0aa8f_initial_migration.py diff --git a/backend/app.py b/backend/app.py index 892d585..d1fc9d5 100644 --- a/backend/app.py +++ b/backend/app.py @@ -1,39 +1,40 @@ from flask import Flask, jsonify, render_template -from flask_sqlalchemy import SQLAlchemy from flask_jwt_extended import JWTManager from flask_cors import CORS from backend.database import db, migrate +from backend.models import user +from config import Config -def create_app(config_class): - app = Flask(__name__, - template_folder='../frontend/templates', - static_folder='../frontend/static') + +def create_app(config_class=Config): + app = Flask( + __name__, + template_folder="../frontend/templates", + static_folder="../frontend/static", + ) + + # Load configuration app.config.from_object(config_class) - + # Initialize extensions db.init_app(app) migrate.init_app(app, db) - jwt = JWTManager(app) + JWTManager(app) CORS(app) - # Landing page route - @app.route('/') + # Landing page + @app.route("/") def index(): - return render_template('index.html') + return render_template("index.html") - # Health check endpoint - @app.route('/api') + # API status check + @app.route("/api") def api_status(): - return jsonify({'message': 'API is working', 'status': 'success'}), 200 - + return jsonify({"message": "API is working", "status": "success"}), 200 + # Register blueprints from backend.routes.auth import auth_bp + app.register_blueprint(auth_bp, url_prefix="/api/auth") - app.register_blueprint(auth_bp, url_prefix='/api/auth') - - # Create tables - with app.app_context(): - db.create_all() - return app diff --git a/backend/models/user.py b/backend/models/user.py index 97ae7fe..6f39f81 100644 --- a/backend/models/user.py +++ b/backend/models/user.py @@ -2,30 +2,31 @@ from werkzeug.security import generate_password_hash, check_password_hash from datetime import datetime + class User(db.Model): - __tablename__ = 'users' - + __tablename__ = "users" + id = db.Column(db.Integer, primary_key=True) username = db.Column(db.String(80), unique=True, nullable=False) email = db.Column(db.String(120), unique=True, nullable=False) password_hash = db.Column(db.String(255), nullable=False) created_at = db.Column(db.DateTime, default=datetime.utcnow) - + # Relationships - transactions = db.relationship('Transaction', backref='user', lazy=True, cascade='all, delete-orphan') - categories = db.relationship('Category', backref='user', lazy=True, cascade='all, delete-orphan') - budgets = db.relationship('Budget', backref='user', lazy=True, cascade='all, delete-orphan') - + # transactions = db.relationship('Transaction', backref='user', lazy=True, cascade='all, delete-orphan') + # categories = db.relationship('Category', backref='user', lazy=True, cascade='all, delete-orphan') + # budgets = db.relationship('Budget', backref='user', lazy=True, cascade='all, delete-orphan') + def set_password(self, password): self.password_hash = generate_password_hash(password) - + def check_password(self, password): return check_password_hash(self.password_hash, password) - + def to_dict(self): return { - 'id': self.id, - 'username': self.username, - 'email': self.email, - 'created_at': self.created_at.isoformat() + "id": self.id, + "username": self.username, + "email": self.email, + "created_at": self.created_at.isoformat(), } diff --git a/config.py b/config.py index 069c716..846b335 100644 --- a/config.py +++ b/config.py @@ -4,15 +4,17 @@ load_dotenv() +basedir = os.path.abspath(os.path.dirname(__file__)) + class Config: SECRET_KEY = os.environ.get('SECRET_KEY') or 'dev-secret-key' - SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL') or 'sqlite:///finance_tracker.db' + SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL') or f"sqlite:///{os.path.join(basedir, 'finance_tracker.db')}" SQLALCHEMY_TRACK_MODIFICATIONS = False - + # JWT Configuration JWT_SECRET_KEY = os.environ.get('JWT_SECRET_KEY') or 'jwt-secret-key' JWT_ACCESS_TOKEN_EXPIRES = timedelta(hours=1) - + class DevelopmentConfig(Config): DEBUG = True diff --git a/migrations/README b/migrations/README new file mode 100644 index 0000000..0e04844 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..ec9d45c --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic,flask_migrate + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..4c97092 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option('sqlalchemy.url', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=get_metadata(), literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 0000000..2c01563 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/28310de0aa8f_initial_migration.py b/migrations/versions/28310de0aa8f_initial_migration.py new file mode 100644 index 0000000..d2fe944 --- /dev/null +++ b/migrations/versions/28310de0aa8f_initial_migration.py @@ -0,0 +1,37 @@ +"""Initial migration + +Revision ID: 28310de0aa8f +Revises: +Create Date: 2025-07-19 09:13:48.736234 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '28310de0aa8f' +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.Integer(), nullable=False), + sa.Column('username', sa.String(length=80), nullable=False), + sa.Column('email', sa.String(length=120), nullable=False), + sa.Column('password_hash', sa.String(length=255), nullable=False), + sa.Column('created_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('email'), + sa.UniqueConstraint('username') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('users') + # ### end Alembic commands ###