From 5d979031931e6cb3bb1274c327b7c6dbe8d2fb87 Mon Sep 17 00:00:00 2001 From: Jesica Guallpa Date: Tue, 4 Nov 2025 08:16:19 -0800 Subject: [PATCH 1/7] Wave 1 Tests Passed --- app/__init__.py | 2 + app/models/task.py | 35 ++++++++- app/routes/task_routes.py | 100 +++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++++ migrations/env.py | 113 +++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/553de13e76f1_.py | 39 +++++++++ seed.py | 20 +++++ tests/test_wave_01.py | 56 ++++++------- 10 files changed, 408 insertions(+), 32 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/553de13e76f1_.py create mode 100644 seed.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..4d91acfe2 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 .routes.task_routes import task_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(task_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..01825bb3c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,38 @@ from sqlalchemy.orm import Mapped, mapped_column -from ..db import db +from app.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]] + + def to_dict(self): + return{ + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": self.completed_at is not None + } + + @classmethod + def from_dict(cls, task_data): + + is_complete = task_data.get("is_complete", False) + + if is_complete: + completed_at = datetime.now() + else: + completed_at = None + + new_task = cls(title=task_data["title"], + description=task_data["description"], + completed_at=completed_at) + return new_task + + + + # def to_json(self): + # return {} \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..cbd224e56 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,99 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, Response, request +from app.db import db + +from app.models.task import Task + +task_bp = Blueprint("task_bp", __name__, url_prefix= "/tasks") + +#Create a Task: Valid Task With null completed_at +#Create a Task: Invalid Task With Missing Data 400 +@task_bp.post("") +def create_task(): + + request_body = request.get_json() + if not "title" in request_body: + return { + "details": "Invalid data" + }, 400 + + if not "description" in request_body: + return { + "details": "Invalid data" + }, 400 + + new_task = Task.from_dict(request_body) + db.session.add(new_task) + db.session.commit() + + if new_task.completed_at is None: + return new_task.to_dict(), 201 + + +#Get Tasks: Getting Saved Tasks 200 +@task_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 == title_param) + + description_param = request.args.get("description") + if description_param: + query = query.where(Task.description == description_param) + + + tasks = db.session.scalars(query) + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_dict()) + + return tasks_response + + +#Get One Task: One Saved Task 200 +@task_bp.get("/") +def get_one_saved_task(task_id): + task = validate_task(task_id) + return task.to_dict() + +#Update Task 204 +@task_bp.put("/") +def update_a_task(task_id): + task = validate_task(task_id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + db.session.commit() + + return Response(status=204, mimetype="application/json") + +#Delete Task: Deleting a Task 204 +@task_bp.delete("/") +def delete_task(id): + task = validate_task(id) + db.session.delete(task) + db.session.commit() + + return Response(status=204, mimetype="application/json") + + +#No Matching Task: Get, Update, and Delete 404 +#Get Tasks: No Saved Tasks 200 +def validate_task(id): + try: + id = int(id) + except ValueError: + invalid = {"message": f"Task id({id}) is invalid."} + + abort(make_response(invalid, 400)) + + query = db.select(Task).where(Task.id == id) + task = db.session.scalar(query) + + if not task: + not_found = {"message": f"Task with id({id}) not found."} + abort(make_response(not_found, 404)) + + return task \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic,flask_migrate + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..4c9709271 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option('sqlalchemy.url', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=get_metadata(), literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/553de13e76f1_.py b/migrations/versions/553de13e76f1_.py new file mode 100644 index 000000000..28f29a05b --- /dev/null +++ b/migrations/versions/553de13e76f1_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 553de13e76f1 +Revises: +Create Date: 2025-10-30 14:14:36.379816 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '553de13e76f1' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + 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/seed.py b/seed.py new file mode 100644 index 000000000..c78805294 --- /dev/null +++ b/seed.py @@ -0,0 +1,20 @@ + +from app import create_app, db +from app.models.task import Task +from datetime import datetime +from dotenv import load_dotenv +load_dotenv() + +my_app = create_app() +with my_app.app_context(): + db.session.add(Task(title="Plan weekly goals", description="Write down top 3 priorities for the week to stay focused.", completed_at=None)), + db.session.add(Task(title="Go for a morning walk", description="Get some fresh air and move for at least 20 minutes.", completed_at=datetime(2025, 10, 30))), + db.session.add(Task(title="Organize workspace", description="Clean desk and remove distractions to improve productivity.", completed_at=None)), + db.session.add(Task(title="Read a new article about APIs", description="Find one article that explains REST API design best practices.", completed_at=datetime(2025, 10, 28))), + db.session.add(Task(title="Build Task List API", description="Create endpoints for adding, reading, updating, and deleting tasks.", completed_at=None)), + db.session.add(Task(title="Test API with Postman", description="Send requests to verify all CRUD routes are working as expected.", completed_at=None)), + db.session.add(Task(title="Reflect on progress", description="Take 10 minutes to write what went well this week and what can improve.", completed_at=None)), + db.session.add(Task(title="Share project with a friend", description="Ask for feedback on your Task List API and explain how it works.", completed_at=datetime(2025, 10, 31))), + db.session.add(Task(title="Backup project files", description="Save project to GitHub and verify all files are pushed correctly.", completed_at=None)), + db.session.add(Task(title="Celebrate small wins", description="Take a break, enjoy a treat, and recognize your hard work.", completed_at=None)), + db.session.commit() \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index fac95a0a3..2a2e67f7d 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") #EDIT def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -149,13 +149,12 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "message": "Task with 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_task(client): # Act response = client.post("/tasks", json={ @@ -181,7 +180,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 +200,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") #EDIT def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -212,14 +211,12 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "message": "Task with 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 +227,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") #EDIT def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -239,15 +236,14 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "message": "Task with 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 +260,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 92acc690958f084fa89ab8e2af93ba2251ff12a3 Mon Sep 17 00:00:00 2001 From: Jesica Guallpa Date: Wed, 5 Nov 2025 08:45:24 -0800 Subject: [PATCH 2/7] Wave 2 Tests Passed --- app/routes/task_routes.py | 9 ++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index cbd224e56..0d972abb0 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -32,7 +32,7 @@ def create_task(): #Get Tasks: Getting Saved Tasks 200 @task_bp.get("") def get_all_tasks(): - query = db.select(Task).order_by(Task.id) + query = db.select(Task) title_param = request.args.get("title") if title_param: @@ -41,6 +41,13 @@ def get_all_tasks(): description_param = request.args.get("description") if description_param: query = query.where(Task.description == description_param) + + sort_param = request.args.get("sort", "asc") + + if sort_param == "desc": + query = query.order_by(Task.title.desc()) + else: + query = query.order_by(Task.title.asc()) tasks = db.session.scalars(query) 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 e6daa55c974b4f34229d29a4882f977df2031048 Mon Sep 17 00:00:00 2001 From: Jesica Guallpa Date: Wed, 5 Nov 2025 13:38:34 -0800 Subject: [PATCH 3/7] Wave 2 Tests Passed --- app/routes/task_routes.py | 62 +++++++++++++++++++++++++++++++++++++-- tests/test_wave_03.py | 32 ++++++++++---------- 2 files changed, 76 insertions(+), 18 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index cbd224e56..9d39c8cf9 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,6 @@ from flask import Blueprint, abort, make_response, Response, request from app.db import db - +from datetime import datetime from app.models.task import Task task_bp = Blueprint("task_bp", __name__, url_prefix= "/tasks") @@ -96,4 +96,62 @@ def validate_task(id): not_found = {"message": f"Task with id({id}) not found."} abort(make_response(not_found, 404)) - return task \ No newline at end of file + return task + +#Mark Complete on an Incomplete Task +#PATCH request to /tasks/1/mark_complete: 204 No Content +@task_bp.patch("//mark_complete") +def mark_complete_on_incomplete_task(task_id): + task = validate_task(task_id) + task.completed_at = datetime.now() + db.session.commit() + return Response(status=204, mimetype="application/json") + +# #Mark Incomplete on a Completed Task +# #PATCH request to /tasks/1/mark_incomplete +@task_bp.patch("//mark_incomplete") +def mark_incomplete_on_complete_task(task_id): + task = validate_task(task_id) + task.completed_at = None + db.session.commit() + return Response(status=204, mimetype="application/json") + + +# #Mark Complete on a Completed Task +# #PATCH request to /tasks/1/mark_complete: 204 OK +@task_bp.patch("//mark_complete") +def mark_complete_on_completed_task(task_id): + task = validate_task(task_id) + if task.completed_at is None: + task.completed_at = datetime.now() + db.session.commit() + return Response(status=204, mimetype="application/json") + +# #Mark Incomplete on an Incomplete Task +# #PATCH request to /tasks/1/mark_incomplete +@task_bp.patch("//mark_incomplete") +def mark_incomplete_on_incomplete_task(task_id): + task = validate_task(task_id) + if task.completed_at is not None: + task.completed_at = None + db.session.commit() + return Response(status=204, mimetype="application/json") + + +# #Mark Complete and Mark Incomplete for Missing Tasks +# #PATCH request to /tasks/1/mark_complete or a PATCH request to /tasks/1/mark_incomplete: 404 Not Found +@task_bp.patch("/tasks//mark_complete") +def test_mark_complete_missing_task(task_id): + task = validate_task(task_id) + if task.completed_at is None: + task.completed_at = datetime.now() + db.session.commit() + return Response(status=204, mimetype="application/json") + +@task_bp.patch("/tasks//mark_incomplete") +def mark_incomplete_missing_task(task_id): + task = validate_task(task_id) + if task.completed_at is not None: + 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..35b784d92 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 response_body == { + "message": "Task with 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") @@ -110,7 +108,9 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "message": "Task with id(1) not found." + } + + + From 24d88fdb865650c8792c47c270645155f262e037 Mon Sep 17 00:00:00 2001 From: Jesica Guallpa Date: Wed, 5 Nov 2025 16:22:15 -0800 Subject: [PATCH 4/7] Wave 5 passed --- app/__init__.py | 2 + app/models/goal.py | 12 +++ app/routes/goal_routes.py | 92 +++++++++++++++++- .../versions/d50b931bf109_add_goal_model.py | 32 +++++++ tests/test_wave_05.py | 94 ++++++++++--------- 5 files changed, 185 insertions(+), 47 deletions(-) create mode 100644 migrations/versions/d50b931bf109_add_goal_model.py diff --git a/app/__init__.py b/app/__init__.py index 4d91acfe2..ce8cfbe5b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from .db import db, migrate from .models import task, goal from .routes.task_routes import task_bp +from .routes.goal_routes import goal_bp import os def create_app(config=None): @@ -20,5 +21,6 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(task_bp) + app.register_blueprint(goal_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..0e2ac1b10 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,15 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + + def to_dict(self): + return{ + "id": self.id, + "title": self.title, + } + + @classmethod + def from_dict(cls, goal_data): + new_goal = cls(title=goal_data["title"]) + return new_goal diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..fd7b0b7e3 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,91 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, Response, request +from app.db import db +from app.models.goal import Goal + +goal_bp = Blueprint("goal_bp", __name__, url_prefix= "/goals") +#Create a Goal: Invalid Goal With Missing Title: 400 +#Create a Goal: Valid Goal: 201 +@goal_bp.post("") +def create_new_goal(): + request_body = request.get_json() + if not "title" in request_body: + return { + "details": "Invalid data" + }, 400 + + try: + new_goal = Goal.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_goal) + db.session.commit() + return new_goal.to_dict(), 201 + +#Get Goals: Getting Saved Goals:200 +@goal_bp.get("") +def get_all_goals(): + query = db.select(Goal).order_by(Goal.id) + + title_param = request.args.get("title") + if title_param: + query = query.where(Goal.title == title_param) + goals = db.session.scalars(query) + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict()) + + return goals_response + +# #Get Goals: No Saved Goals: 200 + +# @goal_bp.get("") +# def get_no_saved_goals(): +# goal = validate_task() +# return goal.to_dict() + + +#Get One Goal: One Saved Goal: 200 +@goal_bp.get("/") +def get_one_saved_goal(goal_id): + goal = validate_task(goal_id) + return goal.to_dict() + +#Update Goal: 204 +@goal_bp.put("/") +def update_goal(goal_id): + goal = validate_task(goal_id) + request_body = request.get_json() + + goal.title = request_body["title"] + db.session.commit() + return Response(status=204, mimetype="application/json") + +#Delete Goal: Deleting a Goal: 204 +@goal_bp.delete("/") +def delete_goal(goal_id): + goal = validate_task(goal_id) + db.session.delete(goal) + db.session.commit() + return Response(status=204, mimetype="application/json") + + +#No matching Goal: Get, Update, and Delete:404 +def validate_task(id): + try: + id = int(id) + except ValueError: + invalid = {"message": f"Goal id({id}) is invalid."} + + abort(make_response(invalid, 400)) + + query = db.select(Goal).where(Goal.id == id) + goal = db.session.scalar(query) + + if not goal: + not_found = {"message": f"Goal with id({id}) not found."} + abort(make_response(not_found, 404)) + + return goal \ No newline at end of file diff --git a/migrations/versions/d50b931bf109_add_goal_model.py b/migrations/versions/d50b931bf109_add_goal_model.py new file mode 100644 index 000000000..e6672f437 --- /dev/null +++ b/migrations/versions/d50b931bf109_add_goal_model.py @@ -0,0 +1,32 @@ +"""add Goal model + +Revision ID: d50b931bf109 +Revises: 553de13e76f1 +Create Date: 2025-11-05 14:46:39.856838 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd50b931bf109' +down_revision = '553de13e76f1' +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/tests/test_wave_05.py b/tests/test_wave_05.py index b7cc330ae..8d798d93a 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,21 @@ 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") Edit def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == { + "message": "Goal with 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 +136,36 @@ 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") Edit def test_update_goal(client, one_goal): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + # Act + response = client.put("/goals/1", json={ + "title": "Build a habit of going outside daily" + }) # 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) + assert goal.title == "Build a habit of going outside daily" + -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") Edit def test_update_goal_not_found(client): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Task Title" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == { + "message": "Goal with 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") Edit def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -177,28 +179,28 @@ def test_delete_goal(client, one_goal): response_body = response.get_json() assert "message" in response_body + query = db.select(Goal).where(Goal.id == 1) + assert db.session.scalar(query) == None - 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") Edit 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 response_body == { + "message": "Goal with 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 ab4235b770847b3cf3275a21a8ebe279ea569e35 Mon Sep 17 00:00:00 2001 From: Jesica Guallpa Date: Thu, 6 Nov 2025 12:41:36 -0800 Subject: [PATCH 5/7] Wave 6&7 Refactored --- app/__init__.py | 6 +- app/models/goal.py | 18 +- app/models/task.py | 21 +- app/routes/goal_routes.py | 149 +++++++++---- app/routes/route_utilities.py | 48 +++++ app/routes/task_routes.py | 204 ++++++++---------- ...4_adds_goal_model_and_creates_a_one_to_.py | 34 +++ seed.py | 137 +++++++++++- tests/test_wave_06.py | 17 +- tests/test_wave_07.py | 57 +++-- 10 files changed, 466 insertions(+), 225 deletions(-) create mode 100644 app/routes/route_utilities.py create mode 100644 migrations/versions/473292c27d74_adds_goal_model_and_creates_a_one_to_.py diff --git a/app/__init__.py b/app/__init__.py index ce8cfbe5b..b798dab2c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +1,8 @@ from flask import Flask from .db import db, migrate -from .models import task, goal -from .routes.task_routes import task_bp -from .routes.goal_routes import goal_bp +#from .models import task, goal +from .routes.task_routes import bp as task_bp +from .routes.goal_routes import bp as goal_bp import os def create_app(config=None): diff --git a/app/models/goal.py b/app/models/goal.py index 0e2ac1b10..035292cf1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,16 +1,26 @@ -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): - return{ - "id": self.id, - "title": self.title, + goal_dict = { + "id": self.id, + "title": self.title } + # if self.tasks: + # goal_dict["tasks_ids"] = [task.id for task in self.tasks] + + return goal_dict + @classmethod def from_dict(cls, goal_data): new_goal = cls(title=goal_data["title"]) diff --git a/app/models/task.py b/app/models/task.py index 01825bb3c..e719f5af5 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,21 +1,32 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column,relationship from app.db import db +from sqlalchemy import ForeignKey from datetime import datetime from typing import Optional +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] description: Mapped[str] completed_at: Mapped[Optional[datetime]] + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") + def to_dict(self): - return{ - "id": self.id, + task_dict = { + "id": self.id, "title": self.title, "description": self.description, "is_complete": self.completed_at is not None - } + } + if self.goal_id is not None: + task_dict["goal_id"] = self.goal_id + + return task_dict @classmethod def from_dict(cls, task_data): @@ -34,5 +45,3 @@ def from_dict(cls, task_data): - # def to_json(self): - # return {} \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index fd7b0b7e3..2d25abc0a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,11 +1,14 @@ from flask import Blueprint, abort, make_response, Response, request from app.db import db from app.models.goal import Goal +from app.models.task import Task +from .route_utilities import create_model, get_models_with_filters, validate_model -goal_bp = Blueprint("goal_bp", __name__, url_prefix= "/goals") + +bp = Blueprint("goal_bp", __name__, url_prefix= "/goals") #Create a Goal: Invalid Goal With Missing Title: 400 #Create a Goal: Valid Goal: 201 -@goal_bp.post("") +@bp.post("") def create_new_goal(): request_body = request.get_json() if not "title" in request_body: @@ -13,31 +16,12 @@ def create_new_goal(): "details": "Invalid data" }, 400 - try: - new_goal = Goal.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_goal) - db.session.commit() - return new_goal.to_dict(), 201 - + return create_model(Goal, request_body) #Get Goals: Getting Saved Goals:200 -@goal_bp.get("") +@bp.get("") def get_all_goals(): - query = db.select(Goal).order_by(Goal.id) + return get_models_with_filters(Goal, request.args) - title_param = request.args.get("title") - if title_param: - query = query.where(Goal.title == title_param) - goals = db.session.scalars(query) - goals_response = [] - for goal in goals: - goals_response.append(goal.to_dict()) - - return goals_response # #Get Goals: No Saved Goals: 200 @@ -48,15 +32,15 @@ def get_all_goals(): #Get One Goal: One Saved Goal: 200 -@goal_bp.get("/") +@bp.get("/") def get_one_saved_goal(goal_id): - goal = validate_task(goal_id) + goal = validate_model(Goal, goal_id) return goal.to_dict() #Update Goal: 204 -@goal_bp.put("/") +@bp.put("/") def update_goal(goal_id): - goal = validate_task(goal_id) + goal = validate_model(Goal, goal_id) request_body = request.get_json() goal.title = request_body["title"] @@ -64,28 +48,105 @@ def update_goal(goal_id): return Response(status=204, mimetype="application/json") #Delete Goal: Deleting a Goal: 204 -@goal_bp.delete("/") +@bp.delete("/") def delete_goal(goal_id): - goal = validate_task(goal_id) + goal = validate_model(Goal, goal_id) db.session.delete(goal) db.session.commit() return Response(status=204, mimetype="application/json") -#No matching Goal: Get, Update, and Delete:404 -def validate_task(id): - try: - id = int(id) - except ValueError: - invalid = {"message": f"Goal id({id}) is invalid."} +# #Sending a List of Task IDs to a Goal: 200 OK +# @bp.post("//tasks") +# def create_tasks_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) +# #Getting Tasks of One Goal: 200 OK +# @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 +# #Getting Tasks of One Goal: No Matching Tasks: 200 OK +# @bp.get("//tasks") +# def get_tasks_for_specific_goal_no_matching_tasks(goal_id): +# pass + +# #Getting Tasks of One Goal: No Matching Goal: 404 Not Found +# @bp.get("//tasks") +# def get_tasks_for_specific_goal_no_goal(): +# pass + +#POST /goals//tasks +@bp.post("//tasks") +def create_tasks_with_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + task_ids = request_body.get("task_ids", []) + + for task in goal.tasks: + task.goal_id = None - abort(make_response(invalid, 400)) + tasks = [] + for task_id in task_ids: + task = validate_model(Task, task_id) + task.goal_id = goal.id + tasks.append(task) - query = db.select(Goal).where(Goal.id == id) - goal = db.session.scalar(query) + db.session.commit() - if not goal: - not_found = {"message": f"Goal with id({id}) not found."} - abort(make_response(not_found, 404)) - - return goal \ No newline at end of file + response = { + "id": goal.id, + "task_ids": [task.id for task in tasks] + } + return response, 200 + +# GET /goals//tasks +# Case 1: Goal exists and has tasks +@bp.get("//tasks") +def get_tasks_by_goal(goal_id): + goal = validate_model(Goal, goal_id) + result = { + "id": goal.id, + "title": goal.title, + "tasks": [] + } + + for task in goal.tasks: + task_dict = task.to_dict() # returns id, title, description, is_complete + if task.goal_id: + task_dict.update({"goal_id": task.goal_id}) + result["tasks"].append(task_dict) + + return result + + +# GET /goals//tasks/no_tasks +# Case 2: Goal exists but has no tasks +@bp.get("//tasks/no_tasks") +def get_tasks_for_goal_no_tasks(goal_id): + goal = validate_model(Goal, goal_id) + # tasks will be empty + response = { + "id": goal.id, + "title": goal.title, + "tasks": [] + } + return response, 200 + + +# GET /goals//tasks/missing_goal +# Case 3: Goal does not exist +@bp.get("//tasks/missing_goal") +def get_tasks_for_missing_goal(goal_id): + # This will automatically return 404 via validate_model + goal = validate_model(Goal, goal_id) + # If somehow reached here, just return empty tasks + response = { + "id": goal.id, + "title": goal.title, + "tasks": [] + } + return response, 200 diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..116b1b671 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,48 @@ +from flask import abort, make_response +from ..db import db + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + response = {"message": f"{cls.__name__} {model_id} invalid"} + abort(make_response(response , 400)) + + query = db.select(cls).where(cls.id == model_id) + model = db.session.scalar(query) + + if not model: + response = {"message": f"{cls.__name__} with id({model_id}) not found."} + abort(make_response(response, 404)) + + return model + +def create_model(cls, model_data, status_code=201): + 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(), status_code + +def get_models_with_filters(cls, filters=None, sort=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}%")) + # Add optional sorting + if sort == "desc": + query = query.order_by(cls.title.desc()) + else: + query = query.order_by(cls.title.asc()) + + 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 48c63ab31..dc178da46 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,72 +2,42 @@ from app.db import db from datetime import datetime from app.models.task import Task +from .route_utilities import create_model, get_models_with_filters, validate_model -task_bp = Blueprint("task_bp", __name__, url_prefix= "/tasks") +bp = Blueprint("task_bp", __name__, url_prefix= "/tasks") #Create a Task: Valid Task With null completed_at #Create a Task: Invalid Task With Missing Data 400 -@task_bp.post("") +@bp.post("") def create_task(): - request_body = request.get_json() - if not "title" in request_body: - return { - "details": "Invalid data" - }, 400 - - if not "description" in request_body: - return { - "details": "Invalid data" - }, 400 - - new_task = Task.from_dict(request_body) - db.session.add(new_task) - db.session.commit() - - if new_task.completed_at is None: - return new_task.to_dict(), 201 - + return create_model(Task, request_body) #Get Tasks: Getting Saved Tasks 200 -@task_bp.get("") +@bp.get("") def get_all_tasks(): - query = db.select(Task) - - title_param = request.args.get("title") - if title_param: - query = query.where(Task.title == title_param) - - description_param = request.args.get("description") - if description_param: - query = query.where(Task.description == description_param) - - sort_param = request.args.get("sort", "asc") - - if sort_param == "desc": - query = query.order_by(Task.title.desc()) - else: - query = query.order_by(Task.title.asc()) - + filters = {} + title = request.args.get("title") + description = request.args.get("description") + sort = request.args.get("sort", "asc") - tasks = db.session.scalars(query) - tasks_response = [] - for task in tasks: - tasks_response.append(task.to_dict()) - - return tasks_response + if title: + filters["title"] = title + if description: + filters["description"] = description + return get_models_with_filters(Task, filters, sort) #Get One Task: One Saved Task 200 -@task_bp.get("/") +@bp.get("/") def get_one_saved_task(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) return task.to_dict() #Update Task 204 -@task_bp.put("/") +@bp.put("/") def update_a_task(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) request_body = request.get_json() task.title = request_body["title"] @@ -77,88 +47,92 @@ def update_a_task(task_id): return Response(status=204, mimetype="application/json") #Delete Task: Deleting a Task 204 -@task_bp.delete("/") +@bp.delete("/") def delete_task(id): - task = validate_task(id) + task = validate_model(Task,id) db.session.delete(task) db.session.commit() return Response(status=204, mimetype="application/json") +# PATCH /tasks//mark_complete +@bp.patch("//mark_complete") +def mark_complete(task_id): + """Marks a task as complete, regardless of its current state.""" + task = validate_model(Task, task_id) -#No Matching Task: Get, Update, and Delete 404 -#Get Tasks: No Saved Tasks 200 -def validate_task(id): - try: - id = int(id) - except ValueError: - invalid = {"message": f"Task id({id}) is invalid."} - - abort(make_response(invalid, 400)) - - query = db.select(Task).where(Task.id == id) - task = db.session.scalar(query) - - if not task: - not_found = {"message": f"Task with id({id}) not found."} - abort(make_response(not_found, 404)) - - return task - -#Mark Complete on an Incomplete Task -#PATCH request to /tasks/1/mark_complete: 204 No Content -@task_bp.patch("//mark_complete") -def mark_complete_on_incomplete_task(task_id): - task = validate_task(task_id) - task.completed_at = datetime.now() - db.session.commit() - return Response(status=204, mimetype="application/json") + if task.completed_at is None: + task.completed_at = datetime.now() -# #Mark Incomplete on a Completed Task -# #PATCH request to /tasks/1/mark_incomplete -@task_bp.patch("//mark_incomplete") -def mark_incomplete_on_complete_task(task_id): - task = validate_task(task_id) - task.completed_at = None db.session.commit() return Response(status=204, mimetype="application/json") -# #Mark Complete on a Completed Task -# #PATCH request to /tasks/1/mark_complete: 204 OK -@task_bp.patch("//mark_complete") -def mark_complete_on_completed_task(task_id): - task = validate_task(task_id) - if task.completed_at is None: - task.completed_at = datetime.now() - db.session.commit() - return Response(status=204, mimetype="application/json") +# PATCH /tasks//mark_incomplete +@bp.patch("//mark_incomplete") +def mark_incomplete(task_id): + task = validate_model(Task, task_id) -# #Mark Incomplete on an Incomplete Task -# #PATCH request to /tasks/1/mark_incomplete -@task_bp.patch("//mark_incomplete") -def mark_incomplete_on_incomplete_task(task_id): - task = validate_task(task_id) if task.completed_at is not None: - task.completed_at = None + task.completed_at = None + db.session.commit() return Response(status=204, mimetype="application/json") - -# #Mark Complete and Mark Incomplete for Missing Tasks -# #PATCH request to /tasks/1/mark_complete or a PATCH request to /tasks/1/mark_incomplete: 404 Not Found -@task_bp.patch("/tasks//mark_complete") -def test_mark_complete_missing_task(task_id): - task = validate_task(task_id) - if task.completed_at is None: - task.completed_at = datetime.now() - db.session.commit() - return Response(status=204, mimetype="application/json") +# #Mark Complete on an Incomplete Task +# #PATCH request to /tasks/1/mark_complete: 204 No Content +# @task_bp.patch("//mark_complete") +# def mark_complete_on_incomplete_task(task_id): +# task = validate_model(Task,task_id) +# task.completed_at = datetime.now() +# db.session.commit() +# return Response(status=204, mimetype="application/json") + +# # #Mark Incomplete on a Completed Task +# # #PATCH request to /tasks/1/mark_incomplete +# @task_bp.patch("//mark_incomplete") +# def mark_incomplete_on_complete_task(task_id): +# task = validate_model(Task,task_id) +# task.completed_at = None +# db.session.commit() +# return Response(status=204, mimetype="application/json") + + +# # #Mark Complete on a Completed Task +# # #PATCH request to /tasks/1/mark_complete: 204 OK +# @task_bp.patch("//mark_complete") +# def mark_complete_on_completed_task(task_id): +# task = validate_model(Task,task_id) +# if task.completed_at is None: +# task.completed_at = datetime.now() +# db.session.commit() +# return Response(status=204, mimetype="application/json") + +# # #Mark Incomplete on an Incomplete Task +# # #PATCH request to /tasks/1/mark_incomplete +# @task_bp.patch("//mark_incomplete") +# def mark_incomplete_on_incomplete_task(task_id): +# task = validate_model(Task,task_id) +# if task.completed_at is not None: +# task.completed_at = None +# db.session.commit() +# return Response(status=204, mimetype="application/json") + + +# # #Mark Complete and Mark Incomplete for Missing Tasks +# # #PATCH request to /tasks/1/mark_complete or a PATCH request to /tasks/1/mark_incomplete: 404 Not Found +# @task_bp.patch("/tasks//mark_complete") +# def test_mark_complete_missing_task(task_id): +# task = validate_model(Task,task_id) +# if task.completed_at is None: +# task.completed_at = datetime.now() +# db.session.commit() +# return Response(status=204, mimetype="application/json") -@task_bp.patch("/tasks//mark_incomplete") -def mark_incomplete_missing_task(task_id): - task = validate_task(task_id) - if task.completed_at is not None: - task.completed_at = None - db.session.commit() - return Response(status=204, mimetype="application/json") \ No newline at end of file +# @task_bp.patch("/tasks//mark_incomplete") +# def mark_incomplete_missing_task(task_id): +# task = validate_model(Task, task_id) +# if task.completed_at is not None: +# task.completed_at = None +# db.session.commit() +# return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/migrations/versions/473292c27d74_adds_goal_model_and_creates_a_one_to_.py b/migrations/versions/473292c27d74_adds_goal_model_and_creates_a_one_to_.py new file mode 100644 index 000000000..a514949ee --- /dev/null +++ b/migrations/versions/473292c27d74_adds_goal_model_and_creates_a_one_to_.py @@ -0,0 +1,34 @@ +"""Adds Goal model and creates a one to many relationship between the Goal and Task models. Adds goal_routes.py and associated testing file. Refactors creating models and filtering models to model_utilities.py. + +Revision ID: 473292c27d74 +Revises: d50b931bf109 +Create Date: 2025-11-05 21:11:23.643256 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '473292c27d74' +down_revision = 'd50b931bf109' +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/seed.py b/seed.py index c78805294..93d9ec443 100644 --- a/seed.py +++ b/seed.py @@ -1,20 +1,135 @@ from app import create_app, db from app.models.task import Task +from app.models.goal import Goal from datetime import datetime from dotenv import load_dotenv load_dotenv() +goals = [ + { + "title": "Health and Wellness", + "tasks": [ + { + "title": "Go for a morning walk", + "description": "Get some fresh air and move for at least 20 minutes.", + "completed_at": datetime(2025, 10, 30) + }, + { + "title": "Drink more water", + "description": "Aim for 8 glasses of water throughout the day.", + "completed_at": None + }, + { + "title": "Stretch before bed", + "description": "Spend 10 minutes doing light stretches to improve sleep.", + "completed_at": None + } + ] + }, + { + "title": "Professional Growth", + "tasks": [ + { + "title": "Read a new article about APIs", + "description": "Find one article that explains REST API design best practices.", + "completed_at": datetime(2025, 10, 28) + }, + { + "title": "Build Task List API", + "description": "Create endpoints for adding, reading, updating, and deleting tasks.", + "completed_at": None + }, + { + "title": "Test API with Postman", + "description": "Send requests to verify all CRUD routes are working as expected.", + "completed_at": None + } + ] + }, + { + "title": "Personal Development", + "tasks": [ + { + "title": "Plan weekly goals", + "description": "Write down top 3 priorities for the week to stay focused.", + "completed_at": None + }, + { + "title": "Reflect on progress", + "description": "Take 10 minutes to write what went well this week and what can improve.", + "completed_at": None + }, + { + "title": "Celebrate small wins", + "description": "Take a break, enjoy a treat, and recognize your hard work.", + "completed_at": None + } + ] + } +] + +# Tasks not tied to a goal +independent_tasks = [ + { + "title": "Share project with a friend", + "description": "Ask for feedback on your Task List API and explain how it works.", + "completed_at": datetime(2025, 10, 31) + }, + { + "title": "Backup project files", + "description": "Save project to GitHub and verify all files are pushed correctly.", + "completed_at": None + } +] + + +# --- HELPER FUNCTION --- + +def get_model_by_field(cls, data_dict, key_name): + """Prevent duplicate entries by checking if a record already exists by a unique field.""" + value = data_dict[key_name] + stmt = db.select(cls).where(getattr(cls, key_name) == value) + return db.session.scalar(stmt) + + +# --- SEED LOGIC --- + +load_dotenv() my_app = create_app() + with my_app.app_context(): - db.session.add(Task(title="Plan weekly goals", description="Write down top 3 priorities for the week to stay focused.", completed_at=None)), - db.session.add(Task(title="Go for a morning walk", description="Get some fresh air and move for at least 20 minutes.", completed_at=datetime(2025, 10, 30))), - db.session.add(Task(title="Organize workspace", description="Clean desk and remove distractions to improve productivity.", completed_at=None)), - db.session.add(Task(title="Read a new article about APIs", description="Find one article that explains REST API design best practices.", completed_at=datetime(2025, 10, 28))), - db.session.add(Task(title="Build Task List API", description="Create endpoints for adding, reading, updating, and deleting tasks.", completed_at=None)), - db.session.add(Task(title="Test API with Postman", description="Send requests to verify all CRUD routes are working as expected.", completed_at=None)), - db.session.add(Task(title="Reflect on progress", description="Take 10 minutes to write what went well this week and what can improve.", completed_at=None)), - db.session.add(Task(title="Share project with a friend", description="Ask for feedback on your Task List API and explain how it works.", completed_at=datetime(2025, 10, 31))), - db.session.add(Task(title="Backup project files", description="Save project to GitHub and verify all files are pushed correctly.", completed_at=None)), - db.session.add(Task(title="Celebrate small wins", description="Take a break, enjoy a treat, and recognize your hard work.", completed_at=None)), - db.session.commit() \ No newline at end of file + + # Create Goals and their Tasks + for goal_data in goals: + goal = get_model_by_field(Goal, goal_data, "title") + if not goal: + goal = Goal(title=goal_data["title"]) + db.session.add(goal) + db.session.flush() # get goal.id before creating tasks + + for task_data in goal_data["tasks"]: + task = get_model_by_field(Task, task_data, "title") + if not task: + task = Task( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data["completed_at"], + goal_id=goal.id + ) + db.session.add(task) + + # Add independent (no goal) tasks + for task_data in independent_tasks: + task = get_model_by_field(Task, task_data, "title") + if not task: + task = Task( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data["completed_at"], + goal_id=None + ) + db.session.add(task) + + db.session.commit() + print("✅ Database successfully seeded with goals and tasks!") diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 727fce93a..062814364 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") #Edit 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 response_body == {"message": "Goal with 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() diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py index 7e7cef55a..d92d262d8 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,19 @@ 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.status == "400 BAD REQUEST" - 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.response + assert response.status == "404 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 +56,29 @@ 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") Edit 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.status == "400 BAD REQUEST" - 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") Edit 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.status == "404 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_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") Edit 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 fd35ba472437505f75035425a29417194725ecfc Mon Sep 17 00:00:00 2001 From: Jesica Guallpa Date: Thu, 6 Nov 2025 14:38:26 -0800 Subject: [PATCH 6/7] More refactoring --- app/models/goal.py | 6 +-- app/routes/goal_routes.py | 71 ++++++++++++++++------------------- app/routes/route_utilities.py | 3 -- tests/test_wave_05.py | 1 - 4 files changed, 34 insertions(+), 47 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 035292cf1..a64747e73 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -15,10 +15,8 @@ def to_dict(self): "id": self.id, "title": self.title } - - # if self.tasks: - # goal_dict["tasks_ids"] = [task.id for task in self.tasks] - + if self.tasks: + goal_dict["tasks"] = [task.to_dict() for task in self.tasks] return goal_dict @classmethod diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 2d25abc0a..0a8658891 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -103,50 +103,43 @@ def create_tasks_with_goal(goal_id): } return response, 200 -# GET /goals//tasks -# Case 1: Goal exists and has tasks @bp.get("//tasks") -def get_tasks_by_goal(goal_id): +def get_tasks_for_missing_goal(goal_id): goal = validate_model(Goal, goal_id) - result = { - "id": goal.id, - "title": goal.title, - "tasks": [] - } + response = goal.to_dict() - for task in goal.tasks: - task_dict = task.to_dict() # returns id, title, description, is_complete - if task.goal_id: - task_dict.update({"goal_id": task.goal_id}) - result["tasks"].append(task_dict) + if not goal.tasks: + response["tasks"] = [] + return response, 200 - return result +# GET /goals//tasks +# Case 1: Goal exists and has tasks +# @bp.get("//tasks") +# def get_tasks_by_goal(goal_id): +# goal = validate_model(Goal, goal_id) +# return goal.to_dict(), 200 -# GET /goals//tasks/no_tasks -# Case 2: Goal exists but has no tasks -@bp.get("//tasks/no_tasks") -def get_tasks_for_goal_no_tasks(goal_id): - goal = validate_model(Goal, goal_id) - # tasks will be empty - response = { - "id": goal.id, - "title": goal.title, - "tasks": [] - } - return response, 200 +# # GET /goals//tasks/no_tasks +# # Case 2: Goal exists but has no tasks +# @bp.get("//tasks/no_tasks") +# def get_tasks_for_goal_no_tasks(goal_id): +# goal = validate_model(Goal, goal_id) +# return goal.to_dict(), 200 -# GET /goals//tasks/missing_goal -# Case 3: Goal does not exist -@bp.get("//tasks/missing_goal") -def get_tasks_for_missing_goal(goal_id): - # This will automatically return 404 via validate_model - goal = validate_model(Goal, goal_id) - # If somehow reached here, just return empty tasks - response = { - "id": goal.id, - "title": goal.title, - "tasks": [] - } - return response, 200 +# # GET /goals//tasks/missing_goal +# # Case 3: Goal does not exist +# @bp.get("//tasks/missing_goal") +# def get_tasks_for_missing_goal(goal_id): +# goal = validate_model(Goal, goal_id) +# response = goal.to_dict() + +# if not goal.tasks: +# response["tasks"] = [] +# # response = { +# # "id": goal.id, +# # "title": goal.title, +# # "tasks": [] +# # } +# return response, 200 diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 116b1b671..d10b881a8 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -14,7 +14,6 @@ def validate_model(cls, model_id): if not model: response = {"message": f"{cls.__name__} with id({model_id}) not found."} abort(make_response(response, 404)) - return model def create_model(cls, model_data, status_code=201): @@ -27,7 +26,6 @@ def create_model(cls, model_data, status_code=201): db.session.add(new_model) db.session.commit() - return new_model.to_dict(), status_code def get_models_with_filters(cls, filters=None, sort=None): @@ -37,7 +35,6 @@ def get_models_with_filters(cls, filters=None, sort=None): for attribute, value in filters.items(): if hasattr(cls, attribute): query = query.where(getattr(cls, attribute).ilike(f"%{value}%")) - # Add optional sorting if sort == "desc": query = query.order_by(cls.title.desc()) else: diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 8d798d93a..b8b3d04bf 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -91,7 +91,6 @@ def test_get_goals_one_saved_goal(client, one_goal): } ] - #@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act From 68c7d4d361d2f3360c04582060d51d9d5b0e43df Mon Sep 17 00:00:00 2001 From: Jesica Guallpa Date: Thu, 6 Nov 2025 21:39:25 -0800 Subject: [PATCH 7/7] Wave 4 complete --- app/routes/goal_routes.py | 73 +---------------------------------- app/routes/task_routes.py | 81 ++++++--------------------------------- 2 files changed, 14 insertions(+), 140 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 0a8658891..678aefa03 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -6,8 +6,7 @@ bp = Blueprint("goal_bp", __name__, url_prefix= "/goals") -#Create a Goal: Invalid Goal With Missing Title: 400 -#Create a Goal: Valid Goal: 201 + @bp.post("") def create_new_goal(): request_body = request.get_json() @@ -17,27 +16,16 @@ def create_new_goal(): }, 400 return create_model(Goal, request_body) -#Get Goals: Getting Saved Goals:200 + @bp.get("") def get_all_goals(): return get_models_with_filters(Goal, request.args) - -# #Get Goals: No Saved Goals: 200 - -# @goal_bp.get("") -# def get_no_saved_goals(): -# goal = validate_task() -# return goal.to_dict() - - -#Get One Goal: One Saved Goal: 200 @bp.get("/") def get_one_saved_goal(goal_id): goal = validate_model(Goal, goal_id) return goal.to_dict() -#Update Goal: 204 @bp.put("/") def update_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -47,7 +35,6 @@ def update_goal(goal_id): db.session.commit() return Response(status=204, mimetype="application/json") -#Delete Goal: Deleting a Goal: 204 @bp.delete("/") def delete_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -55,31 +42,6 @@ def delete_goal(goal_id): db.session.commit() return Response(status=204, mimetype="application/json") - -# #Sending a List of Task IDs to a Goal: 200 OK -# @bp.post("//tasks") -# def create_tasks_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) -# #Getting Tasks of One Goal: 200 OK -# @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 -# #Getting Tasks of One Goal: No Matching Tasks: 200 OK -# @bp.get("//tasks") -# def get_tasks_for_specific_goal_no_matching_tasks(goal_id): -# pass - -# #Getting Tasks of One Goal: No Matching Goal: 404 Not Found -# @bp.get("//tasks") -# def get_tasks_for_specific_goal_no_goal(): -# pass - -#POST /goals//tasks @bp.post("//tasks") def create_tasks_with_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -112,34 +74,3 @@ def get_tasks_for_missing_goal(goal_id): response["tasks"] = [] return response, 200 -# GET /goals//tasks -# Case 1: Goal exists and has tasks -# @bp.get("//tasks") -# def get_tasks_by_goal(goal_id): -# goal = validate_model(Goal, goal_id) -# return goal.to_dict(), 200 - - -# # GET /goals//tasks/no_tasks -# # Case 2: Goal exists but has no tasks -# @bp.get("//tasks/no_tasks") -# def get_tasks_for_goal_no_tasks(goal_id): -# goal = validate_model(Goal, goal_id) -# return goal.to_dict(), 200 - - -# # GET /goals//tasks/missing_goal -# # Case 3: Goal does not exist -# @bp.get("//tasks/missing_goal") -# def get_tasks_for_missing_goal(goal_id): -# goal = validate_model(Goal, goal_id) -# response = goal.to_dict() - -# if not goal.tasks: -# response["tasks"] = [] -# # response = { -# # "id": goal.id, -# # "title": goal.title, -# # "tasks": [] -# # } -# return response, 200 diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index dc178da46..3c8907f0c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,18 +2,17 @@ from app.db import db from datetime import datetime from app.models.task import Task +import requests +import os from .route_utilities import create_model, get_models_with_filters, validate_model bp = Blueprint("task_bp", __name__, url_prefix= "/tasks") -#Create a Task: Valid Task With null completed_at -#Create a Task: Invalid Task With Missing Data 400 @bp.post("") def create_task(): request_body = request.get_json() return create_model(Task, request_body) -#Get Tasks: Getting Saved Tasks 200 @bp.get("") def get_all_tasks(): filters = {} @@ -28,13 +27,10 @@ def get_all_tasks(): return get_models_with_filters(Task, filters, sort) -#Get One Task: One Saved Task 200 @bp.get("/") def get_one_saved_task(task_id): task = validate_model(Task,task_id) return task.to_dict() - -#Update Task 204 @bp.put("/") def update_a_task(task_id): task = validate_model(Task,task_id) @@ -46,7 +42,6 @@ def update_a_task(task_id): return Response(status=204, mimetype="application/json") -#Delete Task: Deleting a Task 204 @bp.delete("/") def delete_task(id): task = validate_model(Task,id) @@ -55,20 +50,26 @@ def delete_task(id): return Response(status=204, mimetype="application/json") -# PATCH /tasks//mark_complete @bp.patch("//mark_complete") def mark_complete(task_id): - """Marks a task as complete, regardless of its current state.""" task = validate_model(Task, task_id) + # response = task.to_dict() if task.completed_at is None: task.completed_at = datetime.now() db.session.commit() + json_payload = { + 'channel': 'task-notifications', + 'text':f"Someone just completed the task, {task.title}", + 'Content-Type':'application/json; charset=utf-8' + } + requests.post('https://slack.com/api/chat.postMessage', + json=json_payload, + headers={'Authorization': 'Bearer ' + os.environ.get('SLACK_TOKEN')}) + return Response(status=204, mimetype="application/json") - -# PATCH /tasks//mark_incomplete @bp.patch("//mark_incomplete") def mark_incomplete(task_id): task = validate_model(Task, task_id) @@ -78,61 +79,3 @@ def mark_incomplete(task_id): db.session.commit() return Response(status=204, mimetype="application/json") - -# #Mark Complete on an Incomplete Task -# #PATCH request to /tasks/1/mark_complete: 204 No Content -# @task_bp.patch("//mark_complete") -# def mark_complete_on_incomplete_task(task_id): -# task = validate_model(Task,task_id) -# task.completed_at = datetime.now() -# db.session.commit() -# return Response(status=204, mimetype="application/json") - -# # #Mark Incomplete on a Completed Task -# # #PATCH request to /tasks/1/mark_incomplete -# @task_bp.patch("//mark_incomplete") -# def mark_incomplete_on_complete_task(task_id): -# task = validate_model(Task,task_id) -# task.completed_at = None -# db.session.commit() -# return Response(status=204, mimetype="application/json") - - -# # #Mark Complete on a Completed Task -# # #PATCH request to /tasks/1/mark_complete: 204 OK -# @task_bp.patch("//mark_complete") -# def mark_complete_on_completed_task(task_id): -# task = validate_model(Task,task_id) -# if task.completed_at is None: -# task.completed_at = datetime.now() -# db.session.commit() -# return Response(status=204, mimetype="application/json") - -# # #Mark Incomplete on an Incomplete Task -# # #PATCH request to /tasks/1/mark_incomplete -# @task_bp.patch("//mark_incomplete") -# def mark_incomplete_on_incomplete_task(task_id): -# task = validate_model(Task,task_id) -# if task.completed_at is not None: -# task.completed_at = None -# db.session.commit() -# return Response(status=204, mimetype="application/json") - - -# # #Mark Complete and Mark Incomplete for Missing Tasks -# # #PATCH request to /tasks/1/mark_complete or a PATCH request to /tasks/1/mark_incomplete: 404 Not Found -# @task_bp.patch("/tasks//mark_complete") -# def test_mark_complete_missing_task(task_id): -# task = validate_model(Task,task_id) -# if task.completed_at is None: -# task.completed_at = datetime.now() -# db.session.commit() -# return Response(status=204, mimetype="application/json") - -# @task_bp.patch("/tasks//mark_incomplete") -# def mark_incomplete_missing_task(task_id): -# task = validate_model(Task, task_id) -# if task.completed_at is not None: -# task.completed_at = None -# db.session.commit() -# return Response(status=204, mimetype="application/json") \ No newline at end of file