From 7abc8f2a58ab1964fbf11edb61c237afbfcd9e85 Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Thu, 1 May 2025 13:37:26 -0700 Subject: [PATCH 01/10] sets up project and creates migrations folder --- 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 c4c5f7f3cd09625ca4f9867ea450635436458e73 Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Thu, 8 May 2025 17:43:15 -0700 Subject: [PATCH 02/10] creates task model and migrations --- app/models/task.py | 29 ++++++++++++++ .../versions/61887c3bab4a_adds_task_model.py | 39 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 migrations/versions/61887c3bab4a_adds_task_model.py diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..77f123ac6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,34 @@ from sqlalchemy.orm import Mapped, mapped_column +from datetime import datetime from ..db import db + class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[datetime] = mapped_column(nullable=True) + + def to_dict(self): + task_as_dict = { + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": self.completed_at if self.completed_at else False + } + + return task_as_dict + + @classmethod + def from_dict(cls, task_data): + if "completed_at" in task_data: + new_task = cls( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data["completed_at"]) + else: + new_task = cls( + title=task_data["title"], + description=task_data["description"]) + + return new_task diff --git a/migrations/versions/61887c3bab4a_adds_task_model.py b/migrations/versions/61887c3bab4a_adds_task_model.py new file mode 100644 index 000000000..b93f712e4 --- /dev/null +++ b/migrations/versions/61887c3bab4a_adds_task_model.py @@ -0,0 +1,39 @@ +"""adds Task model + +Revision ID: 61887c3bab4a +Revises: +Create Date: 2025-05-08 17:06:56.826615 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '61887c3bab4a' +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 ### From c4b2d73ce7c83768299e2bc0eafd4df7db9c1010 Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Thu, 8 May 2025 17:44:28 -0700 Subject: [PATCH 03/10] adds task routes and registers blueprint --- app/__init__.py | 3 +++ app/routes/route_utilities.py | 46 ++++++++++++++++++++++++++++++++ app/routes/task_routes.py | 49 ++++++++++++++++++++++++++++++++++- 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 app/routes/route_utilities.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..c79c84031 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +1,10 @@ from flask import Flask from .db import db, migrate from .models import task, goal +from .routes.task_routes import bp as tasks_bp import os + def create_app(config=None): app = Flask(__name__) @@ -18,5 +20,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/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..a0da35084 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,46 @@ +from flask import abort, make_response +from ..db import db + + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except ValueError: + response = {"details": 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 = {"details": f"{cls.__name__} {model_id} not found"} + abort(make_response(response, 404)) + + return model + + +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + + except KeyError as error: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + db.session.add(new_model) + db.session.commit() + + return {cls.__name__.lower(): new_model.to_dict()}, 201 + + +def get_models_with_filters(cls, filters=None): + query = db.select(cls) + + if filters: + for attribute, value in filters.items(): + if hasattr(cls, attribute): + query = query.where(getattr(cls, attribute).ilike(f"%{value}%")) + + models = db.session.scalars(query.order_by(cls.id)) + models_response = [model.to_dict() for model in models] + return models_response diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..8ed3dd746 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,48 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, Response +from app.models.task import Task +from .route_utilities import validate_model, create_model +from .route_utilities import get_models_with_filters +from ..db import db + +bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + + +@bp.post("") +def create_task(): + request_body = request.get_json() + return create_model(Task, request_body) + + +@bp.get("") +def get_all_tasks(): + return get_models_with_filters(Task, request.args) + + +@bp.get("/") +def get_one_task(id): + task = validate_model(Task, id) + + return {"task": task.to_dict()} + + +@bp.put("/") +def update_task(id): + task = validate_model(Task, id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + if "completed_at" in request_body: + task.completed_at = request_body["completed_at"] + db.session.commit() + + return Response(status=204, mimetype="application/json") + + +@bp.delete("/") +def delete_task(id): + task = validate_model(Task, id) + db.session.delete(task) + db.session.commit() + + return Response(status=204, mimetype="application/json") From 68f60f64d5999e809b64a113887bb6f0791c7c8c Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Thu, 8 May 2025 17:45:05 -0700 Subject: [PATCH 04/10] adds missing assertions and passes wave 1 tests --- tests/test_wave_01.py | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 55475db79..2a0c7d751 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -1,9 +1,9 @@ from app.models.task import Task from app.db import db -import pytest +# import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -14,7 +14,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -33,7 +33,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") @@ -52,7 +52,7 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -61,13 +61,16 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "details": "Task 1 not found" + } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -97,7 +100,7 @@ def test_create_task(client): assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -117,7 +120,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={ @@ -129,13 +132,16 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "details": "Task 1 not found" + } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -146,7 +152,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") @@ -155,15 +161,18 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "details": "Task 1 not found" + } assert db.session.scalars(db.select(Task)).all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -180,7 +189,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 44d2fbd244ec6df89801dcabfd5d5b9dcd4d7b8e Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Thu, 8 May 2025 18:08:39 -0700 Subject: [PATCH 05/10] adds sort by title ascending and descending functionality --- app/routes/route_utilities.py | 13 +++++++++++-- tests/test_wave_02.py | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index a0da35084..e857f703d 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -23,7 +23,7 @@ def create_model(cls, model_data): try: new_model = cls.from_dict(model_data) - except KeyError as error: + except KeyError: response = {"details": "Invalid data"} abort(make_response(response, 400)) @@ -35,12 +35,21 @@ def create_model(cls, model_data): def get_models_with_filters(cls, filters=None): query = db.select(cls) + sort = "" if filters: for attribute, value in filters.items(): if hasattr(cls, attribute): query = query.where(getattr(cls, attribute).ilike(f"%{value}%")) + if attribute == "sort": + sort = value + + if sort == "asc": + models = db.session.scalars(query.order_by(cls.title.asc())) + elif sort == "desc": + models = db.session.scalars(query.order_by(cls.title.desc())) + else: + models = db.session.scalars(query.order_by(cls.id)) - models = db.session.scalars(query.order_by(cls.id)) models_response = [model.to_dict() for model in models] return models_response diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..73d93bda4 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ -import pytest +# 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 8ff868060fecf4d1f8a874316dc181ecb8804abb Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Thu, 8 May 2025 21:45:57 -0700 Subject: [PATCH 06/10] implements routes to mark tasks complete and incomplete and sends slack notification for tasks marked complete --- app/models/task.py | 2 +- app/routes/task_routes.py | 31 +++++++++++++++++++++++++++++++ tests/test_wave_01.py | 2 +- tests/test_wave_02.py | 2 +- tests/test_wave_03.py | 22 ++++++++++++++-------- tests/test_wave_04.py | 25 +++++++++++++++++++++++++ 6 files changed, 73 insertions(+), 11 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 77f123ac6..3a2c6b6c6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -14,7 +14,7 @@ def to_dict(self): "id": self.id, "title": self.title, "description": self.description, - "is_complete": self.completed_at if self.completed_at else False + "is_complete": True if self.completed_at else False } return task_as_dict diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 8ed3dd746..2cc740591 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -3,6 +3,9 @@ from .route_utilities import validate_model, create_model from .route_utilities import get_models_with_filters from ..db import db +from datetime import datetime +import requests +import os bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -46,3 +49,31 @@ def delete_task(id): db.session.commit() return Response(status=204, mimetype="application/json") + + +@bp.patch("//mark_incomplete") +def marks_task_incomplete(id): + task = validate_model(Task, id) + task.completed_at = None + db.session.commit() + + return Response(status=204, mimetype="application/json") + + +@bp.patch("//mark_complete") +def marks_task_complete(id): + task = validate_model(Task, id) + task.completed_at = datetime.now() + db.session.commit() + + data = { + "token": os.environ.get('SLACKBOT_TOKEN'), + "channel": "all-ada-testing", + "text": f"Someone just complete the task {task.title}" + } + + requests.post( + "https://slack.com/api/chat.postMessage", + data=data) + + return Response(status=204, mimetype="application/json") diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 2a0c7d751..996ace7a0 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -1,6 +1,6 @@ from app.models.task import Task from app.db import db -# import pytest +import pytest # @pytest.mark.skip(reason="No way to test this feature yet") diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 73d93bda4..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,4 +1,4 @@ -# import pytest +import pytest # @pytest.mark.skip(reason="No way to test this feature yet") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..b706ca266 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") @@ -95,13 +95,16 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "details": "Task 1 not found" + } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -110,7 +113,10 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "details": "Task 1 not found" + } diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index d0b26b2d1..46640ab68 100644 --- a/tests/test_wave_04.py +++ b/tests/test_wave_04.py @@ -1 +1,26 @@ # There are no tests for wave 4. +import unittest +from unittest.mock import Mock, patch +from datetime import datetime +from app.models.task import Task +from app.db import db +import pytest + +def test_mark_complete_on_completed_task(client, one_task): + # Arrange + """ + The future Wave 4 adds special functionality to this route, + so for this test, we need to set-up "mocking." + + Mocking will help our tests work in isolation, which is a + good thing! + + We need to mock any POST requests that may occur during this + test (due to Wave 4). + + There is no action needed here, the tests should work as-is. + """ + + response = client.patch("/tasks/1/mark_complete") + + assert response.status_code == 204 From 54cfdb714f0f2cd54f69f24c5e97bd8c9071ba13 Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Thu, 8 May 2025 22:46:37 -0700 Subject: [PATCH 07/10] adds goal model, CRUD routes for goal, fixes error message for 404 --- app/__init__.py | 2 + app/models/goal.py | 16 ++++++++ app/routes/goal_routes.py | 47 +++++++++++++++++++++++- app/routes/route_utilities.py | 2 +- tests/test_wave_01.py | 6 +-- tests/test_wave_03.py | 4 +- tests/test_wave_05.py | 69 +++++++++++++++++++++++------------ 7 files changed, 115 insertions(+), 31 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index c79c84031..a8d4c0f2f 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 bp as tasks_bp +from .routes.goal_routes import bp as goals_bp import os @@ -21,5 +22,6 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..3f7720420 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,21 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db + class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + + def to_dict(self): + goal_as_dict = { + "id": self.id, + "title": self.title + } + + return goal_as_dict + + @classmethod + def from_dict(cls, task_data): + new_goal = cls(title=task_data["title"]) + + return new_goal diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..ee21770d5 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,46 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, Response +from app.models.goal import Goal +from .route_utilities import validate_model, create_model +from .route_utilities import get_models_with_filters +from ..db import db + + +bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + + +@bp.post("") +def create_task(): + request_body = request.get_json() + return create_model(Goal, request_body) + + +@bp.get("") +def get_all_tasks(): + return get_models_with_filters(Goal, request.args) + + +@bp.get("/") +def get_one_task(id): + goal = validate_model(Goal, id) + + return {"goal": goal.to_dict()} + + +@bp.put("/") +def update_task(id): + task = validate_model(Goal, id) + request_body = request.get_json() + + task.title = request_body["title"] + db.session.commit() + + return Response(status=204, mimetype="application/json") + + +@bp.delete("/") +def delete_task(id): + task = validate_model(Goal, id) + db.session.delete(task) + db.session.commit() + + return Response(status=204, mimetype="application/json") diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index e857f703d..c35188a4d 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -13,7 +13,7 @@ def validate_model(cls, model_id): model = db.session.scalar(query) if not model: - response = {"details": f"{cls.__name__} {model_id} not found"} + response = {"message": f"{cls.__name__} {model_id} not found"} abort(make_response(response, 404)) return model diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 996ace7a0..d31360ae8 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -66,7 +66,7 @@ def test_get_task_not_found(client): # **Complete test with assertion about response body*************** # ***************************************************************** assert response_body == { - "details": "Task 1 not found" + "message": "Task 1 not found" } @@ -137,7 +137,7 @@ def test_update_task_not_found(client): # **Complete test with assertion about response body*************** # ***************************************************************** assert response_body == { - "details": "Task 1 not found" + "message": "Task 1 not found" } @@ -166,7 +166,7 @@ def test_delete_task_not_found(client): # **Complete test with assertion about response body*************** # ***************************************************************** assert response_body == { - "details": "Task 1 not found" + "message": "Task 1 not found" } assert db.session.scalars(db.select(Task)).all() == [] diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index b706ca266..85559b714 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -100,7 +100,7 @@ def test_mark_complete_missing_task(client): # **Complete test with assertion about response body*************** # ***************************************************************** assert response_body == { - "details": "Task 1 not found" + "message": "Task 1 not found" } @@ -118,5 +118,5 @@ def test_mark_incomplete_missing_task(client): # **Complete test with assertion about response body*************** # ***************************************************************** assert response_body == { - "details": "Task 1 not found" + "message": "Task 1 not found" } diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 222d10cf0..4be42840f 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,9 @@ import pytest +from app.models.goal import Goal +from app.db import db -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +14,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +31,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +48,24 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # raise Exception("Complete test") # Assert # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == { + "message": "Goal 1 not found" + } # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +84,44 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated goal title" + }) + + query = db.select(Goal).where(Goal.id == 1) + goal = db.session.scalar(query) # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here + assert response.status_code == 204 + assert goal.title == "Updated goal title" + assert goal.id == 1 # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == { + "message": "Goal 1 not found" + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -122,27 +136,34 @@ 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") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "message": "Goal 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") + # 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 + assert response.status_code == 404 + assert response_body == { + "message": "Goal 1 not found" + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From c6a208228cd8f0ebf92579008a9b38361bb726a1 Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Fri, 9 May 2025 01:41:04 -0700 Subject: [PATCH 08/10] adds migration, implements nested routes --- app/models/goal.py | 6 ++- app/models/task.py | 13 +++++- app/routes/goal_routes.py | 33 +++++++++++++++ ...4032a3_adds_goal_model_and_one_to_many_.py | 40 +++++++++++++++++++ tests/test_wave_06.py | 18 +++++---- 5 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 migrations/versions/261c784032a3_adds_goal_model_and_one_to_many_.py diff --git a/app/models/goal.py b/app/models/goal.py index 3f7720420..25cb86ae1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,10 +1,14 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") def to_dict(self): goal_as_dict = { diff --git a/app/models/task.py b/app/models/task.py index 3a2c6b6c6..6e753002a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,10 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey from datetime import datetime from ..db import db +from typing import Optional, TYPE_CHECKING +if TYPE_CHECKING: + from .goal import Goal class Task(db.Model): @@ -8,15 +12,20 @@ class Task(db.Model): title: Mapped[str] description: Mapped[str] completed_at: Mapped[datetime] = mapped_column(nullable=True) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") def to_dict(self): task_as_dict = { "id": self.id, "title": self.title, "description": self.description, - "is_complete": True if self.completed_at else False + "is_complete": True if self.completed_at else False, } + 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 ee21770d5..e1561ce25 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, request, Response from app.models.goal import Goal +from app.models.task import Task from .route_utilities import validate_model, create_model from .route_utilities import get_models_with_filters from ..db import db @@ -44,3 +45,35 @@ def delete_task(id): db.session.commit() return Response(status=204, mimetype="application/json") + + +@bp.post("//tasks") +def add_tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + + for task in goal.tasks: + task.goal_id = None + + tasks = [validate_model(Task, id) for id in request_body["task_ids"]] + + for task in tasks: + task.goal_id = goal_id + + db.session.commit() + + response = { + "id": goal.id, + "task_ids": request_body["task_ids"] + } + + return response, 200 + + +@bp.get("//tasks") +def get_all_tasks_of_goal(goal_id): + goal = validate_model(Goal, goal_id) + response = goal.to_dict() + response["tasks"] = [task.to_dict() for task in goal.tasks] + + return response, 200 diff --git a/migrations/versions/261c784032a3_adds_goal_model_and_one_to_many_.py b/migrations/versions/261c784032a3_adds_goal_model_and_one_to_many_.py new file mode 100644 index 000000000..ce1f02d1e --- /dev/null +++ b/migrations/versions/261c784032a3_adds_goal_model_and_one_to_many_.py @@ -0,0 +1,40 @@ +"""adds goal model and one-to-many relationship + +Revision ID: 261c784032a3 +Revises: 61887c3bab4a +Create Date: 2025-05-09 01:39:28.829521 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '261c784032a3' +down_revision = '61887c3bab4a' +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)) + + 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') + + 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_06.py b/tests/test_wave_06.py index 0317f835a..eb8f5d4a5 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -25,7 +25,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(db.session.scalar(query).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -45,7 +45,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(db.session.scalar(query).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -54,13 +54,17 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "message": "Goal 1 not found" + } + -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -77,7 +81,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 +106,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 be8f552c77d9379db43f912639f861c1e5f4b2e8 Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Fri, 9 May 2025 03:41:57 -0700 Subject: [PATCH 09/10] adds tests --- app/models/task.py | 12 ++----- app/routes/route_utilities.py | 2 +- app/routes/task_routes.py | 12 +++++-- tests/test_wave_01.py | 40 +++++++++++++++++++++- tests/test_wave_02.py | 62 +++++++++++++++++++++++++++++++++++ tests/test_wave_04.py | 29 +++++++--------- 6 files changed, 125 insertions(+), 32 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 6e753002a..15d02f3da 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -30,14 +30,8 @@ def to_dict(self): @classmethod def from_dict(cls, task_data): - if "completed_at" in task_data: - new_task = cls( - title=task_data["title"], - description=task_data["description"], - completed_at=task_data["completed_at"]) - else: - new_task = cls( - title=task_data["title"], - description=task_data["description"]) + new_task = cls( + title=task_data["title"], + description=task_data["description"]) return new_task diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index c35188a4d..6d0c00250 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -6,7 +6,7 @@ def validate_model(cls, model_id): try: model_id = int(model_id) except ValueError: - response = {"details": f"{cls.__name__} {model_id} invalid"} + response = {"message": f"{cls.__name__} {model_id} invalid"} abort(make_response(response, 400)) query = db.select(cls).where(cls.id == model_id) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 2cc740591..5e1953e57 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -66,14 +66,20 @@ def marks_task_complete(id): task.completed_at = datetime.now() db.session.commit() + send_slack_notif(task) + + return Response(status=204, mimetype="application/json") + + +def send_slack_notif(task): data = { "token": os.environ.get('SLACKBOT_TOKEN'), - "channel": "all-ada-testing", + "channel": os.environ.get('SLACK_CHANNEL'), "text": f"Someone just complete the task {task.title}" } - requests.post( + response = requests.post( "https://slack.com/api/chat.postMessage", data=data) - return Response(status=204, mimetype="application/json") + return response diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index d31360ae8..e1b172a19 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -1,4 +1,5 @@ from app.models.task import Task +from sqlalchemy import null from app.db import db import pytest @@ -203,4 +204,41 @@ def test_create_task_must_contain_description(client): assert response_body == { "details": "Invalid data" } - assert db.session.scalars(db.select(Task)).all() == [] \ No newline at end of file + assert db.session.scalars(db.select(Task)).all() == [] + + +# ----- Added Tests ------ +def test_get_task_invalid(client): + # Act + response = client.get("/tasks/cat") + response_body = response.get_json() + + # Assert + assert response.status_code == 400 + assert response_body == { + "message": "Task cat invalid" + } + + +def test_update_task_invalid(client): + # Act + response = client.put("/tasks/cat") + response_body = response.get_json() + + # Assert + assert response.status_code == 400 + assert response_body == { + "message": "Task cat invalid" + } + + +def test_delete_task_invalid(client): + # Act + response = client.delete("/tasks/cat") + response_body = response.get_json() + + # Assert + assert response.status_code == 400 + assert response_body == { + "message": "Task cat invalid" + } diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 651e3aebd..76eb39ef5 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -55,3 +55,65 @@ def test_get_tasks_sorted_desc(client, three_tasks): "is_complete": False, "title": "Answer forgotten email 📧"}, ] + + +# -------- Added Tests ---------- +def test_get_tasks_name_param(client, one_task, three_tasks): + # Act + response = client.get("/tasks?title=my") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert len(response_body) == 2 + assert response_body == [ + { + "id": 1, + "title": "Go on my daily walk 🏞", + "description": "Notice something new every day", + "is_complete": False}, + { + "description": "", + "id": 4, + "is_complete": False, + "title": "Pay my outstanding tickets 😭"}, + ] + + +def test_get_tasks_sorted_asc_name_param(client, one_task, three_tasks): + # Act + response = client.get("/tasks?sort=desc&title=my") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert len(response_body) == 2 + assert response_body == [ + { + "description": "", + "id": 4, + "is_complete": False, + "title": "Pay my outstanding tickets 😭"}, + { + "id": 1, + "title": "Go on my daily walk 🏞", + "description": "Notice something new every day", + "is_complete": False}, + ] + + +def test_get_tasks_description_param(client, one_task, three_tasks): + # Act + response = client.get("/tasks?description=new") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert len(response_body) == 1 + assert response_body == [ + { + "id": 1, + "title": "Go on my daily walk 🏞", + "description": "Notice something new every day", + "is_complete": False}, + ] diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index 46640ab68..03cb1ca63 100644 --- a/tests/test_wave_04.py +++ b/tests/test_wave_04.py @@ -1,26 +1,19 @@ # There are no tests for wave 4. -import unittest -from unittest.mock import Mock, patch -from datetime import datetime +from app.routes.task_routes import send_slack_notif from app.models.task import Task -from app.db import db -import pytest -def test_mark_complete_on_completed_task(client, one_task): - # Arrange - """ - The future Wave 4 adds special functionality to this route, - so for this test, we need to set-up "mocking." - Mocking will help our tests work in isolation, which is a - good thing! +# ------ Added Tests ------- +def test_slack_notif_successful(client, one_task): + # Arrange and Act + response = client.patch("/tasks/1/mark_complete") - We need to mock any POST requests that may occur during this - test (due to Wave 4). + assert response.status_code == 204 - There is no action needed here, the tests should work as-is. - """ - response = client.patch("/tasks/1/mark_complete") +def test_send_slack_notif_helper_success(client): + task = Task(title="Task", description="Task description") + response = send_slack_notif(task) - assert response.status_code == 204 + assert response.status_code == 200 + assert response.ok From fd4561f6b1002f8f47b801d72ea9be6d53803d3c Mon Sep 17 00:00:00 2001 From: Esther Kang Date: Fri, 9 May 2025 04:13:23 -0700 Subject: [PATCH 10/10] fixes function name --- app/routes/goal_routes.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index e1561ce25..d2eec349d 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -10,38 +10,38 @@ @bp.post("") -def create_task(): +def create_goal(): request_body = request.get_json() return create_model(Goal, request_body) @bp.get("") -def get_all_tasks(): +def get_all_goals(): return get_models_with_filters(Goal, request.args) @bp.get("/") -def get_one_task(id): +def get_one_goal(id): goal = validate_model(Goal, id) return {"goal": goal.to_dict()} @bp.put("/") -def update_task(id): - task = validate_model(Goal, id) +def update_goal(id): + goal = validate_model(Goal, id) request_body = request.get_json() - task.title = request_body["title"] + goal.title = request_body["title"] db.session.commit() return Response(status=204, mimetype="application/json") @bp.delete("/") -def delete_task(id): - task = validate_model(Goal, id) - db.session.delete(task) +def delete_goal(id): + goal = validate_model(Goal, id) + db.session.delete(goal) db.session.commit() return Response(status=204, mimetype="application/json")