From 9df259eb583f5b8b60e76b06a86b59c2848a2f07 Mon Sep 17 00:00:00 2001 From: Bryce Date: Sun, 3 Aug 2025 21:35:22 -0700 Subject: [PATCH] works --- QWEN.md | 10 +- alembic/README | 1 + alembic/env.py | 78 +++++++ alembic/script.py.mako | 28 +++ app/__init__.py | 5 +- app/__pycache__/__init__.cpython-310.pyc | Bin 571 -> 0 bytes app/__pycache__/models.cpython-310.pyc | Bin 1138 -> 0 bytes app/models.py | 17 +- app/routes.py | 191 ++++++++++-------- app/templates/index.html | 16 +- app/templates/partials/folder_modal.html | 40 ++-- migrations/README | 2 +- migrations/__pycache__/env.cpython-310.pyc | Bin 1973 -> 0 bytes migrations/alembic.ini | 50 +++++ migrations/env.py | 88 +++++--- migrations/script.py.mako | 16 +- ..._users_and_.py => 02a7c13515a4_initial.py} | 28 ++- ..._migration_with_users_and_.cpython-310.pyc | Bin 1497 -> 0 bytes test_delete_functionality.py | 50 ----- test_edit_functionality.py | 75 ------- .../conftest.cpython-310-pytest-7.4.0.pyc | Bin 1768 -> 0 bytes .../test_models.cpython-310-pytest-7.4.0.pyc | Bin 4480 -> 0 bytes .../test_routes.cpython-310-pytest-7.4.0.pyc | Bin 2521 -> 0 bytes tests/conftest.py | 60 +++--- tests/test_models.py | 49 +++-- tests/test_routes.py | 35 ++-- 26 files changed, 476 insertions(+), 363 deletions(-) create mode 100644 alembic/README create mode 100644 alembic/env.py create mode 100644 alembic/script.py.mako delete mode 100644 app/__pycache__/__init__.cpython-310.pyc delete mode 100644 app/__pycache__/models.cpython-310.pyc delete mode 100644 migrations/__pycache__/env.cpython-310.pyc create mode 100644 migrations/alembic.ini rename migrations/versions/{1f23b4f802b0_initial_migration_with_users_and_.py => 02a7c13515a4_initial.py} (61%) delete mode 100644 migrations/versions/__pycache__/1f23b4f802b0_initial_migration_with_users_and_.cpython-310.pyc delete mode 100644 test_delete_functionality.py delete mode 100644 test_edit_functionality.py delete mode 100644 tests/__pycache__/conftest.cpython-310-pytest-7.4.0.pyc delete mode 100644 tests/__pycache__/test_models.cpython-310-pytest-7.4.0.pyc delete mode 100644 tests/__pycache__/test_routes.cpython-310-pytest-7.4.0.pyc diff --git a/QWEN.md b/QWEN.md index 1e0a6c7..10c92a0 100644 --- a/QWEN.md +++ b/QWEN.md @@ -1,3 +1,4 @@ +# Instructions Here are special rules you must follow: 1. All forms should use regular form url encoding. 2. All routes should return html. @@ -8,4 +9,11 @@ Here are special rules you must follow: 7. Always print unhandled exceptions to the console. 8. Follow best practices for jinja template partials. That is, separate out components where appropriate. 9. Ask the user when there is something unclear. -10. I always run the server locally on port 5000, so you can use curl to test. No need to start it yourself. \ No newline at end of file +10. I always run the server locally on port 5000, so you can use curl to test. No need to start it yourself. + +# Conventions +1. modals are rendered server-side, by targeting #modal-holder, and using an hx-trigger response attribute for open-modal. +2. modals are closed by adding the close-modal hx-trigger response attribute. +3. modals can be closed by triggering a close-modal event anywhere in the dom. +4. validation is done server-side. On modals, an error should cause the button to shake, and the invalid fields to be highlighted in red using normal daisyui paradigms. When relevant, there should be a notification banner inside the dialog-box to show the details of the error. +5. When validation is done outside of a modal, it should cause a notification banner with the details. diff --git a/alembic/README b/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/alembic/env.py b/alembic/env.py new file mode 100644 index 0000000..36112a3 --- /dev/null +++ b/alembic/env.py @@ -0,0 +1,78 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +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. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = None + +# 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 run_migrations_offline() -> None: + """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=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/alembic/script.py.mako b/alembic/script.py.mako new file mode 100644 index 0000000..1101630 --- /dev/null +++ b/alembic/script.py.mako @@ -0,0 +1,28 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + """Upgrade schema.""" + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + """Downgrade schema.""" + ${downgrades if downgrades else "pass"} diff --git a/app/__init__.py b/app/__init__.py index a4e226a..acdbbbe 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,14 +1,17 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy from config import config +from app.models import db, Base +from flask_migrate import Migrate + -db = SQLAlchemy() def create_app(config_name='default'): app = Flask(__name__) app.config.from_object(config[config_name]) db.init_app(app) + migrate = Migrate(app, db) from app.routes import main app.register_blueprint(main) diff --git a/app/__pycache__/__init__.cpython-310.pyc b/app/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 0bfec11de270003cc9facde25d39c57ab0a69f01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 571 zcmYjPy>8nu5ayBkv!bMKw?2Y~T5E=&Xb>P%5g^T`g^)$sR!WKvMF&VAPwC!QaK^q8 z*G_$fPCd#%kpu42cL(0xcL$l%)106!_CGh@fRNuIcxw!UFX+QLf*=AE(NF^fP8HRx zW)o*B(or1&k?e)kvB*R$k{?hfBE2K!>0~B939C=@`{pNbcja?OaO{Ybh@WNMmS_6 z4cQS;3cInPIS!3<)Ai-dQVe~@dEaQsxecTI$;ukd&GKHh&Qr1US=V=tH`}ex5f;|$ zoE&Tt-hQxh-3?A!zEnH8wO#K@=1-0*OTXeEvw$RPE~Hr{FbSYSK-jd w-R2YL!-Hy$7q{W0)1r13Sg4(Jy@5IAe0HIY*eUrroNNexN1gh5XW!tJN7woK1C5CQMyRnq(mqJWC$OoNJ4SVY2#Vjo9x{=dv|~%Iw)u& zULh&-9K6N0RCxs&m^oV{2nyD^|IN;Zta8EqpgAL9F16u?qA-ES#yiohy%LaH? z=%>o)Z3_3&!$@?+;?~?=M0*KB>|_Cp7eX7aLM;xjnF)B2RF#Bl+cYOyrd&^xQ!zCG zh#{|3dGiyy>2+-5SD8GkgbA}sDSoU(ztc8hl4Lv;Nn#pFlIBn;vZEw9tGJp+T1isU z`Po+6n9ul6a#f|7Mh2E~sXn%Zx@&AS{ex1=Y-Bu5eyL>X~ zV&6g)JCms<{Dh&1P(sUP_t*xD>^7?-e-ZQX)E*uGg7V+Q<|L8LjNET-NZGxNAViwv zv;X8bXW2%U%gA>Hi2o`O`No9}O+3E_5i)KWzn3dO%E7RH7l)cU)gj7xSd-t8(CaYW zB6pL7Zcd}A`1usy!7(44YBB70*7YLAmq^+q%OnI*uaFQyy-Ko1vW{XJy<7`9%3jhO zQN2Wh-k^v}LtxxP@u4&enx>^BGuY2cF~W{R9Kl@6a%v(i6fb3-6=ONk59%*ds#~}- z>poT8LZQ19)ZvWVCR<|>em3no+6j$=tY_1=Rh%iV24j&`B!xlKAcVdBStOIA53ILEMzP8M)(V9p&DKQ diff --git a/app/models.py b/app/models.py index 242a927..c6aa79e 100644 --- a/app/models.py +++ b/app/models.py @@ -1,19 +1,24 @@ -from app import db from sqlalchemy.dialects.postgresql import UUID +from sqlalchemy.orm import declarative_base +from flask_sqlalchemy import SQLAlchemy + import uuid -class User(db.Model): +Base = declarative_base() +db = SQLAlchemy(model_class=Base) + +class User(Base): __tablename__ = 'users' - id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) email = db.Column(db.String(255), unique=True, nullable=False) # Placeholders for Milestone 1 password_hash = db.Column(db.LargeBinary) imap_config = db.Column(db.JSON) # Using db.JSON instead of db.JSONB for compatibility -class Folder(db.Model): +class Folder(Base): __tablename__ = 'folders' - id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) - user_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), nullable=False) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False) name = db.Column(db.String(255), nullable=False) rule_text = db.Column(db.Text) priority = db.Column(db.Integer) diff --git a/app/routes.py b/app/routes.py index ce1aa79..b2dbdae 100644 --- a/app/routes.py +++ b/app/routes.py @@ -7,14 +7,7 @@ import logging main = Blueprint('main', __name__) # For prototype, use a fixed user ID -MOCK_USER_ID = '123e4567-e89b-12d3-a456-426614174000' - -@main.route('/api/folders/new', methods=['GET']) -def new_folder_modal(): - # Return the add folder modal - response = make_response(render_template('partials/folder_modal.html')) - response.headers['HX-Trigger'] = 'open-modal' - return response +MOCK_USER_ID = 1 @main.route('/') def index(): @@ -28,6 +21,13 @@ def index(): folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() return render_template('index.html', folders=folders) +@main.route('/api/folders/new', methods=['GET']) +def new_folder_modal(): + # Return the add folder modal + response = make_response(render_template('partials/folder_modal.html')) + response.headers['HX-Trigger'] = 'open-modal' + return response + @main.route('/api/folders', methods=['POST']) def add_folder(): try: @@ -36,18 +36,35 @@ def add_folder(): rule_text = request.form.get('rule_text') priority = request.form.get('priority') - if not name: - # Return the folders list unchanged with an error message - folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() - # We'll add error handling in the template - return render_template('partials/folders_list.html', folders=folders) + # Server-side validation + errors = {} + if not name or not name.strip(): + errors['name'] = 'Folder name is required' + elif len(name.strip()) < 3: + errors['name'] = 'Folder name must be at least 3 characters' + elif len(name.strip()) > 50: + errors['name'] = 'Folder name must be less than 50 characters' + + if not rule_text or not rule_text.strip(): + errors['rule_text'] = 'Rule text is required' + elif len(rule_text.strip()) < 10: + errors['rule_text'] = 'Rule text must be at least 10 characters' + elif len(rule_text.strip()) > 200: + errors['rule_text'] = 'Rule text must be less than 200 characters' + + # If there are validation errors, return the modal with errors + if errors: + response = make_response(render_template('partials/folder_modal.html', errors=errors, name=name, rule_text=rule_text, priority=priority)) + response.headers['HX-Retarget'] = '#folder-modal' + response.headers['HX-Reswap'] = 'outerHTML' + return response # Create new folder folder = Folder( user_id=MOCK_USER_ID, - name=name, - rule_text=rule_text, - priority=int(priority) if priority else None + name=name.strip(), + rule_text=rule_text.strip(), + priority=int(priority) if priority else 0 ) db.session.add(folder) @@ -57,18 +74,21 @@ def add_folder(): folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() # Return the updated folders list HTML - response = make_response(render_template('partials/folders_list.html', folders=folders)) response.headers['HX-Trigger'] = 'close-modal' + response.status_code = 201 return response except Exception as e: # Print unhandled exceptions to the console as required logging.exception("Error adding folder: %s", e) db.session.rollback() - # Return the folders list unchanged - folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() - return render_template('partials/folders_list.html', folders=folders) + # Return error in modal + errors = {'general': 'An unexpected error occurred. Please try again.'} + response = make_response(render_template('partials/folder_modal.html', errors=errors, name=name, rule_text=rule_text, priority=priority)) + response.headers['HX-Retarget'] = '#folder-modal' + response.headers['HX-Reswap'] = 'outerHTML' + return response @main.route('/api/folders/', methods=['DELETE']) def delete_folder(folder_id): @@ -99,72 +119,6 @@ def delete_folder(folder_id): folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() return render_template('partials/folders_list.html', folders=folders) -@main.route('/api/folders/', methods=['PUT']) -def update_folder(folder_id): - try: - # Find the folder by ID - folder = Folder.query.filter_by(id=folder_id, user_id=MOCK_USER_ID).first() - - if not folder: - # Folder not found - folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() - return render_template('partials/folders_list.html', folders=folders) - - # Get form data - name = request.form.get('name') - rule_text = request.form.get('rule_text') - priority = request.form.get('priority') - - if not name: - # Return the folders list unchanged with an error message - folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() - return render_template('partials/folders_list.html', folders=folders) - - # Update folder - folder.name = name - folder.rule_text = rule_text - folder.priority = int(priority) if priority else None - - db.session.commit() - - # Get updated list of folders - folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() - - response = make_response(render_template('partials/folders_list.html', folders=folders)) - response.headers['HX-Trigger'] = 'close-modal' - return response - - except Exception as e: - # Print unhandled exceptions to the console as required - logging.exception("Error updating folder: %s", e) - db.session.rollback() - # Return the folders list unchanged - folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() - return render_template('partials/folders_list.html', folders=folders) - -@main.route('/api/folders/', methods=['GET']) -def get_folder(folder_id): - try: - # Find the folder by ID - folder = Folder.query.filter_by(id=folder_id, user_id=MOCK_USER_ID).first() - - if not folder: - return jsonify({'error': 'Folder not found'}), 404 - - # Return folder data as JSON - return jsonify({ - 'id': folder.id, - 'name': folder.name, - 'rule_text': folder.rule_text, - 'priority': folder.priority - }) - - except Exception as e: - # Print unhandled exceptions to the console as required - logging.exception("Error getting folder: %s", e) - return jsonify({'error': 'Error retrieving folder'}), 500 - - @main.route('/api/folders//edit', methods=['GET']) def edit_folder_modal(folder_id): try: @@ -183,3 +137,68 @@ def edit_folder_modal(folder_id): # Print unhandled exceptions to the console as required logging.exception("Error getting folder for edit: %s", e) return jsonify({'error': 'Error retrieving folder'}), 500 + +@main.route('/api/folders/', methods=['PUT']) +def update_folder(folder_id): + try: + # Find the folder by ID + folder = Folder.query.filter_by(id=folder_id, user_id=MOCK_USER_ID).first() + + if not folder: + # Folder not found + folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() + return render_template('partials/folders_list.html', folders=folders) + + # Get form data + name = request.form.get('name') + rule_text = request.form.get('rule_text') + priority = request.form.get('priority') + + # Server-side validation + errors = {} + if not name or not name.strip(): + errors['name'] = 'Folder name is required' + elif len(name.strip()) < 3: + errors['name'] = 'Folder name must be at least 3 characters' + elif len(name.strip()) > 50: + errors['name'] = 'Folder name must be less than 50 characters' + + if not rule_text or not rule_text.strip(): + errors['rule_text'] = 'Rule text is required' + elif len(rule_text.strip()) < 10: + errors['rule_text'] = 'Rule text must be at least 10 characters' + elif len(rule_text.strip()) > 200: + errors['rule_text'] = 'Rule text must be less than 200 characters' + + # If there are validation errors, return the modal with errors + if errors: + response = make_response(render_template('partials/folder_modal.html', folder=folder, errors=errors, name=name, rule_text=rule_text, priority=priority)) + response.headers['HX-Retarget'] = '#folder-modal' + response.headers['HX-Reswap'] = 'outerHTML' + return response + + # Update folder + folder.name = name.strip() + folder.rule_text = rule_text.strip() + folder.priority = int(priority) if priority else 0 + + db.session.commit() + + # Get updated list of folders + folders = Folder.query.filter_by(user_id=MOCK_USER_ID).all() + + response = make_response(render_template('partials/folders_list.html', folders=folders)) + response.headers['HX-Trigger'] = 'close-modal' + return response + + except Exception as e: + # Print unhandled exceptions to the console as required + logging.exception("Error updating folder: %s", e) + db.session.rollback() + # Return error in modal + errors = {'general': 'An unexpected error occurred. Please try again.'} + response = make_response(render_template('partials/folder_modal.html', folder=folder, errors=errors, name=name, rule_text=rule_text, priority=priority)) + response.headers['HX-Retarget'] = '#folder-modal' + response.headers['HX-Reswap'] = 'outerHTML' + return response + diff --git a/app/templates/index.html b/app/templates/index.html index d8368e8..a89220e 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -10,11 +10,21 @@ + + x-data="{}" + x-on:open-modal.window="$refs.modal.showModal()" + x-on:close-modal.window="$refs.modal.close()">
diff --git a/app/templates/partials/folder_modal.html b/app/templates/partials/folder_modal.html index 1302d3e..4a5c468 100644 --- a/app/templates/partials/folder_modal.html +++ b/app/templates/partials/folder_modal.html @@ -1,39 +1,53 @@ - \ No newline at end of file diff --git a/migrations/README b/migrations/README index 98e4f9c..0e04844 100644 --- a/migrations/README +++ b/migrations/README @@ -1 +1 @@ -Generic single-database configuration. \ No newline at end of file +Single-database configuration for Flask. diff --git a/migrations/__pycache__/env.cpython-310.pyc b/migrations/__pycache__/env.cpython-310.pyc deleted file mode 100644 index 2fa9af4506e844b4aab0d16f4ae1489ad1114e7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1973 zcmZ`(&2Aev5MHiUD`_psa_l5_5~M_s!d1}9$fc*CXp=TYfWj!^Bt`eKpqI2nmCIF0 z%8t_nDBxat2=WM(kL@Gz+EZVlP2di>l7ITMi=7?L42R^$Z>H>Yk^r7NKfD?J(hP#% z-QfHKw%}9v^ji=#phyG-N)d8;D8iza*1TQ=JxU|5N1|TDX^a9Ej~i)&HO5U^pCa`> zLry=cX4ge4Z9$g0NYaG0#!Is{4OjyI&Rlkn5xk+#8H?qjm-dR4bj6Pw;!?4it`=+Q z8m!Yh3esh^JiB}xyjgggq-~9s+2>Qq-dt9&wrQG8~7+qp=$R*46R9R&C!WvD= zQh>Js7Q>#K?S5#JTrpx;MkW&*(p|7bPc>6Eepm|X{)(BYlDS)E@gPv#6+D1XKLcTc z8KMBotH6Zg+RMO1G^8~eaYXB{0e%zC>HtE=Yw03dE(00M0N26+fe zJ)TNj@S!4xmr`Rc@n*TVC*XLSxF{(bBngJ+$%t!Q9d)Xh#%9Fa(47+>a5KW=sWzD4 zr;oq#@kCNAORz}%g$L_Hm{LxMqcaPJj3m$5#E@OV{HzgE3=@qHm=FVu?;m3Q9iL3N z9Qp;TOxR-zyY*8J7^bD%G??u(i6vtccJcZB&%SwYS;&T?3ZT+H-5DtcNw)&e)-bb{E9kPd}44pHIu2CCwnla&*rxBCqn zSGe0{KZ|hbJaB$h2Xfff>8+@)8?Wp#AZKP2k(%T#&UV#QW@ne&N2&vnzXs|G{QkVV zH7X0X1-HfN7G?WetN_G5D%Frk{(`Bkvzc2=?hhu1_R7VC*_<)AA)Q_Wk+dTe`Zq@L z+oX}8TPJEA92bZlx=8pu(SHNQ5gmy9r6cmV_9}Q8%pw?XzCxxxj$b0vpy)O922-Ck z!QS>-YfkuZL3m&Ho9F2c<#6WhK{0&%e_k5yxZ*jDc4LU&J|FLF{o0G4|EqH3zY6D( z1mXbGbt`95stW*sQDst8a)JL()^J?oW&eW@BWv)+WuH0-*A8H$x+C~#%MmFXW8n3Yp z%9Zywvnn`K*IeS*2@g;LkPTex6I!`GtXfW72Vt9wnysL6jP}Q{%UmytAahgC;p7qX wU^VZ7Ybw|$uEXm)AlgAYY@>DK?FYKW>gb|>Xw37AaS^^mU4c)H?Pyhe` 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 index a1dd73e..4c97092 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -1,7 +1,7 @@ +import logging from logging.config import fileConfig -from sqlalchemy import engine_from_config -from sqlalchemy import pool +from flask import current_app from alembic import context @@ -11,21 +11,33 @@ config = context.config # Interpret the config file for Python logging. # This line sets up loggers basically. -if config.config_file_name is not None: - fileConfig(config.config_file_name) +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 -import sys -import os -sys.path.insert(0, os.path.dirname(os.path.dirname(__file__))) - -from app import create_app, db -from app.models import User, Folder - -app = create_app() -with app.app_context(): - target_metadata = db.metadata +# 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: @@ -33,7 +45,13 @@ with app.app_context(): # ... etc. -def run_migrations_offline() -> None: +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 @@ -47,34 +65,46 @@ def run_migrations_offline() -> None: """ url = config.get_main_option("sqlalchemy.url") context.configure( - url=url, - target_metadata=target_metadata, - literal_binds=True, - dialect_opts={"paramstyle": "named"}, + url=url, target_metadata=get_metadata(), literal_binds=True ) with context.begin_transaction(): context.run_migrations() -def run_migrations_online() -> None: +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. """ - # Use the Flask app's database configuration - with app.app_context(): - connectable = db.engine - with connectable.connect() as connection: - context.configure( - connection=connection, target_metadata=target_metadata - ) + # 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.') - with context.begin_transaction(): - context.run_migrations() + 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(): diff --git a/migrations/script.py.mako b/migrations/script.py.mako index 1101630..2c01563 100644 --- a/migrations/script.py.mako +++ b/migrations/script.py.mako @@ -5,24 +5,20 @@ Revises: ${down_revision | comma,n} Create Date: ${create_date} """ -from typing import Sequence, Union - from alembic import op import sqlalchemy as sa ${imports if imports else ""} # revision identifiers, used by Alembic. -revision: str = ${repr(up_revision)} -down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)} -branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} -depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} -def upgrade() -> None: - """Upgrade schema.""" +def upgrade(): ${upgrades if upgrades else "pass"} -def downgrade() -> None: - """Downgrade schema.""" +def downgrade(): ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/1f23b4f802b0_initial_migration_with_users_and_.py b/migrations/versions/02a7c13515a4_initial.py similarity index 61% rename from migrations/versions/1f23b4f802b0_initial_migration_with_users_and_.py rename to migrations/versions/02a7c13515a4_initial.py index 403fc37..450a3a8 100644 --- a/migrations/versions/1f23b4f802b0_initial_migration_with_users_and_.py +++ b/migrations/versions/02a7c13515a4_initial.py @@ -1,28 +1,25 @@ -"""Initial migration with users and folders tables +"""initial -Revision ID: 1f23b4f802b0 +Revision ID: 02a7c13515a4 Revises: -Create Date: 2025-08-03 08:30:06.300965 +Create Date: 2025-08-03 21:33:28.507003 """ -from typing import Sequence, Union - from alembic import op import sqlalchemy as sa # revision identifiers, used by Alembic. -revision: str = '1f23b4f802b0' -down_revision: Union[str, Sequence[str], None] = None -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +revision = '02a7c13515a4' +down_revision = None +branch_labels = None +depends_on = None -def upgrade() -> None: - """Upgrade schema.""" +def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.create_table('users', - sa.Column('id', sa.UUID(), nullable=False), + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('email', sa.String(length=255), nullable=False), sa.Column('password_hash', sa.LargeBinary(), nullable=True), sa.Column('imap_config', sa.JSON(), nullable=True), @@ -30,8 +27,8 @@ def upgrade() -> None: sa.UniqueConstraint('email') ) op.create_table('folders', - sa.Column('id', sa.UUID(), nullable=False), - sa.Column('user_id', sa.UUID(), nullable=False), + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('user_id', sa.Integer(), nullable=False), sa.Column('name', sa.String(length=255), nullable=False), sa.Column('rule_text', sa.Text(), nullable=True), sa.Column('priority', sa.Integer(), nullable=True), @@ -41,8 +38,7 @@ def upgrade() -> None: # ### end Alembic commands ### -def downgrade() -> None: - """Downgrade schema.""" +def downgrade(): # ### commands auto generated by Alembic - please adjust! ### op.drop_table('folders') op.drop_table('users') diff --git a/migrations/versions/__pycache__/1f23b4f802b0_initial_migration_with_users_and_.cpython-310.pyc b/migrations/versions/__pycache__/1f23b4f802b0_initial_migration_with_users_and_.cpython-310.pyc deleted file mode 100644 index d6c769671bda7dc64b6c69b2a6ca4c15497eec07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1497 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 diff --git a/tests/conftest.py b/tests/conftest.py index 633b7e1..97350e2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,8 @@ import pytest import sys import os +import flask +from flask_sqlalchemy import SQLAlchemy # Add the project root directory to the Python path sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))) @@ -9,45 +11,47 @@ from app import create_app, db from app.models import User, Folder import uuid -@pytest.fixture +@pytest.fixture(scope="function") def app(): - """Create application for testing.""" + """Create a fresh app with in-memory database for each test.""" app = create_app('testing') - app.config['TESTING'] = True - app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///:memory:' # In-memory database for tests - + app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:" + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False # Recommended for Flask-SQLAlchemy + with app.app_context(): - db.create_all() - yield app - db.drop_all() + db.create_all() # Create tables for your models + db.session.begin() + yield app # Yield the app for tests to use + db.session.close() + db.drop_all() # Clean up after tests + @pytest.fixture def client(app): """A test client for the app.""" return app.test_client() -@pytest.fixture +@pytest.fixture(scope="function") def mock_user(app): """Create a mock user for testing.""" - with app.app_context(): - user = User( - id=uuid.UUID('123e4567-e89b-12d3-a456-426614174000'), - email='test@example.com' - ) - db.session.add(user) - db.session.commit() - return user + user = User( + email='test@example.com' + ) + + db.session.add(user) + db.session.commit() + return user -@pytest.fixture +@pytest.fixture(scope="function") def mock_folder(app, mock_user): """Create a mock folder for testing.""" - with app.app_context(): - folder = Folder( - user_id=mock_user.id, - name='Test Folder', - rule_text='Test rule', - priority=1 - ) - db.session.add(folder) - db.session.commit() - return folder \ No newline at end of file + folder = Folder( + user_id=mock_user.id, + name='Test Folder', + rule_text='Test rule', + priority=1 + ) + db.session.add(folder) + db.session.commit() + return folder + diff --git a/tests/test_models.py b/tests/test_models.py index e81e206..ca3eb75 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -1,33 +1,32 @@ import pytest from app.models import User, Folder +from app import db import uuid +import conftest -def test_user_model(app, mock_user): +def test_user_model(app, mock_user): """Test User model creation and properties.""" - with app.app_context(): - # Test user was created by fixture - assert mock_user.id == uuid.UUID('123e4567-e89b-12d3-a456-426614174000') - assert mock_user.email == 'test@example.com' - - # Test querying user - user_from_db = User.query.filter_by(email='test@example.com').first() - assert user_from_db is not None - assert user_from_db.id == mock_user.id + # Test user was created by fixture + assert mock_user.email == 'test@example.com' + + # Test querying user + user_from_db = User.query.filter_by(email='test@example.com').first() + assert user_from_db is not None + assert user_from_db.id == mock_user.id def test_folder_model(app, mock_folder, mock_user): """Test Folder model creation and properties.""" - with app.app_context(): - # Test folder was created by fixture - assert mock_folder.user_id == mock_user.id - assert mock_folder.name == 'Test Folder' - assert mock_folder.rule_text == 'Test rule' - assert mock_folder.priority == 1 - - # Test relationship - assert len(mock_user.folders) == 1 - assert mock_user.folders[0].id == mock_folder.id - - # Test querying folder - folder_from_db = Folder.query.filter_by(name='Test Folder').first() - assert folder_from_db is not None - assert folder_from_db.user_id == mock_user.id \ No newline at end of file + # Test folder was created by fixture + assert mock_folder.user_id == mock_user.id + assert mock_folder.name == 'Test Folder' + assert mock_folder.rule_text == 'Test rule' + assert mock_folder.priority == 1 + + # Test relationship + assert len(mock_user.folders) == 1 + assert mock_user.folders[0].id == mock_folder.id + + # Test querying folder + folder_from_db = Folder.query.filter_by(name='Test Folder').first() + assert folder_from_db is not None + assert folder_from_db.user_id == mock_user.id \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py index f320429..0ea9174 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,31 +1,28 @@ import pytest -from app.models import User +from app.models import User, Folder import uuid -def test_index_route(client, app): - """Test that the index route loads successfully.""" - with app.app_context(): - # Create a mock user for the test - mock_user = User( - id=uuid.UUID('123e4567-e89b-12d3-a456-426614174000'), - email='test@example.com' - ) - from app import db - db.session.add(mock_user) - db.session.commit() - +def test_index_route(client, app, mock_user): response = client.get('/') assert response.status_code == 200 # Check if the page contains expected elements assert b'Email Organizer' in response.data assert b'Folders' in response.data -def test_add_folder_route(client): +def test_add_folder_route(client, mock_user): """Test the add folder API endpoint.""" - response = client.post('/api/folders', - json={'name': 'Test Folder', 'rule_text': 'Test rule'}, - content_type='application/json') + # Get initial count of folders for the user + initial_folder_count = Folder.query.count() + # Send form data (URL encoded) instead of JSON + response = client.post('/api/folders', + data={'name': 'Test Folder', 'rule_text': 'Test rule something ok yes'}, + content_type='application/x-www-form-urlencoded') + + print(response.__dict__) + # Verify the response status is 201 Created assert response.status_code == 201 - assert b'Folder added (mock)' in response.data - assert b'Test Folder' in response.data \ No newline at end of file + + # Verify that the number of folders has increased + final_folder_count = Folder.query.count() + assert final_folder_count > initial_folder_count \ No newline at end of file