From 5a39a53813bef93f1e2b54cf5a20f7cadde32ce7 Mon Sep 17 00:00:00 2001 From: Sno Date: Mon, 19 May 2025 20:20:38 -0700 Subject: [PATCH 01/12] task list --- app/__init__.py | 11 +- app/models/goal.py | 24 +++- app/models/task.py | 38 ++++- app/routes/__init__.py | 0 app/routes/goal_routes.py | 115 ++++++++++++++- app/routes/route_utilities.py | 17 +++ app/routes/task_routes.py | 134 +++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 50 +++++++ migrations/env.py | 113 +++++++++++++++ migrations/script.py.mako | 24 ++++ .../versions/04f16c3c7d4d_merge_heads.py | 24 ++++ .../3ab85e47a864_merge_multiple_heads.py | 24 ++++ migrations/versions/3f2b89969c67_.py | 40 ++++++ ...pdated_assign_tasks_to_goal_to_pass_in_.py | 24 ++++ ...f198a8fe64e_goal_task_relationship_made.py | 34 +++++ migrations/versions/a2d92501f1f7_.py | 40 ++++++ .../bff9717c96b7_goal_model_update.py | 32 +++++ requirements.txt | 4 + test.sh | 2 +- tests/test_wave_01.py | 43 +++--- tests/test_wave_02.py | 4 +- tests/test_wave_03.py | 24 ++-- tests/test_wave_05.py | 69 ++++----- tests/test_wave_06.py | 19 +-- 25 files changed, 805 insertions(+), 105 deletions(-) create mode 100644 app/routes/__init__.py create mode 100644 app/routes/route_utilities.py 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/04f16c3c7d4d_merge_heads.py create mode 100644 migrations/versions/3ab85e47a864_merge_multiple_heads.py create mode 100644 migrations/versions/3f2b89969c67_.py create mode 100644 migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py create mode 100644 migrations/versions/9f198a8fe64e_goal_task_relationship_made.py create mode 100644 migrations/versions/a2d92501f1f7_.py create mode 100644 migrations/versions/bff9717c96b7_goal_model_update.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..5ca766591 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,13 @@ from flask import Flask from .db import db, migrate -from .models import task, goal +from .models.task import Task +from .models.goal import Goal +from .routes.task_routes import bp as tasks_bp +from .routes.goal_routes import bp as goals_bp +# from .routes.goal_routes import bp as goals_bp import os +from dotenv import load_dotenv +load_dotenv() def create_app(config=None): app = Flask(__name__) @@ -18,5 +24,6 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here - + app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..7c8f07a20 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,27 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] = mapped_column(db.String, nullable=False) + + tasks: Mapped[list["Task"]] = relationship(back_populates="goal", lazy=True) + + def to_dict(self): + goal_as_dict = {} + goal_as_dict["id"] = self.id + goal_as_dict["title"] = self.title + + return goal_as_dict + + + @classmethod + def from_dict(cls, goal_data): + if "title" not in goal_data: + raise KeyError("title") + new_goal = cls(title=goal_data["title"]) + + return new_goal \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..19e012b5c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,41 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from .goal import Goal +from datetime import datetime +from typing import Optional class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] = mapped_column(db.String, nullable=False) + description: Mapped[str] = mapped_column(db.String, nullable=False) + completed_at: Mapped[datetime] = mapped_column(default=None, nullable=True) + is_complete: Mapped[bool] = mapped_column(default=False, nullable=False) + + goal_id: Mapped[Optional[int]] = mapped_column(db.Integer, db.ForeignKey("goal.id"), nullable=True) + goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") + + def to_dict(self): + task_as_dict = {} + task_as_dict["id"] = self.id + task_as_dict["title"] = self.title + task_as_dict["description"] = self.description + # task_as_dict["completed_at"] = self.completed_at.isoformat() if self.completed_at else None + task_as_dict["is_complete"] = self.is_complete + + # if self.goal_id is not None: + if self.goal_id: + task_as_dict["goal_id"] = self.goal_id + + return task_as_dict + + @classmethod + def from_dict(cls, task_data): + if "title" not in task_data or "description" not in task_data: + raise KeyError("title or description") + new_task = cls(title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at", None), + is_complete=task_data.get("is_complete", False), + ) + + return new_task \ No newline at end of file diff --git a/app/routes/__init__.py b/app/routes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..3164c4916 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,114 @@ -from flask import Blueprint \ No newline at end of file +from flask import abort, Blueprint, make_response, request, Response +from app.models.task import Task +from app.models.goal import Goal +from ..db import db +from sqlalchemy import cast, String, Integer +from .route_utilities import validate_model +from datetime import datetime +import os +import requests + +bp = Blueprint("goals_bp", __name__, url_prefix = "/goals") + + +@bp.post("") +def create_goal(): + request_body = request.get_json() + + try: + new_goal = Goal.from_dict(request_body) + + except KeyError as error: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + db.session.add(new_goal) + db.session.commit() + + return {"goal": new_goal.to_dict()}, 201 + +@bp.get("/") +def get_one_goal_by_id(goal_id): + goal = validate_model(Goal, goal_id) + + # response = [goal.to_dict() for goal in goal.goals] + return {"goal": goal.to_dict()}, 200 + +@bp.get("") +def get_all_goals(): + query = db.select(Goal) + goals = db.session.execute(query).scalars().all() + + sort_order_param = request.args.get("sort", "asc") + if sort_order_param == "desc": + query = query.order_by(Goal.title.desc()) + else: + query = query.order_by(Goal.title.asc()) + + title_param = request.args.get("title") + if title_param: + query = query.where(Goal.title.ilike(f"%{title_param}%")) + + query = query.order_by(Goal.id) + goals = db.session.scalars(query) + + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict()) + return goals_response, 200 + + +@bp.put("/") +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + + goal.title = request_body["title"] + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@bp.delete("/") +def delete_goal(goal_id): + goal = validate_model(Goal, goal_id) + db.session.delete(goal) + db.session.commit() + + return Response(status=204, mimetype="application/json") + + +@bp.post("//tasks") +def assign_tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + task_ids = request_body.get("task_ids", []) + + for task in goal.tasks: + task.goal_id = None + + for task_id in task_ids: + task = validate_model(Task, task_id) + task.goal_id = goal.id + + db.session.commit() + + return { + "id": goal.id, + "task_ids": task_ids + }, 200 + +@bp.get("//tasks") +def get_tasks_for_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + + tasks_response = [] + for task in goal.tasks: + task_dict = task.to_dict() + task_dict["goal_id"] = goal.id + tasks_response.append(task_dict) + + return { + "id": goal.id, + "title": goal.title, + "tasks": tasks_response + }, 200 \ No newline at end of file diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..e93bb96b4 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,17 @@ +from flask import abort, make_response +from ..db import db + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + response = {"message": f"{cls.__name__} {model_id} invalid"} + abort(make_response(response , 400)) + + query = db.select(cls).where(cls.id == model_id) + model = db.session.scalar(query) + + if not model: + response = {"message": f"{cls.__name__} {model_id} not found"} + abort(make_response(response, 404)) + return model \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..2abb92b83 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,133 @@ -from flask import Blueprint \ No newline at end of file +from flask import abort, Blueprint, make_response, request, Response +from app.models.task import Task +from app.models.goal import Goal +from ..db import db +from sqlalchemy import cast, String, Integer +from .route_utilities import validate_model +from datetime import datetime +import os +import requests + +bp = Blueprint("tasks_bp", __name__, url_prefix = "/tasks") + +@bp.post("") +def create_task(): + request_body = request.get_json() + try: + new_task = Task.from_dict(request_body) + + except KeyError as error: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + db.session.add(new_task) + db.session.commit() + + return {"task": new_task.to_dict()}, 201 + +@bp.get("") +def get_all_tasks(): + query = db.select(Task) + tasks = db.session.execute(query).scalars().all() + + sort_order_param = request.args.get("sort", "asc") + if sort_order_param == "desc": + query = query.order_by(Task.title.desc()) + else: + query = query.order_by(Task.title.asc()) + + title_param = request.args.get("title") + if title_param: + query = query.where(Task.title.ilike(f"%{title_param}%")) + + description_param = request.args.get("description") + if description_param: + query = query.where(Task.description.ilike(f"%{description_param}%")) + + completed_at_param =request.args.get("completed_at") + if completed_at_param: + query = query.where(Task.completed_at.ilike(f"%{completed_at_param}%")) + + is_complete_param = request.args.get("is_complete") + if is_complete_param: + # is_complete_bool = is_complete_param.lower() == "true" + # query = query.where(Task.is_complete == is_complete_bool) + + if is_complete_param.lower() == "true": + query = query.where(Task.task_completed == True) + elif is_complete_param.lower() == "false": + query = query.where(Task.task_completed == False) + + query = query.order_by(Task.id) + tasks = db.session.scalars(query) + + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_dict()) + return tasks_response, 200 + + +@bp.get("/") +def get_one_task(task_id): + task = validate_model(Task, task_id) + + return {"task": task.to_dict()}, 200 + +@bp.patch("//mark_complete") +def mark_task_as_complete(task_id): + task = validate_model(Task, task_id) + + # task.is_complete = True + task.completed_at = datetime.now() + + db.session.commit() + + slack_token = os.environ.get("SLACKBOT_API_TOKEN") + slack_channel = "sno-task-tracker-bot2" + slack_text = f"Someone just completed the task {task.title}! 🎉" + + if slack_token: + url = "https://slack.com/api/chat.postMessage" + headers = { + "Authorization": f"Bearer {slack_token}", + "Content-Type": "application/json" + } + message_request_body = { + "channel": slack_channel, + "text": slack_text + + } + requests.post(url, headers=headers, json=message_request_body) + + return Response(status=204, mimetype="application/json") + # return {"task": task.to_dict()}, 200 + +@bp.patch("//mark_incomplete") +def mark_task_as_incomplete(task_id): + task = validate_model(Task, task_id) + + # task.is_complete = False + task.completed_at = None + + db.session.commit() + return Response(status=204, mimetype="application/json") + # return {"task": task.to_dict()}, 200 + +@bp.put("/") +def update_task(task_id): + task = validate_model(Task, task_id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@bp.delete("/") +def delete_task(task_id): + task = validate_model(Task, task_id) + db.session.delete(task) + db.session.commit() + + return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /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 000000000..ec9d45c26 --- /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 000000000..4c9709271 --- /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 000000000..2c0156303 --- /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/04f16c3c7d4d_merge_heads.py b/migrations/versions/04f16c3c7d4d_merge_heads.py new file mode 100644 index 000000000..32606f3ae --- /dev/null +++ b/migrations/versions/04f16c3c7d4d_merge_heads.py @@ -0,0 +1,24 @@ +"""Merge heads + +Revision ID: 04f16c3c7d4d +Revises: +Create Date: 2025-05-19 08:51:45.210835 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '04f16c3c7d4d' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + pass + + +def downgrade(): + pass diff --git a/migrations/versions/3ab85e47a864_merge_multiple_heads.py b/migrations/versions/3ab85e47a864_merge_multiple_heads.py new file mode 100644 index 000000000..8bcc50787 --- /dev/null +++ b/migrations/versions/3ab85e47a864_merge_multiple_heads.py @@ -0,0 +1,24 @@ +"""Merge multiple heads + +Revision ID: 3ab85e47a864 +Revises: 92e6e80e60f3, 04f16c3c7d4d, 9f198a8fe64e +Create Date: 2025-05-19 08:54:02.597699 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3ab85e47a864' +down_revision = ('92e6e80e60f3', '04f16c3c7d4d', '9f198a8fe64e') +branch_labels = None +depends_on = None + + +def upgrade(): + pass + + +def downgrade(): + pass diff --git a/migrations/versions/3f2b89969c67_.py b/migrations/versions/3f2b89969c67_.py new file mode 100644 index 000000000..fe45e2548 --- /dev/null +++ b/migrations/versions/3f2b89969c67_.py @@ -0,0 +1,40 @@ +"""empty message + +Revision ID: 3f2b89969c67 +Revises: a2d92501f1f7 +Create Date: 2025-05-12 23:20:49.018561 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3f2b89969c67' +down_revision = 'a2d92501f1f7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + # Drop the old column + batch_op.drop_column('completed_at') + + # Add a new column as DateTime + batch_op.add_column(sa.Column('completed_at', sa.DateTime(), nullable=True)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + # Drop the DateTime column + batch_op.drop_column('completed_at') + + # Add it back as VARCHAR (string) + batch_op.add_column(sa.Column('completed_at', sa.VARCHAR(), nullable=True)) + + # ### end Alembic commands ### diff --git a/migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py b/migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py new file mode 100644 index 000000000..950e6d0c0 --- /dev/null +++ b/migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py @@ -0,0 +1,24 @@ +"""updated assign tasks to goal to pass in postman + +Revision ID: 92e6e80e60f3 +Revises: +Create Date: 2025-05-19 08:49:19.987995 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '92e6e80e60f3' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + pass + + +def downgrade(): + pass diff --git a/migrations/versions/9f198a8fe64e_goal_task_relationship_made.py b/migrations/versions/9f198a8fe64e_goal_task_relationship_made.py new file mode 100644 index 000000000..5574e7127 --- /dev/null +++ b/migrations/versions/9f198a8fe64e_goal_task_relationship_made.py @@ -0,0 +1,34 @@ +"""goal-task relationship made + +Revision ID: 9f198a8fe64e +Revises: bff9717c96b7 +Create Date: 2025-05-19 06:50:48.602865 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9f198a8fe64e' +down_revision = 'bff9717c96b7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True)) + batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id']) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_constraint(None, type_='foreignkey') + batch_op.drop_column('goal_id') + + # ### end Alembic commands ### diff --git a/migrations/versions/a2d92501f1f7_.py b/migrations/versions/a2d92501f1f7_.py new file mode 100644 index 000000000..41af42003 --- /dev/null +++ b/migrations/versions/a2d92501f1f7_.py @@ -0,0 +1,40 @@ +"""empty message + +Revision ID: a2d92501f1f7 +Revises: +Create Date: 2025-05-12 22:54:25.518201 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a2d92501f1f7' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.String(), nullable=True), + sa.Column('is_complete', sa.Boolean(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/migrations/versions/bff9717c96b7_goal_model_update.py b/migrations/versions/bff9717c96b7_goal_model_update.py new file mode 100644 index 000000000..d2835d011 --- /dev/null +++ b/migrations/versions/bff9717c96b7_goal_model_update.py @@ -0,0 +1,32 @@ +"""Goal Model update + +Revision ID: bff9717c96b7 +Revises: 3f2b89969c67 +Create Date: 2025-05-19 04:21:53.155837 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'bff9717c96b7' +down_revision = '3f2b89969c67' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/requirements.txt b/requirements.txt index b989cae17..9626f4812 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,13 @@ certifi==2025.1.31 charset-normalizer==3.4.1 click==8.1.8 coverage==7.6.12 +exceptiongroup==1.2.2 Flask==3.1.0 Flask-Migrate==4.1.0 Flask-SQLAlchemy==3.1.1 gunicorn==23.0.0 idna==3.10 +importlib_metadata==8.7.0 iniconfig==2.0.0 itsdangerous==2.2.0 Jinja2==3.1.5 @@ -23,6 +25,8 @@ python-dotenv==1.0.1 requests==2.32.3 SQLAlchemy==2.0.38 toml==0.10.2 +tomli==2.2.1 typing_extensions==4.12.2 urllib3==2.3.0 Werkzeug==3.1.3 +zipp==3.21.0 diff --git a/test.sh b/test.sh index a16a70ce1..69d7bfd43 100644 --- a/test.sh +++ b/test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +d#!/bin/bash # must match the name of the service for the database in # the docker-compose.yml file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 55475db79..bade7e514 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -14,7 +14,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -28,12 +28,12 @@ def test_get_tasks_one_saved_tasks(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, } ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -52,7 +52,7 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -60,14 +60,12 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found"} + # assert response_body["message"] == "Task 1 not found" - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -97,7 +95,7 @@ def test_create_task(client): assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -117,7 +115,7 @@ def test_update_task(client, one_task): -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -128,14 +126,10 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message": "Task 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -146,7 +140,7 @@ def test_delete_task(client, one_task): query = db.select(Task).where(Task.id == 1) assert db.session.scalar(query) == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -154,16 +148,11 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - + assert response_body == {"message": "Task 1 not found"} assert db.session.scalars(db.select(Task)).all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -180,7 +169,7 @@ def test_create_task_must_contain_title(client): assert db.session.scalars(db.select(Task)).all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_description(client): # Act response = client.post("/tasks", json={ diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..f14c4bb1a 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -6,7 +6,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -34,7 +34,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert db.session.scalar(query).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -46,7 +46,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert db.session.scalar(query).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -74,7 +74,7 @@ def test_mark_complete_on_completed_task(client, completed_task): query = db.select(Task).where(Task.id == 1) assert db.session.scalar(query).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -86,7 +86,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert db.session.scalar(query).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -94,14 +94,10 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -109,8 +105,4 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message": "Task 1 not found"} diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 222d10cf0..48865c7f1 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ import pytest +from app.routes.route_utilities import validate_model -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +47,19 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +78,31 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "My New Goal" + }) + # commenting out because updates + 204 does not have a response body + # response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 204 -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/999", json={"title": "Updated Title"}) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 999 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -121,28 +116,20 @@ def test_delete_goal(client, one_goal): response_body = response.get_json() assert "message" in response_body + assert response_body == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/999") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- - + assert response.status_code == 404 + assert response_body == {"message": "Goal 999 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 0317f835a..a935b9b96 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -25,7 +25,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(db.session.scalar(query).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -45,7 +45,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(db.session.scalar(query).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -53,14 +53,9 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -77,7 +72,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -102,7 +97,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From 0fdd99a8a28bc30eb8b6b7d33f017a7816bce49f Mon Sep 17 00:00:00 2001 From: Sno Date: Mon, 19 May 2025 20:44:59 -0700 Subject: [PATCH 02/12] spicy REconnect to Render PostgreSQL and finalize migrations --- .../versions/04f16c3c7d4d_merge_heads.py | 24 ----------- .../3ab85e47a864_merge_multiple_heads.py | 24 ----------- migrations/versions/3f2b89969c67_.py | 40 ------------------- ...pdated_assign_tasks_to_goal_to_pass_in_.py | 24 ----------- ...f198a8fe64e_goal_task_relationship_made.py | 34 ---------------- migrations/versions/a2d92501f1f7_.py | 40 ------------------- .../bff9717c96b7_goal_model_update.py | 32 --------------- 7 files changed, 218 deletions(-) delete mode 100644 migrations/versions/04f16c3c7d4d_merge_heads.py delete mode 100644 migrations/versions/3ab85e47a864_merge_multiple_heads.py delete mode 100644 migrations/versions/3f2b89969c67_.py delete mode 100644 migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py delete mode 100644 migrations/versions/9f198a8fe64e_goal_task_relationship_made.py delete mode 100644 migrations/versions/a2d92501f1f7_.py delete mode 100644 migrations/versions/bff9717c96b7_goal_model_update.py diff --git a/migrations/versions/04f16c3c7d4d_merge_heads.py b/migrations/versions/04f16c3c7d4d_merge_heads.py deleted file mode 100644 index 32606f3ae..000000000 --- a/migrations/versions/04f16c3c7d4d_merge_heads.py +++ /dev/null @@ -1,24 +0,0 @@ -"""Merge heads - -Revision ID: 04f16c3c7d4d -Revises: -Create Date: 2025-05-19 08:51:45.210835 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '04f16c3c7d4d' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - pass - - -def downgrade(): - pass diff --git a/migrations/versions/3ab85e47a864_merge_multiple_heads.py b/migrations/versions/3ab85e47a864_merge_multiple_heads.py deleted file mode 100644 index 8bcc50787..000000000 --- a/migrations/versions/3ab85e47a864_merge_multiple_heads.py +++ /dev/null @@ -1,24 +0,0 @@ -"""Merge multiple heads - -Revision ID: 3ab85e47a864 -Revises: 92e6e80e60f3, 04f16c3c7d4d, 9f198a8fe64e -Create Date: 2025-05-19 08:54:02.597699 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '3ab85e47a864' -down_revision = ('92e6e80e60f3', '04f16c3c7d4d', '9f198a8fe64e') -branch_labels = None -depends_on = None - - -def upgrade(): - pass - - -def downgrade(): - pass diff --git a/migrations/versions/3f2b89969c67_.py b/migrations/versions/3f2b89969c67_.py deleted file mode 100644 index fe45e2548..000000000 --- a/migrations/versions/3f2b89969c67_.py +++ /dev/null @@ -1,40 +0,0 @@ -"""empty message - -Revision ID: 3f2b89969c67 -Revises: a2d92501f1f7 -Create Date: 2025-05-12 23:20:49.018561 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '3f2b89969c67' -down_revision = 'a2d92501f1f7' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('task', schema=None) as batch_op: - # Drop the old column - batch_op.drop_column('completed_at') - - # Add a new column as DateTime - batch_op.add_column(sa.Column('completed_at', sa.DateTime(), nullable=True)) - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('task', schema=None) as batch_op: - # Drop the DateTime column - batch_op.drop_column('completed_at') - - # Add it back as VARCHAR (string) - batch_op.add_column(sa.Column('completed_at', sa.VARCHAR(), nullable=True)) - - # ### end Alembic commands ### diff --git a/migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py b/migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py deleted file mode 100644 index 950e6d0c0..000000000 --- a/migrations/versions/92e6e80e60f3_updated_assign_tasks_to_goal_to_pass_in_.py +++ /dev/null @@ -1,24 +0,0 @@ -"""updated assign tasks to goal to pass in postman - -Revision ID: 92e6e80e60f3 -Revises: -Create Date: 2025-05-19 08:49:19.987995 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '92e6e80e60f3' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - pass - - -def downgrade(): - pass diff --git a/migrations/versions/9f198a8fe64e_goal_task_relationship_made.py b/migrations/versions/9f198a8fe64e_goal_task_relationship_made.py deleted file mode 100644 index 5574e7127..000000000 --- a/migrations/versions/9f198a8fe64e_goal_task_relationship_made.py +++ /dev/null @@ -1,34 +0,0 @@ -"""goal-task relationship made - -Revision ID: 9f198a8fe64e -Revises: bff9717c96b7 -Create Date: 2025-05-19 06:50:48.602865 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '9f198a8fe64e' -down_revision = 'bff9717c96b7' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('task', schema=None) as batch_op: - batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True)) - batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id']) - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('task', schema=None) as batch_op: - batch_op.drop_constraint(None, type_='foreignkey') - batch_op.drop_column('goal_id') - - # ### end Alembic commands ### diff --git a/migrations/versions/a2d92501f1f7_.py b/migrations/versions/a2d92501f1f7_.py deleted file mode 100644 index 41af42003..000000000 --- a/migrations/versions/a2d92501f1f7_.py +++ /dev/null @@ -1,40 +0,0 @@ -"""empty message - -Revision ID: a2d92501f1f7 -Revises: -Create Date: 2025-05-12 22:54:25.518201 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'a2d92501f1f7' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('goal', - sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('task', - sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), - sa.Column('title', sa.String(), nullable=False), - sa.Column('description', sa.String(), nullable=False), - sa.Column('completed_at', sa.String(), nullable=True), - sa.Column('is_complete', sa.Boolean(), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('task') - op.drop_table('goal') - # ### end Alembic commands ### diff --git a/migrations/versions/bff9717c96b7_goal_model_update.py b/migrations/versions/bff9717c96b7_goal_model_update.py deleted file mode 100644 index d2835d011..000000000 --- a/migrations/versions/bff9717c96b7_goal_model_update.py +++ /dev/null @@ -1,32 +0,0 @@ -"""Goal Model update - -Revision ID: bff9717c96b7 -Revises: 3f2b89969c67 -Create Date: 2025-05-19 04:21:53.155837 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'bff9717c96b7' -down_revision = '3f2b89969c67' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('goal', schema=None) as batch_op: - batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('goal', schema=None) as batch_op: - batch_op.drop_column('title') - - # ### end Alembic commands ### From cf3733e9eb547146f225eeb92844cf04c8a7f8e9 Mon Sep 17 00:00:00 2001 From: Sno Date: Mon, 19 May 2025 21:51:15 -0700 Subject: [PATCH 03/12] Fixed task completion logic, Slackbot message, and timezone timestamps --- app/routes/task_routes.py | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 2abb92b83..991f639ef 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,10 +1,10 @@ -from flask import abort, Blueprint, make_response, request, Response +from flask import abort, Blueprint, jsonify, make_response, request, Response from app.models.task import Task from app.models.goal import Goal from ..db import db from sqlalchemy import cast, String, Integer from .route_utilities import validate_model -from datetime import datetime +from datetime import datetime, timezone import os import requests @@ -77,14 +77,13 @@ def get_one_task(task_id): def mark_task_as_complete(task_id): task = validate_model(Task, task_id) - # task.is_complete = True - task.completed_at = datetime.now() - + task.is_complete = True + task.completed_at = datetime.now(timezone.utc) db.session.commit() slack_token = os.environ.get("SLACKBOT_API_TOKEN") - slack_channel = "sno-task-tracker-bot2" - slack_text = f"Someone just completed the task {task.title}! 🎉" + slack_channel = os.getenv("SLACK_CHANNEL", "#sno-task-tracker-bot2") + slack_text = f"Someone just completed the task: *{task.title}* ! 🎉" if slack_token: url = "https://slack.com/api/chat.postMessage" @@ -92,15 +91,24 @@ def mark_task_as_complete(task_id): "Authorization": f"Bearer {slack_token}", "Content-Type": "application/json" } - message_request_body = { + slack_data = { "channel": slack_channel, "text": slack_text - } - requests.post(url, headers=headers, json=message_request_body) - - return Response(status=204, mimetype="application/json") - # return {"task": task.to_dict()}, 200 + slack_response = requests.post(url, headers=headers, json=slack_data) + + if not slack_response.ok: + print("Slack error:", slack_response.text) + + response_body = { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete, + "completed_at": task.completed_at.isoformat() + } + + return make_response(response_body, 200) @bp.patch("//mark_incomplete") def mark_task_as_incomplete(task_id): From eee5613d4969caed49a0df559c0845ef87501f76 Mon Sep 17 00:00:00 2001 From: Sno <114030799+ra-choa@users.noreply.github.com> Date: Wed, 11 Jun 2025 19:25:09 -0700 Subject: [PATCH 04/12] Remove duplicate bp import Co-authored-by: Mikelle <119449245+mikellewade@users.noreply.github.com> --- app/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 5ca766591..99c96c1cf 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,7 +4,6 @@ from .models.goal import Goal from .routes.task_routes import bp as tasks_bp from .routes.goal_routes import bp as goals_bp -# from .routes.goal_routes import bp as goals_bp import os from dotenv import load_dotenv load_dotenv() From 19af0d453729e26c9289365e4d77432223e05d99 Mon Sep 17 00:00:00 2001 From: Sno <114030799+ra-choa@users.noreply.github.com> Date: Wed, 11 Jun 2025 19:34:45 -0700 Subject: [PATCH 05/12] Remove unecessary KeyError Co-authored-by: Mikelle <119449245+mikellewade@users.noreply.github.com> --- app/models/goal.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 7c8f07a20..fb968f513 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -20,8 +20,6 @@ def to_dict(self): @classmethod def from_dict(cls, goal_data): - if "title" not in goal_data: - raise KeyError("title") new_goal = cls(title=goal_data["title"]) return new_goal \ No newline at end of file From 83a884d9c5a5dfaf4d3292ca7517d526bd383b51 Mon Sep 17 00:00:00 2001 From: Sno <114030799+ra-choa@users.noreply.github.com> Date: Wed, 11 Jun 2025 19:40:09 -0700 Subject: [PATCH 06/12] Removing unecesaary/ verbose SQL Alchemy mapped_column() Co-authored-by: Mikelle <119449245+mikellewade@users.noreply.github.com> --- app/models/task.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 19e012b5c..622974bd4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,8 +6,8 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] = mapped_column(db.String, nullable=False) - description: Mapped[str] = mapped_column(db.String, nullable=False) + title: Mapped[str] + description: Mapped[str] completed_at: Mapped[datetime] = mapped_column(default=None, nullable=True) is_complete: Mapped[bool] = mapped_column(default=False, nullable=False) From abf8bcb580effacc701d851641431f3098d1fd30 Mon Sep 17 00:00:00 2001 From: Sno Date: Thu, 12 Jun 2025 11:49:11 -0700 Subject: [PATCH 07/12] feedback updates part 1 --- app/__init__.py | 2 -- app/models/goal.py | 4 ++-- app/models/task.py | 14 +++++--------- app/routes/goal_routes.py | 8 ++------ app/routes/route_utilities.py | 1 + app/routes/task_routes.py | 6 +----- 6 files changed, 11 insertions(+), 24 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 99c96c1cf..81e73fa28 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,5 @@ from flask import Flask from .db import db, migrate -from .models.task import Task -from .models.goal import Goal from .routes.task_routes import bp as tasks_bp from .routes.goal_routes import bp as goals_bp import os diff --git a/app/models/goal.py b/app/models/goal.py index fb968f513..9035a9a04 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -6,9 +6,9 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] = mapped_column(db.String, nullable=False) + title: Mapped[str] - tasks: Mapped[list["Task"]] = relationship(back_populates="goal", lazy=True) + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") def to_dict(self): goal_as_dict = {} diff --git a/app/models/task.py b/app/models/task.py index 622974bd4..15092f602 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,15 +3,15 @@ from .goal import Goal from datetime import datetime from typing import Optional +from sqlalchemy import ForeignKey class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] description: Mapped[str] - completed_at: Mapped[datetime] = mapped_column(default=None, nullable=True) - is_complete: Mapped[bool] = mapped_column(default=False, nullable=False) + completed_at: Mapped[Optional[datetime]] - goal_id: Mapped[Optional[int]] = mapped_column(db.Integer, db.ForeignKey("goal.id"), nullable=True) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") def to_dict(self): @@ -19,8 +19,7 @@ def to_dict(self): task_as_dict["id"] = self.id task_as_dict["title"] = self.title task_as_dict["description"] = self.description - # task_as_dict["completed_at"] = self.completed_at.isoformat() if self.completed_at else None - task_as_dict["is_complete"] = self.is_complete + task_as_dict["is_complete"] = True if self.completed_at is not None else False # if self.goal_id is not None: if self.goal_id: @@ -30,12 +29,9 @@ def to_dict(self): @classmethod def from_dict(cls, task_data): - if "title" not in task_data or "description" not in task_data: - raise KeyError("title or description") new_task = cls(title=task_data["title"], description=task_data["description"], - completed_at=task_data.get("completed_at", None), - is_complete=task_data.get("is_complete", False), + completed_at=task_data.get("completed_at", None) ) return new_task \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3164c4916..e9081e65d 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -2,11 +2,8 @@ from app.models.task import Task from app.models.goal import Goal from ..db import db -from sqlalchemy import cast, String, Integer from .route_utilities import validate_model -from datetime import datetime -import os -import requests + bp = Blueprint("goals_bp", __name__, url_prefix = "/goals") @@ -31,13 +28,11 @@ def create_goal(): def get_one_goal_by_id(goal_id): goal = validate_model(Goal, goal_id) - # response = [goal.to_dict() for goal in goal.goals] return {"goal": goal.to_dict()}, 200 @bp.get("") def get_all_goals(): query = db.select(Goal) - goals = db.session.execute(query).scalars().all() sort_order_param = request.args.get("sort", "asc") if sort_order_param == "desc": @@ -71,6 +66,7 @@ def update_goal(goal_id): @bp.delete("/") def delete_goal(goal_id): goal = validate_model(Goal, goal_id) + db.session.delete(goal) db.session.commit() diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index e93bb96b4..736e0d92c 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -14,4 +14,5 @@ def validate_model(cls, model_id): if not model: response = {"message": f"{cls.__name__} {model_id} not found"} abort(make_response(response, 404)) + return model \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 991f639ef..de62cd17a 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,8 +1,6 @@ -from flask import abort, Blueprint, jsonify, make_response, request, Response +from flask import abort, Blueprint, make_response, request, Response from app.models.task import Task -from app.models.goal import Goal from ..db import db -from sqlalchemy import cast, String, Integer from .route_utilities import validate_model from datetime import datetime, timezone import os @@ -28,7 +26,6 @@ def create_task(): @bp.get("") def get_all_tasks(): query = db.select(Task) - tasks = db.session.execute(query).scalars().all() sort_order_param = request.args.get("sort", "asc") if sort_order_param == "desc": @@ -77,7 +74,6 @@ def get_one_task(task_id): def mark_task_as_complete(task_id): task = validate_model(Task, task_id) - task.is_complete = True task.completed_at = datetime.now(timezone.utc) db.session.commit() From 8505c105c8dadabc8e1fb494f13aa64dd2c1bfcc Mon Sep 17 00:00:00 2001 From: Sno Date: Mon, 23 Jun 2025 03:49:59 -0700 Subject: [PATCH 08/12] API feedback completed --- ada-project-docs/setup.md | 2 +- app/__init__.py | 2 + app/models/task.py | 1 - app/routes/goal_routes.py | 55 +++-------- app/routes/route_utilities.py | 66 ++++++++++++- app/routes/task_routes.py | 96 +++---------------- .../33d79f78958f_add_task_and_goal_tables.py | 42 ++++++++ 7 files changed, 133 insertions(+), 131 deletions(-) create mode 100644 migrations/versions/33d79f78958f_add_task_and_goal_tables.py diff --git a/ada-project-docs/setup.md b/ada-project-docs/setup.md index b3ee1840d..a5828add8 100644 --- a/ada-project-docs/setup.md +++ b/ada-project-docs/setup.md @@ -48,7 +48,7 @@ Create a file named `.env`. Create two environment variables that will hold your database URLs. 1. `SQLALCHEMY_DATABASE_URI` to hold the path to your development database -1. `SQLALCHEMY_TEST_DATABASE_URI` to hold the path to your development database +1. `SQLALCHEMY_TEST_DATABASE_URI` to hold the path to your test development database Your `.env` may look like this: diff --git a/app/__init__.py b/app/__init__.py index 81e73fa28..99c96c1cf 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,5 +1,7 @@ from flask import Flask from .db import db, migrate +from .models.task import Task +from .models.goal import Goal from .routes.task_routes import bp as tasks_bp from .routes.goal_routes import bp as goals_bp import os diff --git a/app/models/task.py b/app/models/task.py index 15092f602..15f665f2a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -21,7 +21,6 @@ def to_dict(self): task_as_dict["description"] = self.description task_as_dict["is_complete"] = True if self.completed_at is not None else False - # if self.goal_id is not None: if self.goal_id: task_as_dict["goal_id"] = self.goal_id diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index e9081e65d..66ecc0eff 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -2,27 +2,17 @@ from app.models.task import Task from app.models.goal import Goal from ..db import db -from .route_utilities import validate_model +from .route_utilities import validate_model, create_model, get_models_with_filters, update_model bp = Blueprint("goals_bp", __name__, url_prefix = "/goals") @bp.post("") -def create_goal(): +def create_goal(): request_body = request.get_json() - try: - new_goal = Goal.from_dict(request_body) - - except KeyError as error: - response = {"details": "Invalid data"} - abort(make_response(response, 400)) - - db.session.add(new_goal) - db.session.commit() - - return {"goal": new_goal.to_dict()}, 201 + return create_model(Goal, request_body) @bp.get("/") def get_one_goal_by_id(goal_id): @@ -32,36 +22,18 @@ def get_one_goal_by_id(goal_id): @bp.get("") def get_all_goals(): - query = db.select(Goal) - - sort_order_param = request.args.get("sort", "asc") - if sort_order_param == "desc": - query = query.order_by(Goal.title.desc()) - else: - query = query.order_by(Goal.title.asc()) - - title_param = request.args.get("title") - if title_param: - query = query.where(Goal.title.ilike(f"%{title_param}%")) - - query = query.order_by(Goal.id) - goals = db.session.scalars(query) - - goals_response = [] - for goal in goals: - goals_response.append(goal.to_dict()) - return goals_response, 200 - + filters = request.args.to_dict() + return get_models_with_filters( + Goal, + filters, + sort_attr="title"), 200 @bp.put("/") def update_goal(goal_id): goal = validate_model(Goal, goal_id) request_body = request.get_json() - goal.title = request_body["title"] - db.session.commit() - - return Response(status=204, mimetype="application/json") + return update_model(goal, request_body) @bp.delete("/") def delete_goal(goal_id): @@ -78,14 +50,13 @@ def assign_tasks_to_goal(goal_id): goal = validate_model(Goal, goal_id) request_body = request.get_json() task_ids = request_body.get("task_ids", []) - - for task in goal.tasks: - task.goal_id = None - + + valid_tasks = [] for task_id in task_ids: task = validate_model(Task, task_id) - task.goal_id = goal.id + valid_tasks.append(task) + goal.tasks = valid_tasks db.session.commit() return { diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 736e0d92c..462c18e3e 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,10 +1,12 @@ -from flask import abort, make_response +from flask import abort, make_response, Response from ..db import db +import os +import requests def validate_model(cls, model_id): try: model_id = int(model_id) - except: + except ValueError: response = {"message": f"{cls.__name__} {model_id} invalid"} abort(make_response(response , 400)) @@ -15,4 +17,62 @@ def validate_model(cls, model_id): response = {"message": f"{cls.__name__} {model_id} not found"} abort(make_response(response, 404)) - return model \ No newline at end of file + return model + +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + except KeyError as e: + response = {"message": f"Invalid request: missing {e.args[0]}"} + abort(make_response(response, 400)) + + db.session.add(new_model) + db.session.commit() + + return new_model.to_dict(), 201 + + +def get_models_with_filters(cls, filters=None, sort_attr="id"): + query = db.select(cls) + + if filters: + for attribute, value in filters.items(): + if hasattr(cls, attribute): + query = query.where(getattr(cls, attribute).ilike(f"%{value}%")) + + sort_order = filters.get("sort", "asc") + if sort_order == "desc": + query = query.order_by(getattr(cls, sort_attr).desc()) + else: + query = query.order_by(getattr(cls, sort_attr).asc()) + else: + query = query.order_by(getattr(cls, sort_attr)) + + models = db.session.scalars(query) + return [model.to_dict() for model in models] + + +def send_slack_notification(message): + slack_token = os.environ.get("SLACKBOT_API_TOKEN") + slack_channel = os.environ.get("SLACK_CHANNEL") + + headers = { + "Authorization": f"Bearer {slack_token}", + "Content-Type": "application/json" + } + data = { + "channel": slack_channel, + "text": message + } + slack_response = requests.post("https://slack.com/api/chat.postMessage", headers=headers, json=data) + + if not slack_response.ok: + print("Slack error:", slack_response.text) + +def update_model(obj, data): + for attr, value in data.items(): + if hasattr(obj, attr): + setattr(obj, attr, value) + + db.session.commit() + return Response(status=204, mimetype="application/json") diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index de62cd17a..2dd7da666 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,7 +1,7 @@ from flask import abort, Blueprint, make_response, request, Response from app.models.task import Task from ..db import db -from .route_utilities import validate_model +from .route_utilities import validate_model, create_model,get_models_with_filters, send_slack_notification, update_model from datetime import datetime, timezone import os import requests @@ -11,58 +11,16 @@ @bp.post("") def create_task(): request_body = request.get_json() - try: - new_task = Task.from_dict(request_body) - - except KeyError as error: - response = {"details": "Invalid data"} - abort(make_response(response, 400)) - - db.session.add(new_task) - db.session.commit() - - return {"task": new_task.to_dict()}, 201 + + return create_model(Task, request_body) @bp.get("") def get_all_tasks(): - query = db.select(Task) - - sort_order_param = request.args.get("sort", "asc") - if sort_order_param == "desc": - query = query.order_by(Task.title.desc()) - else: - query = query.order_by(Task.title.asc()) - - title_param = request.args.get("title") - if title_param: - query = query.where(Task.title.ilike(f"%{title_param}%")) - - description_param = request.args.get("description") - if description_param: - query = query.where(Task.description.ilike(f"%{description_param}%")) - - completed_at_param =request.args.get("completed_at") - if completed_at_param: - query = query.where(Task.completed_at.ilike(f"%{completed_at_param}%")) - - is_complete_param = request.args.get("is_complete") - if is_complete_param: - # is_complete_bool = is_complete_param.lower() == "true" - # query = query.where(Task.is_complete == is_complete_bool) - - if is_complete_param.lower() == "true": - query = query.where(Task.task_completed == True) - elif is_complete_param.lower() == "false": - query = query.where(Task.task_completed == False) - - query = query.order_by(Task.id) - tasks = db.session.scalars(query) - - tasks_response = [] - for task in tasks: - tasks_response.append(task.to_dict()) - return tasks_response, 200 - + filters = request.args.to_dict() + return get_models_with_filters( + Task, + filters, + sort_attr="title"), 200 @bp.get("/") def get_one_task(task_id): @@ -77,56 +35,26 @@ def mark_task_as_complete(task_id): task.completed_at = datetime.now(timezone.utc) db.session.commit() - slack_token = os.environ.get("SLACKBOT_API_TOKEN") - slack_channel = os.getenv("SLACK_CHANNEL", "#sno-task-tracker-bot2") - slack_text = f"Someone just completed the task: *{task.title}* ! 🎉" - - if slack_token: - url = "https://slack.com/api/chat.postMessage" - headers = { - "Authorization": f"Bearer {slack_token}", - "Content-Type": "application/json" - } - slack_data = { - "channel": slack_channel, - "text": slack_text - } - slack_response = requests.post(url, headers=headers, json=slack_data) - - if not slack_response.ok: - print("Slack error:", slack_response.text) + message = f"Someone just completed the task: *{task.title}* ! 🎉" + send_slack_notification(message) - response_body = { - "id": task.id, - "title": task.title, - "description": task.description, - "is_complete": task.is_complete, - "completed_at": task.completed_at.isoformat() - } - - return make_response(response_body, 200) + return make_response(task.to_dict(), 200) @bp.patch("//mark_incomplete") def mark_task_as_incomplete(task_id): task = validate_model(Task, task_id) - # task.is_complete = False task.completed_at = None db.session.commit() return Response(status=204, mimetype="application/json") - # return {"task": task.to_dict()}, 200 @bp.put("/") def update_task(task_id): task = validate_model(Task, task_id) request_body = request.get_json() - task.title = request_body["title"] - task.description = request_body["description"] - db.session.commit() - - return Response(status=204, mimetype="application/json") + return update_model(task, request_body) @bp.delete("/") def delete_task(task_id): diff --git a/migrations/versions/33d79f78958f_add_task_and_goal_tables.py b/migrations/versions/33d79f78958f_add_task_and_goal_tables.py new file mode 100644 index 000000000..293b131b1 --- /dev/null +++ b/migrations/versions/33d79f78958f_add_task_and_goal_tables.py @@ -0,0 +1,42 @@ +"""Add task and goal tables + +Revision ID: 33d79f78958f +Revises: +Create Date: 2025-06-23 03:35:01.411488 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '33d79f78958f' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### From 6a4f4f3580256bda8687fd61eb61ba606107356e Mon Sep 17 00:00:00 2001 From: Sno Date: Mon, 23 Jun 2025 04:16:48 -0700 Subject: [PATCH 09/12] updated failed wave01 tests --- app/routes/route_utilities.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 462c18e3e..9e8b405ba 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -20,6 +20,19 @@ def validate_model(cls, model_id): return model def create_model(cls, model_data): + required_fields_by_model = { + "Task": ["title", "description"], + "Goal": ["title"] + } + + model_name = cls.__name__ + required_fields = required_fields_by_model.get(model_name, []) + + for field in required_fields: + if not model_data.get(field): + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + try: new_model = cls.from_dict(model_data) except KeyError as e: @@ -29,7 +42,7 @@ def create_model(cls, model_data): db.session.add(new_model) db.session.commit() - return new_model.to_dict(), 201 + return {model_name.lower(): new_model.to_dict()}, 201 def get_models_with_filters(cls, filters=None, sort_attr="id"): From ce38466f3bb0aab5f03d29cddb07b3676e36d89b Mon Sep 17 00:00:00 2001 From: Sno Date: Mon, 23 Jun 2025 04:36:06 -0700 Subject: [PATCH 10/12] last update for required task and goal fields --- app/models/goal.py | 2 ++ app/models/task.py | 2 ++ app/routes/route_utilities.py | 10 ++-------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 9035a9a04..6cf837dbf 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,6 +5,8 @@ from .task import Task class Goal(db.Model): + __required_fields__ = ["title"] + id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] diff --git a/app/models/task.py b/app/models/task.py index 15f665f2a..c21a26daa 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,8 @@ from sqlalchemy import ForeignKey class Task(db.Model): + __required_fields__ = ["title", "description"] + id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] description: Mapped[str] diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 9e8b405ba..9ec9c2150 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -20,13 +20,7 @@ def validate_model(cls, model_id): return model def create_model(cls, model_data): - required_fields_by_model = { - "Task": ["title", "description"], - "Goal": ["title"] - } - - model_name = cls.__name__ - required_fields = required_fields_by_model.get(model_name, []) + required_fields = getattr(cls, "__required_fields__", []) for field in required_fields: if not model_data.get(field): @@ -42,7 +36,7 @@ def create_model(cls, model_data): db.session.add(new_model) db.session.commit() - return {model_name.lower(): new_model.to_dict()}, 201 + return {"task" if cls.__name__ == "Task" else "goal": new_model.to_dict()}, 201 def get_models_with_filters(cls, filters=None, sort_attr="id"): From 055e03f0b41b0798bfa805767a9e32a7f8e090aa Mon Sep 17 00:00:00 2001 From: Sno Date: Tue, 24 Jun 2025 20:45:32 -0700 Subject: [PATCH 11/12] update innit py for CORS --- app/__init__.py | 8 ++++++-- requirements.txt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 99c96c1cf..ba46a2775 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,4 +1,5 @@ from flask import Flask +from flask_cors import CORS from .db import db, migrate from .models.task import Task from .models.goal import Goal @@ -6,13 +7,16 @@ from .routes.goal_routes import bp as goals_bp import os from dotenv import load_dotenv + load_dotenv() def create_app(config=None): app = Flask(__name__) + CORS(app) - app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') + app.config['CORS_HEADERS'] = 'Content-Type' + # app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + # app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') if config: # Merge `config` into the app's configuration diff --git a/requirements.txt b/requirements.txt index 9626f4812..f9272abf8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ click==8.1.8 coverage==7.6.12 exceptiongroup==1.2.2 Flask==3.1.0 +flask-cors==6.0.1 Flask-Migrate==4.1.0 Flask-SQLAlchemy==3.1.1 gunicorn==23.0.0 From 161fb972f3c67c1ae850dda84181ca6f7e43cb25 Mon Sep 17 00:00:00 2001 From: Sno Date: Tue, 24 Jun 2025 20:50:27 -0700 Subject: [PATCH 12/12] CORS and app config updated --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index ba46a2775..d92b32761 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,8 +15,8 @@ def create_app(config=None): CORS(app) app.config['CORS_HEADERS'] = 'Content-Type' - # app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - # app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') if config: # Merge `config` into the app's configuration