From 10b3b32a90b5551d287395e68b0b816a1b3b52d1 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Thu, 30 Oct 2025 14:38:06 -0700 Subject: [PATCH 1/9] initial project setup --- 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 f71b090060d91cc44f1628ce2682ed3a24d60328 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 31 Oct 2025 17:45:13 -0700 Subject: [PATCH 2/9] Implement task model and routes with CRUD operations --- app/__init__.py | 4 +- app/models/task.py | 27 ++++++ app/routes/task_routes.py | 97 ++++++++++++++++++- .../versions/ed2714710226_adds_task_model.py | 34 +++++++ tests/test_wave_01.py | 56 +++++------ 5 files changed, 183 insertions(+), 35 deletions(-) create mode 100644 migrations/versions/ed2714710226_adds_task_model.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..c729f41ad 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,7 @@ from flask import Flask from .db import db, migrate -from .models import task, goal +from .models import task +from .routes.task_routes import tasks_bp import os def create_app(config=None): @@ -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..f367eb0b5 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,32 @@ +from datetime import datetime +from sqlalchemy import String, Text, DateTime from sqlalchemy.orm import Mapped, mapped_column from ..db import db class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str | None] = mapped_column(String(200), nullable=True) + description: Mapped[str | None] = mapped_column(Text, nullable=True) + completed_at: Mapped[datetime | None] = mapped_column(DateTime(), nullable=True, default=None) + + + def to_dict(self) -> dict: + return { + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": False, + } + + @staticmethod + def from_dict(data: dict): + if "title" not in data: + raise KeyError("title") + if "description" not in data: + raise KeyError("description") + + return Task( + title=data["title"], + description=data["description"], + completed_at=None, + ) \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..0e5a09d5a 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,96 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, Response, abort, make_response, request +from app.models.task import Task +from ..db import db + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +# helpers +def get_task_by_id(task_id): + try: + task_id = int(task_id) + except (TypeError, ValueError): + return abort(make_response({"message": f"Task id {task_id} invalid"}, 400)) + query = db.select(Task).where(Task.id == task_id) + task = db.session.scalar(query) + if not task: + return abort(make_response({"message": f"Task id {task_id} not found"}, 404)) + + return task + + +def create_instance_from_dict(data: dict, factory): + try: + instance = factory(data) + except (KeyError, ValueError): + return abort(make_response({"details": "Invalid data"}, 400)) + db.session.add(instance) + db.session.commit() + return instance, 201 + + +def parse_json_object(): + """Return dict or 400 {'details': 'Invalid data'}.""" + data = request.get_json(silent=True) # don’t raise BadRequest on invalid JSON — just return None. + if not isinstance(data, dict): + abort(make_response({"details": "Invalid data"}, 400)) + return data + + +# routes +@tasks_bp.post("") +def create_task(): + data = parse_json_object() + task, status = create_instance_from_dict(data, Task.from_dict) + return task.to_dict(), status + + +@tasks_bp.get("") +def get_all_tasks(): + query = db.select(Task).order_by(Task.id) + # 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}%")) + + # 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 + + + tasks = db.session.scalars(query).all() + return [t.to_dict() for t in tasks], 200 + + +@tasks_bp.get("/") +def get_one_task(task_id): + task = get_task_by_id(task_id) + return task.to_dict(), 200 + + +@tasks_bp.put("/") +def update_task(task_id): + task = get_task_by_id(task_id) + data = parse_json_object() + try: + task.title = data["title"] + task.description = data["description"] + except KeyError: + return abort(make_response({"details": "Invalid data"}, 400)) + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@tasks_bp.delete("/") +def delete_task(task_id): + task = get_task_by_id(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/versions/ed2714710226_adds_task_model.py b/migrations/versions/ed2714710226_adds_task_model.py new file mode 100644 index 000000000..7f9dd67f4 --- /dev/null +++ b/migrations/versions/ed2714710226_adds_task_model.py @@ -0,0 +1,34 @@ +"""adds Task model + +Revision ID: ed2714710226 +Revises: +Create Date: 2025-10-30 19:47:32.231001 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ed2714710226' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=200), nullable=True), + sa.Column('description', sa.Text(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index fac95a0a3..381ab0f4d 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") @@ -148,14 +148,11 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body == {"message": "Task id 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={ @@ -181,7 +178,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 +198,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={ @@ -212,14 +209,11 @@ 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 "message" in response_body + assert response_body == {"message": "Task id 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") @@ -230,7 +224,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") @@ -238,16 +232,12 @@ 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 "message" in response_body + assert response_body == {"message": "Task id 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={ @@ -264,7 +254,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 9eb35423e39d773285f4733a058f85e6a6d947b6 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 31 Oct 2025 18:55:57 -0700 Subject: [PATCH 3/9] Refactor get_all_tasks route to include sorting and return task list as dicts --- app/routes/task_routes.py | 28 +++++++++------------------- tests/test_wave_02.py | 4 ++-- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 0e5a09d5a..880440d99 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, Response, abort, make_response, request from app.models.task import Task from ..db import db +from sqlalchemy import asc, desc tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -46,25 +47,14 @@ def create_task(): @tasks_bp.get("") def get_all_tasks(): - query = db.select(Task).order_by(Task.id) - # 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}%")) - - # 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 - - + query = db.select(Task) + sort = request.args.get("sort") + if sort == "asc": + query = db.select(Task).order_by(Task.title.asc()) + elif sort == "desc": + query = db.select(Task).order_by(Task.title.desc()) + else: + query = db.select(Task).order_by(Task.id) tasks = db.session.scalars(query).all() return [t.to_dict() for t in tasks], 200 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") From b2746f576301e3dc4a19d348f448a4c6979fb1b5 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 31 Oct 2025 19:23:18 -0700 Subject: [PATCH 4/9] Remove redundant query initialization in get_all_tasks route --- app/routes/task_routes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 880440d99..de8e091f3 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -47,7 +47,6 @@ def create_task(): @tasks_bp.get("") def get_all_tasks(): - query = db.select(Task) sort = request.args.get("sort") if sort == "asc": query = db.select(Task).order_by(Task.title.asc()) From 0b1aa3a91d71aabd99b3a85819eac844b8c7acf7 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 31 Oct 2025 21:35:46 -0700 Subject: [PATCH 5/9] Implement task completion and incompletion routes; update task model to reflect completion status --- app/models/task.py | 3 +-- app/routes/task_routes.py | 17 +++++++++++++++++ tests/test_wave_03.py | 27 +++++++++++---------------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index f367eb0b5..43e44ce06 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -15,7 +15,7 @@ def to_dict(self) -> dict: "id": self.id, "title": self.title, "description": self.description, - "is_complete": False, + "is_complete": self.completed_at is not None } @staticmethod @@ -24,7 +24,6 @@ def from_dict(data: dict): raise KeyError("title") if "description" not in data: raise KeyError("description") - return Task( title=data["title"], description=data["description"], diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index de8e091f3..f6f694b42 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,4 +1,5 @@ from flask import Blueprint, Response, abort, make_response, request +from datetime import datetime from app.models.task import Task from ..db import db from sqlalchemy import asc, desc @@ -82,4 +83,20 @@ def delete_task(task_id): task = get_task_by_id(task_id) db.session.delete(task) db.session.commit() + return Response(status=204, mimetype="application/json") + + +@tasks_bp.patch("//mark_complete") +def mark_complete(task_id): + task = get_task_by_id(task_id) + task.completed_at = datetime.now() + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@tasks_bp.patch("//mark_incomplete") +def mark_incomplete(task_id): + task = get_task_by_id(task_id) + task.completed_at = None + db.session.commit() return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..74859e3d1 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,12 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body == {"message": "Task id 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 +107,5 @@ 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 "message" in response_body + assert response_body == {"message": "Task id 1 not found"} \ No newline at end of file From d9fcbc62efbb6f2a73a1a4577d91a43e99fd4426 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 7 Nov 2025 00:04:49 -0800 Subject: [PATCH 6/9] Add goal model and routes; implement CRUD operations and utility functions --- app/__init__.py | 5 +- app/models/goal.py | 23 ++++++++- app/models/task.py | 26 +++++++--- app/routes/goal_routes.py | 54 +++++++++++++++++++- app/routes/route_utilities.py | 36 ++++++++++++++ app/routes/task_routes.py | 92 ++++++++++++++++------------------- tests/test_wave_05.py | 90 ++++++++++++++++------------------ 7 files changed, 219 insertions(+), 107 deletions(-) create mode 100644 app/routes/route_utilities.py diff --git a/app/__init__.py b/app/__init__.py index c729f41ad..4d1284efd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,8 @@ from flask import Flask from .db import db, migrate from .models import task -from .routes.task_routes import tasks_bp +from .routes.task_routes import bp as tasks_bp +from .routes.goal_routes import bp as goals_bp import os def create_app(config=None): @@ -20,5 +21,7 @@ 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..28c7cc5db 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,26 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import String 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 | None] = mapped_column(String(200), nullable=True) + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") + + def to_dict(self) -> dict: + return { + "id": self.id, + "title": self.title, + } + + @classmethod + def from_dict(cls, data: dict): + if "title" not in data: + raise KeyError("title") + return cls( + title=data["title"] + ) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 43e44ce06..127889f05 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,31 +1,45 @@ from datetime import datetime from sqlalchemy import String, Text, DateTime -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey +from typing import Optional from ..db import db +from typing import 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 | None] = mapped_column(String(200), nullable=True) description: Mapped[str | None] = mapped_column(Text, nullable=True) completed_at: Mapped[datetime | None] = mapped_column(DateTime(), 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) -> dict: - return { + task_as_dict = { "id": self.id, "title": self.title, "description": self.description, "is_complete": self.completed_at is not None } + if self.goal: + task_as_dict["goal"] = self.goal.title + task_as_dict["goal_id"] = self.goal.id + return task_as_dict - @staticmethod - def from_dict(data: dict): + @classmethod + def from_dict(cls, data: dict): if "title" not in data: raise KeyError("title") if "description" not in data: raise KeyError("description") - return Task( + task = cls( title=data["title"], description=data["description"], completed_at=None, - ) \ No newline at end of file + ) + if "goal_id" in data: + task.goal_id = data["goal_id"] + return task \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..8ea793b05 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,53 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, Response, request, abort, make_response +from app.models.goal import Goal +from app.models.task import Task +from ..db import db +from .route_utilities import validate_model, create_model, get_models_with_filters + +bp = Blueprint("goals", __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_goals(): + return get_models_with_filters(Goal, request.args) + +@bp.get("/") +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + return goal.to_dict(), 200 + +@bp.put("/") +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + try: + goal.title = request_body["title"] + except KeyError: + return abort(make_response({"details": "Invalid data"}, 400)) + 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 create_task_with_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + request_body["goal_id"] = goal.id + return create_model(Task, request_body) + + +@bp.get("//tasks") +def get_tasks_by_goal(goal_id): + goal = validate_model(Goal, goal_id) + response = [task.to_dict() for task in goal.tasks] + return response \ 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..0ffc12f67 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,36 @@ +from flask import abort, make_response +from ..db import db + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except (TypeError, ValueError): + return abort(make_response({"message": f"{cls.__name__} id {model_id} invalid"}, 400)) + query = db.select(cls).where(cls.id == model_id) + model = db.session.scalar(query) + if not model: + return abort(make_response({"message": f"{cls.__name__} id {model_id} not found"}, 404)) + + return model + + +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + except (KeyError, ValueError): + return abort(make_response({"details": "Invalid data"}, 400)) + db.session.add(new_model) + db.session.commit() + return make_response(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 \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index f6f694b42..6815a17ea 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,52 +1,43 @@ from flask import Blueprint, Response, abort, make_response, request from datetime import datetime from app.models.task import Task +from .route_utilities import validate_model, create_model from ..db import db from sqlalchemy import asc, desc +import os, requests -tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") - -# helpers -def get_task_by_id(task_id): - try: - task_id = int(task_id) - except (TypeError, ValueError): - return abort(make_response({"message": f"Task id {task_id} invalid"}, 400)) - query = db.select(Task).where(Task.id == task_id) - task = db.session.scalar(query) - if not task: - return abort(make_response({"message": f"Task id {task_id} not found"}, 404)) - - return task +SLACK_BOT_TOKEN = os.getenv("SLACK_BOT_TOKEN") +SLACK_CHANNEL_ID = os.getenv("SLACK_CHANNEL_ID") +bp = Blueprint("tasks", __name__, url_prefix="/tasks") -def create_instance_from_dict(data: dict, factory): +def send_slack_message(text: str): + if not SLACK_BOT_TOKEN or not SLACK_CHANNEL_ID: + return try: - instance = factory(data) - except (KeyError, ValueError): - return abort(make_response({"details": "Invalid data"}, 400)) - db.session.add(instance) - db.session.commit() - return instance, 201 - - -def parse_json_object(): - """Return dict or 400 {'details': 'Invalid data'}.""" - data = request.get_json(silent=True) # don’t raise BadRequest on invalid JSON — just return None. - if not isinstance(data, dict): - abort(make_response({"details": "Invalid data"}, 400)) - return data - - -# routes -@tasks_bp.post("") + resp = requests.post( + "https://slack.com/api/chat.postMessage", + headers={ + "Authorization": f"Bearer {SLACK_BOT_TOKEN}", + "Content-Type": "application/json; charset=utf-8", + }, + json={"channel": SLACK_CHANNEL_ID, "text": text}, + timeout=5, + ) + + if resp.status_code != 200 or not resp.json().get("ok", False): + pass + except Exception: + pass + + +@bp.post("") def create_task(): - data = parse_json_object() - task, status = create_instance_from_dict(data, Task.from_dict) - return task.to_dict(), status + request_body = request.get_json() + return create_model(Task, request_body) -@tasks_bp.get("") +@bp.get("") def get_all_tasks(): sort = request.args.get("sort") if sort == "asc": @@ -59,44 +50,45 @@ def get_all_tasks(): return [t.to_dict() for t in tasks], 200 -@tasks_bp.get("/") +@bp.get("/") def get_one_task(task_id): - task = get_task_by_id(task_id) + task = validate_model(Task, task_id) return task.to_dict(), 200 -@tasks_bp.put("/") +@bp.put("/") def update_task(task_id): - task = get_task_by_id(task_id) - data = parse_json_object() + task = validate_model(Task, task_id) + request_body = request.get_json() try: - task.title = data["title"] - task.description = data["description"] + task.title = request_body["title"] + task.description = request_body["description"] except KeyError: return abort(make_response({"details": "Invalid data"}, 400)) db.session.commit() return Response(status=204, mimetype="application/json") -@tasks_bp.delete("/") +@bp.delete("/") def delete_task(task_id): - task = get_task_by_id(task_id) + task = validate_model(Task, task_id) db.session.delete(task) db.session.commit() return Response(status=204, mimetype="application/json") -@tasks_bp.patch("//mark_complete") +@bp.patch("//mark_complete") def mark_complete(task_id): - task = get_task_by_id(task_id) + task = validate_model(Task, task_id) task.completed_at = datetime.now() db.session.commit() + send_slack_message(f"Someone just completed the task {task.title}") return Response(status=204, mimetype="application/json") -@tasks_bp.patch("//mark_incomplete") +@bp.patch("//mark_incomplete") def mark_incomplete(task_id): - task = get_task_by_id(task_id) + task = validate_model(Task, task_id) task.completed_at = None db.session.commit() return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index b7cc330ae..4cb36d5f8 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ 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 +14,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 +26,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 +40,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 +53,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 +64,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 +75,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 +92,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 +106,18 @@ 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 "message" in response_body + assert response_body == {"message": "Goal id 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={ @@ -136,34 +133,37 @@ 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": "Updated Goal Title" + }) # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 204 + query = db.select(Goal).where(Goal.id == 1) + goal = db.session.scalar(query) -@pytest.mark.skip(reason="test to be completed by student") + assert goal.title == "Updated Goal Title" + + +#@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/1", json={ + "title": "Updated Goal 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 "message" in response_body + assert response_body == {"message": "Goal id 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_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -177,28 +177,22 @@ def test_delete_goal(client, one_goal): response_body = response.get_json() assert "message" in response_body - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message": "Goal id 1 not found"} -@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/1") + 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 "message" in response_body + assert response_body == {"message": "Goal id 1 not found"} + assert db.session.scalars(db.select(Goal)).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_goal_missing_title(client): # Act response = client.post("/goals", json={}) From b740126c386e240dc26ec74572729914b2acffc2 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 7 Nov 2025 01:34:28 -0800 Subject: [PATCH 7/9] Refactor task model to use goal_id instead of goal object; update goal routes to handle task associations and improve response structure in task retrieval --- app/models/task.py | 5 ++--- app/routes/goal_routes.py | 20 +++++++++++++++++--- app/routes/task_routes.py | 6 ------ tests/test_wave_06.py | 19 ++++++++----------- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 127889f05..72b72712f 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -24,9 +24,8 @@ def to_dict(self) -> dict: "description": self.description, "is_complete": self.completed_at is not None } - if self.goal: - task_as_dict["goal"] = self.goal.title - task_as_dict["goal_id"] = self.goal.id + if self.goal_id: + task_as_dict["goal_id"] = self.goal_id return task_as_dict @classmethod diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 8ea793b05..99b89986a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -42,12 +42,26 @@ def delete_goal(goal_id): def create_task_with_goal(goal_id): goal = validate_model(Goal, goal_id) request_body = request.get_json() - request_body["goal_id"] = goal.id - return create_model(Task, request_body) + if not isinstance(request_body, dict) or "task_ids" not in request_body or not isinstance(request_body["task_ids"], list): + return abort(make_response({"details": "Invalid data"}, 400)) + + task_ids = request_body["task_ids"] + + tasks = [] + for tid in task_ids: + task = validate_model(Task, tid) + tasks.append(task) + goal.tasks = tasks + db.session.commit() + return {"id": goal.id, "task_ids": task_ids}, 200 @bp.get("//tasks") def get_tasks_by_goal(goal_id): goal = validate_model(Goal, goal_id) - response = [task.to_dict() for task in goal.tasks] + response = { + "id": goal.id, + "title": goal.title, + "tasks": [task.to_dict() for task in goal.tasks], + } return response \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 6815a17ea..b2d4fbb68 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -30,13 +30,11 @@ def send_slack_message(text: str): except Exception: pass - @bp.post("") def create_task(): request_body = request.get_json() return create_model(Task, request_body) - @bp.get("") def get_all_tasks(): sort = request.args.get("sort") @@ -55,7 +53,6 @@ def get_one_task(task_id): task = validate_model(Task, task_id) return task.to_dict(), 200 - @bp.put("/") def update_task(task_id): task = validate_model(Task, task_id) @@ -68,7 +65,6 @@ def update_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") - @bp.delete("/") def delete_task(task_id): task = validate_model(Task, task_id) @@ -76,7 +72,6 @@ def delete_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") - @bp.patch("//mark_complete") def mark_complete(task_id): task = validate_model(Task, task_id) @@ -85,7 +80,6 @@ def mark_complete(task_id): send_slack_message(f"Someone just completed the task {task.title}") return Response(status=204, mimetype="application/json") - @bp.patch("//mark_incomplete") def mark_incomplete(task_id): task = validate_model(Task, task_id) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 727fce93a..c985cc94b 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,11 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body == {"message": "Goal id 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 +74,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 +99,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 d176548c00d2a0b7dfe5f71316637494ea894d21 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 7 Nov 2025 02:18:54 -0800 Subject: [PATCH 8/9] Refactor goal and task models to improve code readability; update route utilities for consistent response structure and error handling in task validation tests --- app/models/goal.py | 1 + app/models/task.py | 1 + app/routes/goal_routes.py | 7 +++++ app/routes/route_utilities.py | 2 +- app/routes/task_routes.py | 25 +++++++++++++++-- tests/test_wave_07.py | 53 +++++++++++++++-------------------- 6 files changed, 56 insertions(+), 33 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 28c7cc5db..22babe54f 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -17,6 +17,7 @@ def to_dict(self) -> dict: "title": self.title, } + @classmethod def from_dict(cls, data: dict): if "title" not in data: diff --git a/app/models/task.py b/app/models/task.py index 72b72712f..249e9b2f0 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -28,6 +28,7 @@ def to_dict(self) -> dict: task_as_dict["goal_id"] = self.goal_id return task_as_dict + @classmethod def from_dict(cls, data: dict): if "title" not in data: diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 99b89986a..5d2b9b124 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -6,20 +6,24 @@ bp = Blueprint("goals", __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_goals(): return get_models_with_filters(Goal, request.args) + @bp.get("/") def get_one_goal(goal_id): goal = validate_model(Goal, goal_id) return goal.to_dict(), 200 + @bp.put("/") def update_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -31,6 +35,7 @@ def update_goal(goal_id): db.session.commit() return Response(status=204, mimetype="application/json") + @bp.delete("/") def delete_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -38,6 +43,7 @@ def delete_goal(goal_id): db.session.commit() return Response(status=204, mimetype="application/json") + @bp.post("//tasks") def create_task_with_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -56,6 +62,7 @@ def create_task_with_goal(goal_id): return {"id": goal.id, "task_ids": task_ids}, 200 + @bp.get("//tasks") def get_tasks_by_goal(goal_id): goal = validate_model(Goal, goal_id) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 0ffc12f67..8c9ca0434 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -21,7 +21,7 @@ def create_model(cls, model_data): return abort(make_response({"details": "Invalid data"}, 400)) db.session.add(new_model) db.session.commit() - return make_response(new_model.to_dict(), 201) + return new_model.to_dict(), 201 def get_models_with_filters(cls, filters=None): diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index b2d4fbb68..aa61410d8 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -11,6 +11,7 @@ bp = Blueprint("tasks", __name__, url_prefix="/tasks") + def send_slack_message(text: str): if not SLACK_BOT_TOKEN or not SLACK_CHANNEL_ID: return @@ -30,11 +31,13 @@ def send_slack_message(text: str): except Exception: pass + @bp.post("") def create_task(): request_body = request.get_json() return create_model(Task, request_body) + @bp.get("") def get_all_tasks(): sort = request.args.get("sort") @@ -53,6 +56,7 @@ def get_one_task(task_id): task = validate_model(Task, task_id) return task.to_dict(), 200 + @bp.put("/") def update_task(task_id): task = validate_model(Task, task_id) @@ -65,6 +69,7 @@ def update_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") + @bp.delete("/") def delete_task(task_id): task = validate_model(Task, task_id) @@ -72,14 +77,30 @@ def delete_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") + @bp.patch("//mark_complete") def mark_complete(task_id): task = validate_model(Task, task_id) - task.completed_at = datetime.now() - db.session.commit() + if task.completed_at: + return Response(status=204, mimetype="application/json") + try: + task.completed_at = datetime.now() + + db.session.commit() + + except Exception as e: + db.session.rollback() + print(f"Database error on committing task {task_id}: {e}") + return Response( + '{"error": "Internal server error"}', + status=500, + mimetype="application/json" + ) + send_slack_message(f"Someone just completed the task {task.title}") return Response(status=204, mimetype="application/json") + @bp.patch("//mark_incomplete") def mark_incomplete(task_id): task = validate_model(Task, task_id) diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py index 7e7cef55a..cc7f074fd 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,21 @@ 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 id One invalid"} - 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") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 404 + assert response.get_json() == {"message": "Task id 4 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_route_utilities_validate_model_with_goal(client, one_goal): #Act goal_1 = validate_model(Goal, 1) @@ -62,29 +58,27 @@ 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") - raise Exception("Complete test with assertion status code and response body") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 400 + assert response.get_json() == {"message": "Goal id One invalid"} -@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) - raise Exception("Complete test with assertion status code and response body") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 404 + assert response.get_json() == {"message": "Goal id 4 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_route_utilities_create_model_with_task(client): #Arrange request_body = { @@ -103,7 +97,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 +114,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 +129,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 +139,6 @@ 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") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 400 + assert response.get_json() == {"details": "Invalid data"} From 45c685794a75440180126f4b1bdf1fe8dd1088d0 Mon Sep 17 00:00:00 2001 From: Nadzeya Nialiubina Date: Fri, 7 Nov 2025 03:02:45 -0800 Subject: [PATCH 9/9] Add Goal model and update task table to include goal_id foreign key --- .../versions/dc8b0a4c0920_adds_goad_model.py | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 migrations/versions/dc8b0a4c0920_adds_goad_model.py diff --git a/migrations/versions/dc8b0a4c0920_adds_goad_model.py b/migrations/versions/dc8b0a4c0920_adds_goad_model.py new file mode 100644 index 000000000..12f5b00b3 --- /dev/null +++ b/migrations/versions/dc8b0a4c0920_adds_goad_model.py @@ -0,0 +1,40 @@ +"""adds Goad model + +Revision ID: dc8b0a4c0920 +Revises: ed2714710226 +Create Date: 2025-11-07 02:43:35.805927 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'dc8b0a4c0920' +down_revision = 'ed2714710226' +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(length=200), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + 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') + + op.drop_table('goal') + # ### end Alembic commands ###