From a1a4e91b6f946067ec244fd6593c73b990cb895e Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Thu, 30 Oct 2025 13:48:39 -0700 Subject: [PATCH 1/9] set up completed --- migrations/README | 1 + migrations/alembic.ini | 50 +++++++++++++++++ migrations/env.py | 113 ++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++ 4 files changed, 188 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako 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"} From 801590dade3dd5b019e82d839ab6285389a88edf Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Tue, 4 Nov 2025 09:23:33 -0800 Subject: [PATCH 2/9] create model, to_dict, from_dict, completed create and get all task routes, passed couple of wave 1 tests --- app/__init__.py | 2 ++ app/models/task.py | 24 ++++++++++++++ app/routes/task_routes.py | 49 +++++++++++++++++++++++++++- migrations/versions/6daf1db68635_.py | 36 ++++++++++++++++++++ tests/test_wave_01.py | 34 +++++++++---------- 5 files changed, 127 insertions(+), 18 deletions(-) create mode 100644 migrations/versions/6daf1db68635_.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..f2897bc22 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,5 +1,6 @@ from flask import Flask from .db import db, migrate +from .routes.task_routes import bp as tasks_bp from .models import task, goal import os @@ -18,5 +19,6 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..c9ec1c214 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,29 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +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] + description: Mapped[str] + completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True, default=None) + + 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 + if self.completed_at: + task_as_dict["is_complete"] = True + elif not self.completed_at or self.completed_at == None: + task_as_dict["is_complete"] = False + return task_as_dict + + @classmethod + def from_dict(cls, task_data): + new_task = cls(title=task_data["title"], + description=task_data["description"], + completed_at=None) + + return new_task diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..6fc6cbc25 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,48 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, abort, make_response, Response +from app.models.task import Task +from ..db import db + +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 = {"message": f"Invalid request: missing {error.args[0]}"} + abort(make_response(response, 400)) + + db.session.add(new_task) + db.session.commit() + + return new_task.to_dict(), 201 + +@bp.get("") +def get_all_task(): + query = db.select(Task) + + 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}%")) + + complete_param = request.args.get("is_completed") + if complete_param: + query = query.where(Task.completed_at == None) + + tasks = db.session.scalars(query.order_by(Task.id)) + + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_dict()) + return tasks_response + +@bp.get() + + + + diff --git a/migrations/versions/6daf1db68635_.py b/migrations/versions/6daf1db68635_.py new file mode 100644 index 000000000..64c2bc8ee --- /dev/null +++ b/migrations/versions/6daf1db68635_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: 6daf1db68635 +Revises: +Create Date: 2025-11-02 01:06:37.663652 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6daf1db68635' +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.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/tests/test_wave_01.py b/tests/test_wave_01.py index fac95a0a3..e5b3637f9 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,7 @@ from app.db import db 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_task_to_dict(): #Arrange new_task = Task(id = 1, title="Make My Bed", @@ -19,7 +19,7 @@ def test_task_to_dict(): assert task_dict["description"] == "Start the day off right!" assert task_dict["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_task_to_dict_missing_id(): #Arrange new_task = Task(title="Make My Bed", @@ -36,7 +36,7 @@ def test_task_to_dict_missing_id(): assert task_dict["description"] == "Start the day off right!" assert task_dict["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_task_to_dict_missing_title(): #Arrange new_task = Task(id = 1, @@ -53,7 +53,7 @@ def test_task_to_dict_missing_title(): assert task_dict["description"] == "Start the day off right!" assert task_dict["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_task_from_dict(): #Arrange task_dict = { @@ -70,7 +70,7 @@ def test_task_from_dict(): assert task_obj.description == "Start the day off right!" assert task_obj.completed_at is 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_task_from_dict_no_title(): #Arrange task_dict = { @@ -82,7 +82,7 @@ def test_task_from_dict_no_title(): with pytest.raises(KeyError, match = 'title'): Task.from_dict(task_dict) -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_task_from_dict_no_description(): #Arrange task_dict = { @@ -94,7 +94,7 @@ def test_task_from_dict_no_description(): with pytest.raises(KeyError, match = 'description'): Task.from_dict(task_dict) -@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") @@ -105,7 +105,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") @@ -124,7 +124,7 @@ def test_get_tasks_one_saved_tasks(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(client, one_task): # Act response = client.get("/tasks/1") @@ -140,7 +140,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") @@ -155,7 +155,7 @@ def test_get_task_not_found(client): # ***************************************************************** -@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={ @@ -181,7 +181,7 @@ def test_create_task(client): assert new_task.description == "Test Description" 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={ @@ -201,7 +201,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={ @@ -219,7 +219,7 @@ def test_update_task_not_found(client): # ***************************************************************** -@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") @@ -230,7 +230,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") @@ -247,7 +247,7 @@ def test_delete_task_not_found(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_title(client): # Act response = client.post("/tasks", json={ @@ -264,7 +264,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={ From 96dbf51c173dacc9458b35d579ac575473084c1a Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Wed, 5 Nov 2025 22:30:10 -0800 Subject: [PATCH 3/9] completed til wave 6 --- app/__init__.py | 2 + app/models/goal.py | 21 +++++- app/models/task.py | 17 +++-- app/routes/goal_routes.py | 95 +++++++++++++++++++++++++++- app/routes/route_utilities.py | 44 +++++++++++++ app/routes/task_routes.py | 85 ++++++++++++++++++++----- migrations/versions/8cee1ae492b3_.py | 32 ++++++++++ migrations/versions/da88c5fdd2b3_.py | 34 ++++++++++ migrations/versions/ed4703ef8d96_.py | 36 +++++++++++ tests/test_wave_01.py | 12 ++-- tests/test_wave_02.py | 4 +- tests/test_wave_03.py | 18 +++--- tests/test_wave_05.py | 64 +++++++++++++------ tests/test_wave_06.py | 15 +++-- 14 files changed, 415 insertions(+), 64 deletions(-) create mode 100644 app/routes/route_utilities.py create mode 100644 migrations/versions/8cee1ae492b3_.py create mode 100644 migrations/versions/da88c5fdd2b3_.py create mode 100644 migrations/versions/ed4703ef8d96_.py diff --git a/app/__init__.py b/app/__init__.py index f2897bc22..7ced5df43 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,7 @@ from flask import Flask from .db import db, migrate from .routes.task_routes import bp as tasks_bp +from .routes.goal_routes import bp as goals_bp from .models import task, goal import os @@ -20,5 +21,6 @@ def create_app(config=None): # 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..622c99ed1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,24 @@ -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] + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") + + def to_dict(self): + goal_as_dict={} + goal_as_dict["id"] = self.id + goal_as_dict["title"] = self.title + goal_as_dict["task_ids"] = [task.id for task in self.tasks] + goal_as_dict["tasks"] = self.tasks + return goal_as_dict + + @classmethod + def from_dict(cls, goal_data): + new_goal = cls(title=goal_data["title"]) + return new_goal + diff --git a/app/models/task.py b/app/models/task.py index c9ec1c214..07e297df6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,13 +1,20 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey from ..db import db from datetime import datetime -from typing import Optional +from typing import Optional, TYPE_CHECKING +if TYPE_CHECKING: + from .goal import Goal + class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] description: Mapped[str] completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True, default=None) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") + def to_dict(self): task_as_dict={} @@ -18,12 +25,14 @@ def to_dict(self): task_as_dict["is_complete"] = True elif not self.completed_at or self.completed_at == None: task_as_dict["is_complete"] = False + task_as_dict["goal_id"] = self.goal_id + return task_as_dict @classmethod def from_dict(cls, task_data): new_task = cls(title=task_data["title"], description=task_data["description"], - completed_at=None) - + completed_at=None, + goal_id=task_data.get("goal_id")) return new_task diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..efee96084 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,94 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, Response, request +from app.models.goal import Goal +from app.models.task import Task +from ..routes.route_utilities import get_instance_by_id, create_model +from ..db import db + +bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@bp.post("") +def create_goal(): + request_body = request.get_json() + return create_model(Goal, request_body) + + +@bp.get("") +def get_all_goal(): + + query = db.select(Goal) + + title_param = request.args.get("title") + if title_param: + query = query.where(Goal.title.ilike(f"%{title_param}%")) + + goals = db.session.scalars(query.order_by(Goal.id)) + + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict()) + return goals_response + +@bp.get("/") +def get_one_goal(goal_id): + goal = get_instance_by_id(Goal, goal_id) + return goal.to_dict() + +@bp.put("/") +def update_goal(goal_id): + goal = get_instance_by_id(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 = get_instance_by_id(Goal, goal_id) + db.session.delete(goal) + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@bp.post("//tasks") +def create_task_by_goal(goal_id): + goal = get_instance_by_id(Goal, goal_id) + if goal.tasks: + for task in goal.tasks: + task.goal_id = None + db.session.commit() + + request_body = request.get_json() + for id in request_body["task_ids"]: + query = db.select(Task).where(Task.id == id) + task = db.session.scalar(query) + task.goal_id = goal_id + + db.session.commit() + + response = goal.to_dict() + result = { + "id": response.get("id"), + "task_ids": response.get("task_ids") + } + return result, 200 + + +@bp.get("//tasks") +def get_task_by_goal(goal_id): + goal = get_instance_by_id(Goal, goal_id) + response = goal.to_dict() + result = { + "id":response.get("id"), + "title":response.get("title"), + "tasks":[task.to_dict() for task in goal.tasks] + } + + return result + + + + + + diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..3c58d9351 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,44 @@ +from flask import abort, make_response, request + +from ..db import db + +def get_instance_by_id(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 + +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + + except KeyError as error: + response = {"details": "Invalid data"} + 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): + 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}%")) + + models = db.session.scalars(query.order_by(cls.id)) + models_response = [model.to_dict() for model in models] + return models_response diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 6fc6cbc25..23ed4fa9a 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,27 +1,23 @@ -from flask import Blueprint, request, abort, make_response, Response +from flask import Blueprint, Response, request +import requests from app.models.task import Task +from datetime import datetime +from ..routes.route_utilities import get_instance_by_id, create_model from ..db import db +import os 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 = {"message": f"Invalid request: missing {error.args[0]}"} - abort(make_response(response, 400)) - - db.session.add(new_task) - db.session.commit() - - return new_task.to_dict(), 201 + return create_model(Task, request_body) @bp.get("") def get_all_task(): + query = db.select(Task) - + title_param = request.args.get("title") if title_param: query = query.where(Task.title.ilike(f"%{title_param}%")) @@ -34,15 +30,70 @@ def get_all_task(): if complete_param: query = query.where(Task.completed_at == None) - tasks = db.session.scalars(query.order_by(Task.id)) - + sort_order = request.args.get("sort") + if sort_order == "asc": + tasks = db.session.scalars(query.order_by(Task.title.asc())) + elif sort_order == "desc": + tasks = db.session.scalars(query.order_by(Task.title.desc())) + else: + tasks = db.session.scalars(query.order_by(Task.id)) + tasks_response = [] for task in tasks: tasks_response.append(task.to_dict()) return tasks_response -@bp.get() - +@bp.get("/") +def get_one_task(task_id): + task = get_instance_by_id(Task, task_id) + + return task.to_dict() + +@bp.patch("//mark_complete") +def update_completed_at_complete(task_id): + task = get_instance_by_id(Task, task_id) + task.completed_at = datetime.utcnow() + + headers={"Authorization": os.environ.get('SLACKAUTHORIZATION')} + data = {"channel": "slack-api-testing", + "text": f"Someone just completed {task.title}"} + + response=requests.post("https://slack.com/api/chat.postMessage", + headers=headers, + json=data) + + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@bp.patch("//mark_incomplete") +def update_completed_at_incomplete(task_id): + task = get_instance_by_id(Task, task_id) + task.completed_at = None + + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@bp.put("/") +def update_task(task_id): + task = get_instance_by_id(Task, task_id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + task.compelted_at = None + + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@bp.delete("/") +def delete_task(task_id): + task = get_instance_by_id(Task, task_id) + db.session.delete(task) + db.session.commit() + + return Response(status=204, mimetype="application/json") - diff --git a/migrations/versions/8cee1ae492b3_.py b/migrations/versions/8cee1ae492b3_.py new file mode 100644 index 000000000..7c42cc825 --- /dev/null +++ b/migrations/versions/8cee1ae492b3_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 8cee1ae492b3 +Revises: ed4703ef8d96 +Create Date: 2025-11-05 09:12:35.677137 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8cee1ae492b3' +down_revision = 'ed4703ef8d96' +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/migrations/versions/da88c5fdd2b3_.py b/migrations/versions/da88c5fdd2b3_.py new file mode 100644 index 000000000..4ce0097c9 --- /dev/null +++ b/migrations/versions/da88c5fdd2b3_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: da88c5fdd2b3 +Revises: 8cee1ae492b3 +Create Date: 2025-11-05 19:02:34.686675 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'da88c5fdd2b3' +down_revision = '8cee1ae492b3' +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/ed4703ef8d96_.py b/migrations/versions/ed4703ef8d96_.py new file mode 100644 index 000000000..0efe99f22 --- /dev/null +++ b/migrations/versions/ed4703ef8d96_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: ed4703ef8d96 +Revises: 6daf1db68635 +Create Date: 2025-11-05 08:55:49.192865 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ed4703ef8d96' +down_revision = '6daf1db68635' +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('title', sa.String(), nullable=False)) + batch_op.add_column(sa.Column('description', sa.String(), nullable=False)) + 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: + batch_op.drop_column('completed_at') + batch_op.drop_column('description') + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index e5b3637f9..89a6792d3 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -148,13 +148,15 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found" } - raise Exception("Complete test with assertion about response body") + # 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") def test_create_task(client): # Act @@ -212,8 +214,9 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found" } - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -238,13 +241,14 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found" } + assert db.session.scalars(db.select(Task)).all() == [] - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** - assert db.session.scalars(db.select(Task)).all() == [] #@pytest.mark.skip(reason="No way to test this feature yet") diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..c9a76e6b1 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..cfd2ecc20 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,15 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") + # 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 +110,9 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index b7cc330ae..f3e0a3880 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,9 @@ from app.models.goal import Goal +from app.db import db 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_goal_to_dict(): #Arrange new_goal = Goal(id=1, title="Seize the Day!") @@ -13,7 +15,7 @@ def test_goal_to_dict(): assert goal_dict["id"] == 1 assert goal_dict["title"] == "Seize the Day!" -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_goal_to_dict_no_id(): #Arrange new_goal = Goal(title="Seize the Day!") @@ -25,7 +27,7 @@ def test_goal_to_dict_no_id(): assert goal_dict["id"] is None assert goal_dict["title"] == "Seize the Day!" -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_goal_to_dict_no_title(): #Arrange new_goal = Goal(id=1) @@ -39,7 +41,7 @@ def test_goal_to_dict_no_title(): -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_goal_from_dict(): #Arrange goal_dict = { @@ -52,7 +54,7 @@ def test_goal_from_dict(): #Assert assert goal_obj.title == "Seize the Day!" -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_goal_from_dict_no_title(): #Arrange goal_dict = { @@ -63,7 +65,7 @@ def test_goal_from_dict_no_title(): Goal.from_dict(goal_dict) -@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") @@ -74,7 +76,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") @@ -91,7 +93,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") @@ -105,22 +107,24 @@ 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") + # raise Exception("Complete test") # Assert # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} # assertion 1 goes here # assertion 2 goes here # ---- Complete Test ---- -@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={ @@ -136,13 +140,20 @@ 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") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + query = db.select(Goal).where(Goal.id == 1) + goal = db.session.scalar(query) # Assert + assert response.status_code == 204 + assert goal.title == "Updated Goal Title" # ---- Complete Assertions Here ---- # assertion 1 goes here # assertion 2 goes here @@ -150,20 +161,26 @@ def test_update_goal(client, one_goal): # ---- Complete Assertions Here ---- -@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") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title Test" + }) + response_body = response.get_json() # Assert + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} # ---- Complete Assertions Here ---- # assertion 1 goes here # assertion 2 goes here # ---- Complete Assertions Here ---- -@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") @@ -177,28 +194,35 @@ 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") + # 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") + #raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} + assert db.session.scalars(db.select(Goal)).all() == [] # ---- Complete Assertions Here ---- # assertion 1 goes here # assertion 2 goes here # ---- Complete Assertions Here ---- -@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 727fce93a..5619ac856 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_overwrites_existing_tasks(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_overwrites_existing_tasks(client, one_task_belong 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,15 @@ 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") + # 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 +78,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 +103,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 e2ef0fde55342605ef17abb26d597008d21a62ef Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Wed, 5 Nov 2025 22:56:26 -0800 Subject: [PATCH 4/9] completed wave 7 --- app/routes/goal_routes.py | 12 ++++----- app/routes/route_utilities.py | 2 +- app/routes/task_routes.py | 12 ++++----- tests/test_wave_07.py | 47 ++++++++++++++++++++++++----------- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index efee96084..1f68ed576 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,7 +1,7 @@ from flask import Blueprint, Response, request from app.models.goal import Goal from app.models.task import Task -from ..routes.route_utilities import get_instance_by_id, create_model +from ..routes.route_utilities import validate_model, create_model from ..db import db bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @@ -30,12 +30,12 @@ def get_all_goal(): @bp.get("/") def get_one_goal(goal_id): - goal = get_instance_by_id(Goal, goal_id) + goal = validate_model(Goal, goal_id) return goal.to_dict() @bp.put("/") def update_goal(goal_id): - goal = get_instance_by_id(Goal, goal_id) + goal = validate_model(Goal, goal_id) request_body = request.get_json() goal.title = request_body["title"] @@ -45,7 +45,7 @@ def update_goal(goal_id): @bp.delete("/") def delete_goal(goal_id): - goal = get_instance_by_id(Goal, goal_id) + goal = validate_model(Goal, goal_id) db.session.delete(goal) db.session.commit() @@ -53,7 +53,7 @@ def delete_goal(goal_id): @bp.post("//tasks") def create_task_by_goal(goal_id): - goal = get_instance_by_id(Goal, goal_id) + goal = validate_model(Goal, goal_id) if goal.tasks: for task in goal.tasks: task.goal_id = None @@ -77,7 +77,7 @@ def create_task_by_goal(goal_id): @bp.get("//tasks") def get_task_by_goal(goal_id): - goal = get_instance_by_id(Goal, goal_id) + goal = validate_model(Goal, goal_id) response = goal.to_dict() result = { "id":response.get("id"), diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 3c58d9351..13706862b 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -2,7 +2,7 @@ from ..db import db -def get_instance_by_id(cls, model_id): +def validate_model(cls, model_id): try: model_id = int(model_id) except: diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 23ed4fa9a..b5cee78f4 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,7 +2,7 @@ import requests from app.models.task import Task from datetime import datetime -from ..routes.route_utilities import get_instance_by_id, create_model +from ..routes.route_utilities import validate_model, create_model from ..db import db import os @@ -46,13 +46,13 @@ def get_all_task(): @bp.get("/") def get_one_task(task_id): - task = get_instance_by_id(Task, task_id) + task = validate_model(Task, task_id) return task.to_dict() @bp.patch("//mark_complete") def update_completed_at_complete(task_id): - task = get_instance_by_id(Task, task_id) + task = validate_model(Task, task_id) task.completed_at = datetime.utcnow() headers={"Authorization": os.environ.get('SLACKAUTHORIZATION')} @@ -69,7 +69,7 @@ def update_completed_at_complete(task_id): @bp.patch("//mark_incomplete") def update_completed_at_incomplete(task_id): - task = get_instance_by_id(Task, task_id) + task = validate_model(Task, task_id) task.completed_at = None db.session.commit() @@ -78,7 +78,7 @@ def update_completed_at_incomplete(task_id): @bp.put("/") def update_task(task_id): - task = get_instance_by_id(Task, task_id) + task = validate_model(Task, task_id) request_body = request.get_json() task.title = request_body["title"] @@ -91,7 +91,7 @@ def update_task(task_id): @bp.delete("/") def delete_task(task_id): - task = get_instance_by_id(Task, task_id) + task = validate_model(Task, task_id) db.session.delete(task) db.session.commit() diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py index 7e7cef55a..db359f52d 100644 --- a/tests/test_wave_07.py +++ b/tests/test_wave_07.py @@ -4,7 +4,7 @@ from app.models.task import Task from app.routes.route_utilities import create_model, 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_route_utilities_validate_model_with_task(client, three_tasks): #Act task_1 = validate_model(Task, 1) @@ -24,7 +24,7 @@ def test_route_utilities_validate_model_with_task(client, three_tasks): assert task_3.title == "Pay my outstanding tickets 😭" -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_validate_model_with_task_invalid_id(client, three_tasks): #Act & Assert # Calling `validate_model` without being invoked by a route will @@ -35,25 +35,30 @@ def test_route_utilities_validate_model_with_task_invalid_id(client, three_tasks # Test that the correct status code and response message are returned response = e.value.get_response() assert response.status_code == 400 + assert response.get_json() == {"message": "Task One invalid"} - raise Exception("Complete test with an assertion about the response body") + #raise Exception("Complete test with an assertion about the response body") # ***************************************************************************** # ** Complete test with an assertion about the 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_route_utilities_validate_model_with_task_missing_id(client, three_tasks): #Act & Assert with pytest.raises(HTTPException) as e: result_task = validate_model(Task, 4) - raise Exception("Complete test with assertion status code and response body") + response = e.value.get_response() + assert response.status_code == 404 + assert response.get_json() == {"message": "Task 4 not found"} + + #raise Exception("Complete test with assertion status code and response body") # ***************************************************************************** # **Complete test with assertion about status code 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_route_utilities_validate_model_with_goal(client, one_goal): #Act goal_1 = validate_model(Goal, 1) @@ -62,29 +67,37 @@ def test_route_utilities_validate_model_with_goal(client, one_goal): assert goal_1.id == 1 assert goal_1.title == "Build a habit of going outside daily" -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_validate_model_with_goal_invalid_id(client, one_goal): #Act & Assert with pytest.raises(HTTPException) as e: result_task = validate_model(Goal, "One") + + response = e.value.get_response() + assert response.status_code == 400 + assert response.get_json() == {"message": "Goal One invalid"} - raise Exception("Complete test with assertion status code and response body") + #raise Exception("Complete test with assertion status code and response body") # ***************************************************************************** # **Complete test with assertion about status code 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_route_utilities_validate_model_with_goal_missing_id(client, one_goal): #Act & Assert with pytest.raises(HTTPException) as e: result_task = validate_model(Goal, 4) + + response = e.value.get_response() + assert response.status_code == 404 + assert response.get_json() == {"message": "Goal 4 not found"} - raise Exception("Complete test with assertion status code and response body") + # raise Exception("Complete test with assertion status code and response body") # ***************************************************************************** # **Complete test with assertion about status code 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_route_utilities_create_model_with_task(client): #Arrange request_body = { @@ -103,7 +116,7 @@ def test_route_utilities_create_model_with_task(client): assert response[0]["is_complete"] == False assert response[1] == 201 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_create_model_with_task_missing_title(client): #Arrange request_body = { @@ -120,7 +133,7 @@ def test_route_utilities_create_model_with_task_missing_title(client): assert response.get_json() == {"details": "Invalid data"} -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_create_model_with_goal(client): #Arrange request_body = { @@ -135,7 +148,7 @@ def test_route_utilities_create_model_with_goal(client): assert response[0]["title"] == "Seize the Day!" assert response[1] == 201 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_create_model_with_goal_missing_title(client): #Arrange request_body = { @@ -145,7 +158,11 @@ def test_route_utilities_create_model_with_goal_missing_title(client): with pytest.raises(HTTPException) as e: create_model(Goal, request_body) - raise Exception("Complete test with assertion status code and response body") + response = e.value.get_response() + assert response.status_code == 400 + assert response.get_json() == {"details": "Invalid data"} + + # raise Exception("Complete test with assertion status code and response body") # ***************************************************************************** # **Complete test with assertion about status code response body*************** # ***************************************************************************** From 782a398805944afb250cd2c0ef31851c41d10e4d Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Wed, 5 Nov 2025 22:57:06 -0800 Subject: [PATCH 5/9] remove the filter function --- app/routes/route_utilities.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 13706862b..97439b4ac 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -31,14 +31,3 @@ def create_model(cls, model_data): return new_model.to_dict(), 201 -def get_models_with_filters(cls, filters=None): - 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}%")) - - models = db.session.scalars(query.order_by(cls.id)) - models_response = [model.to_dict() for model in models] - return models_response From 09f17e74214fd49af5369b52efe00d3112568a66 Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Wed, 5 Nov 2025 22:58:35 -0800 Subject: [PATCH 6/9] remove unuse dependience --- app/routes/route_utilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 97439b4ac..db2ef5134 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,4 +1,4 @@ -from flask import abort, make_response, request +from flask import abort, make_response from ..db import db From a00da6208b964ee4755cde89831794d870f4ba5a Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Thu, 6 Nov 2025 16:37:56 -0800 Subject: [PATCH 7/9] modified model and confirmed all test passed --- app/models/goal.py | 4 ++-- app/models/task.py | 8 +++++--- app/routes/goal_routes.py | 5 +++-- app/routes/task_routes.py | 1 - tests/test_wave_05.py | 1 - 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 622c99ed1..8fbbf3926 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -13,8 +13,8 @@ def to_dict(self): goal_as_dict={} goal_as_dict["id"] = self.id goal_as_dict["title"] = self.title - goal_as_dict["task_ids"] = [task.id for task in self.tasks] - goal_as_dict["tasks"] = self.tasks + # goal_as_dict["task_ids"] = [task.id for task in self.tasks] + # goal_as_dict["tasks"] = self.tasks return goal_as_dict @classmethod diff --git a/app/models/task.py b/app/models/task.py index 07e297df6..26e93e7fd 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -25,7 +25,8 @@ def to_dict(self): task_as_dict["is_complete"] = True elif not self.completed_at or self.completed_at == None: task_as_dict["is_complete"] = False - task_as_dict["goal_id"] = self.goal_id + if self.goal_id is not None: + task_as_dict["goal_id"] = self.goal_id return task_as_dict @@ -33,6 +34,7 @@ def to_dict(self): def from_dict(cls, task_data): new_task = cls(title=task_data["title"], description=task_data["description"], - completed_at=None, - goal_id=task_data.get("goal_id")) + completed_at=None + # goal_id=task_data.get("goal_id") + ) return new_task diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 1f68ed576..069f12004 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -70,7 +70,7 @@ def create_task_by_goal(goal_id): response = goal.to_dict() result = { "id": response.get("id"), - "task_ids": response.get("task_ids") + "task_ids": [task.id for task in goal.tasks] } return result, 200 @@ -79,13 +79,14 @@ def create_task_by_goal(goal_id): def get_task_by_goal(goal_id): goal = validate_model(Goal, goal_id) response = goal.to_dict() + result = { "id":response.get("id"), "title":response.get("title"), "tasks":[task.to_dict() for task in goal.tasks] } - return result + return result, 200 diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index b5cee78f4..216907b21 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -47,7 +47,6 @@ def get_all_task(): @bp.get("/") def get_one_task(task_id): task = validate_model(Task, task_id) - return task.to_dict() @bp.patch("//mark_complete") diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index f3e0a3880..c3b92f056 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -109,7 +109,6 @@ def test_get_goal(client, one_goal): #@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() From df8e334e0c3dd26fcb839b1205373b62f00ff524 Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Thu, 6 Nov 2025 17:29:29 -0800 Subject: [PATCH 8/9] updated model --- app/models/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 26e93e7fd..3163664ea 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -35,6 +35,6 @@ def from_dict(cls, task_data): new_task = cls(title=task_data["title"], description=task_data["description"], completed_at=None - # goal_id=task_data.get("goal_id") + goal_id=task_data.get("goal_id") ) return new_task From 3085f6b29a9f8acb6f140c3f7dc31f294122fb3e Mon Sep 17 00:00:00 2001 From: Iris Cheung Date: Thu, 6 Nov 2025 17:30:00 -0800 Subject: [PATCH 9/9] update task from_dict --- app/models/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 3163664ea..f647399fa 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -34,7 +34,7 @@ def to_dict(self): def from_dict(cls, task_data): new_task = cls(title=task_data["title"], description=task_data["description"], - completed_at=None + completed_at=None, goal_id=task_data.get("goal_id") ) return new_task