From 53a2029e726399820c938c49d5bc379b3f70f694 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Sun, 4 May 2025 14:59:11 -0700 Subject: [PATCH 01/10] set up project and generate migtrations 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 f561d26bf996087e0ce087a2fb3271f6afa153f7 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Sun, 4 May 2025 17:51:43 -0700 Subject: [PATCH 02/10] implement POST /tasks route to create new task --- app/__init__.py | 2 + app/models/task.py | 20 ++++++++++ app/routes/task_routes.py | 30 +++++++++++++- .../3adf39c9f334_create_task_model.py | 39 +++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 migrations/versions/3adf39c9f334_create_task_model.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..66734f016 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,25 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from typing import Optional +from datetime import datetime class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title : Mapped[str] + description : Mapped[str] + completed_at : Mapped[Optional[datetime]] = mapped_column(nullable=True) + + 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): + return cls( + title=task_data.get("title"), + description=task_data.get("description"), + completed_at=task_data.get("completed_at") + ) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..a925e15bf 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,29 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint,make_response, abort, request, Response +from ..models.task import Task +from app import db + +task_bp = Blueprint("task", __name__, url_prefix="/tasks") + +@task_bp.post("") +def create_task(): + + request_body = request.get_json() + + try: + new_task = Task.from_dict(request_body) + except KeyError as error: + message = { + "message": f"Missing '{error.args[0]}' attribute" + } + abort(make_response(message, 400)) + db.session.add(new_task) + db.session.commit() + + response = new_task.to_dict() + return response, 201 + +# def get_task_or_404(task_id): +# task = Task.query.get(task_id) #This tries to find a Task in the database with ID If exists return Task object else None +# if task is None: +# abort(404, description=f"Task with id {task_id} not found") +# return task \ No newline at end of file diff --git a/migrations/versions/3adf39c9f334_create_task_model.py b/migrations/versions/3adf39c9f334_create_task_model.py new file mode 100644 index 000000000..81f155cf8 --- /dev/null +++ b/migrations/versions/3adf39c9f334_create_task_model.py @@ -0,0 +1,39 @@ +"""Create Task model + +Revision ID: 3adf39c9f334 +Revises: +Create Date: 2025-05-04 16:03:56.687984 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3adf39c9f334' +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 e2f8b411ef6d590d2c9553cba4ca6249accd09c7 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Sun, 4 May 2025 23:18:51 -0700 Subject: [PATCH 03/10] implement GET /tasks and GET /tasks/ routes --- app/models/task.py | 1 + app/routes/task_routes.py | 33 ++++++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 66734f016..bb00fc956 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -16,6 +16,7 @@ def to_dict(self): "description": self.description, "is_complete": self.completed_at is not None } + @classmethod def from_dict(cls, task_data): return cls( diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index a925e15bf..08f39699d 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -22,8 +22,31 @@ def create_task(): response = new_task.to_dict() return response, 201 -# def get_task_or_404(task_id): -# task = Task.query.get(task_id) #This tries to find a Task in the database with ID If exists return Task object else None -# if task is None: -# abort(404, description=f"Task with id {task_id} not found") -# return task \ No newline at end of file +@task_bp.get("") +def get_all_tasks(): + tasks = Task.query.all() + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_dict()) + return tasks_response + +@task_bp.get("/") +def get_one_planet(task_id): + task = validate_task(task_id) + return task.to_dict() + + +def validate_task(task_id): + try: + task_id = int(task_id) + except ValueError: + response = {"message" : f"task {task_id} invalid"} + abort(make_response(response, 400)) + + task = Task.query.get(task_id) + if task is None: + message = { + "message": f"task ID ({task_id}) not found." + } + abort(make_response(message, 404)) + return task \ No newline at end of file From 4234fd6785f98e7b68f8d1c1cde7ddf7113a6ba3 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Mon, 5 May 2025 22:06:00 -0700 Subject: [PATCH 04/10] implement PUT /tasks/ routes --- app/routes/task_routes.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 08f39699d..63d44d45f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -49,4 +49,24 @@ def validate_task(task_id): "message": f"task ID ({task_id}) not found." } abort(make_response(message, 404)) - return task \ No newline at end of file + return task + +@task_bp.put("/") +def update_task(task_id): + + task = validate_task(task_id) + + request_body = request.get_json() + + try: + task.title = request_body["title"] + task.description = request_body["description"] + except KeyError as error: + message = { + "message": f"Missing '{error.args[0]}' attribute" + } + abort(make_response(message, 400)) + + db.session.commit() + + return Response(status=204, mimetype="application/json") From 35e23e424138c8875929a881ca0a9d7387ae066a Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Mon, 5 May 2025 22:18:01 -0700 Subject: [PATCH 05/10] implement DELETE /tasks/ routes --- app/routes/task_routes.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 63d44d45f..7d934977e 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -70,3 +70,14 @@ def update_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") + +@task_bp.delete("/") +def remove_task(task_id): + + task = validate_task(task_id) + + db.session.delete(task) + db.session.commit() + + return Response(status=204, mimetype="application/json") + From 72e2dd06e079cc8316f53e7027e747ce4dd7b62d Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Wed, 7 May 2025 13:44:05 -0700 Subject: [PATCH 06/10] complete Wave 1 with full CRUD for Task model and passing tests --- app/models/task.py | 6 +++--- app/routes/task_routes.py | 16 +++++++++++----- tests/test_wave_01.py | 37 +++++++++++++++++++++++-------------- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index bb00fc956..9f3bad489 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -20,7 +20,7 @@ def to_dict(self): @classmethod def from_dict(cls, task_data): return cls( - title=task_data.get("title"), - description=task_data.get("description"), - completed_at=task_data.get("completed_at") + title=task_data["title"], # this will raise KeyError if missing + description=task_data["description"], + completed_at=task_data.get("completed_at") # this will not raise KeyError if missing ) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 7d934977e..31e8f8030 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -13,13 +13,14 @@ def create_task(): new_task = Task.from_dict(request_body) except KeyError as error: message = { - "message": f"Missing '{error.args[0]}' attribute" + # "message": f"Missing '{error.args[0]}' attribute" + "details": "Invalid data" } abort(make_response(message, 400)) db.session.add(new_task) db.session.commit() - response = new_task.to_dict() + response = {"task": new_task.to_dict()} return response, 201 @task_bp.get("") @@ -31,9 +32,10 @@ def get_all_tasks(): return tasks_response @task_bp.get("/") -def get_one_planet(task_id): +def get_one_task(task_id): task = validate_task(task_id) - return task.to_dict() + # return task.to_dict() + return {"task": task.to_dict()} def validate_task(task_id): @@ -43,7 +45,11 @@ def validate_task(task_id): response = {"message" : f"task {task_id} invalid"} abort(make_response(response, 400)) - task = Task.query.get(task_id) + # task = Task.query.get(task_id) + query = db.select(Task).where(Task.id == task_id) + task = db.session.scalar(query) + # db.session.get(Task, task_id) + if task is None: message = { "message": f"task ID ({task_id}) not found." diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 55475db79..ee31b10b2 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -14,7 +14,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -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") + assert response_body == { + "message": "task ID (1) not found." + } # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -97,7 +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") + assert response_body == { + "message": "task ID (1) not found." + } # ***************************************************************** # **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_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,7 +161,10 @@ 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") + assert response_body == { + "message": "task ID (1) not found." + } # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -163,7 +172,7 @@ def test_delete_task_not_found(client): assert db.session.scalars(db.select(Task)).all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -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 18345ef1c4b6b6c8df91e354bb44bd84dc940096 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Wed, 7 May 2025 14:45:48 -0700 Subject: [PATCH 07/10] implement sorting of tasks by title using query param (?sort=asc/desc) for Wave 2 --- app/routes/task_routes.py | 12 +++++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 31e8f8030..c7937b5dd 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,7 @@ from flask import Blueprint,make_response, abort, request, Response from ..models.task import Task from app import db +from sqlalchemy import asc, desc task_bp = Blueprint("task", __name__, url_prefix="/tasks") @@ -25,7 +26,16 @@ def create_task(): @task_bp.get("") def get_all_tasks(): - tasks = Task.query.all() + sort_param = request.args.get("sort") + + query = db.select(Task) + if sort_param == "asc": + query = query.order_by(asc(Task.title)) + elif sort_param == "desc": + query = query.order_by(desc(Task.title)) + + tasks = db.session.scalars(query) #This executes the SQL query + tasks_response = [] for task in tasks: tasks_response.append(task.to_dict()) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From 93db4433c5b03d265eb1dbbf12a0a4f7f930b5e7 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Thu, 8 May 2025 15:41:32 -0700 Subject: [PATCH 08/10] integrate Slack API to send message when task is marked complete --- app/__init__.py | 3 +++ app/routes/task_routes.py | 39 +++++++++++++++++++++++++++++++++++++++ tests/test_wave_03.py | 18 ++++++++++-------- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4d91acfe2..9ed2c7857 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,6 +3,8 @@ from .models import task, goal from .routes.task_routes import task_bp import os +from dotenv import load_dotenv +load_dotenv() #Reads .env file and Loads all key-value pairs into environment def create_app(config=None): app = Flask(__name__) @@ -22,3 +24,4 @@ def create_app(config=None): app.register_blueprint(task_bp) return app + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index c7937b5dd..f03a7e949 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,6 +2,9 @@ from ..models.task import Task from app import db from sqlalchemy import asc, desc +from datetime import datetime, timezone +import os +import requests task_bp = Blueprint("task", __name__, url_prefix="/tasks") @@ -97,3 +100,39 @@ def remove_task(task_id): return Response(status=204, mimetype="application/json") +def send_slack_message(task_title): + slack_token = os.environ.get("SLACK_BOT_TOKEN") + channel = os.environ.get("SLACK_CHANNEL", "task-notifications") + + url = "https://slack.com/api/chat.postMessage" + headers = { + "Authorization": f"Bearer {slack_token}", + "Content-Type": "application/json" + } + payload = { + "channel": f"#{channel}", + "text": f"Someone just completed the task {task_title}" + } + + requests.post(url, json=payload, headers=headers) + +@task_bp.patch("//mark_complete") +def mark_complete(task_id): + task = validate_task(task_id) + + task.completed_at = datetime.now(timezone.utc) + db.session.commit() + + send_slack_message(task.title) + + return Response(status=204, mimetype="application/json") + +@task_bp.patch("//mark_incomplete") +def mark_incomplete(task_id): + task = validate_task(task_id) + + task.completed_at = None + db.session.commit() + + return Response(status=204, mimetype="application/json") + diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..08cd298a2 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,14 @@ 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") + assert response_body == {"message": "task ID (1) not found."} # ***************************************************************** # **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 +111,8 @@ 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") + assert response_body == {"message": "task ID (1) not found."} # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From c712b7bcdf852177d1a89daa62b3b43e2c704868 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Thu, 8 May 2025 21:45:55 -0700 Subject: [PATCH 09/10] add Goal model with full CRUD functionality and shared validate_model --- app/__init__.py | 6 +- app/models/goal.py | 13 +++ app/routes/goal_routes.py | 74 ++++++++++++++++- app/routes/route_utilities.py | 17 ++++ app/routes/task_routes.py | 43 +++++----- .../versions/76582c1eac6b_add_goal_model.py | 32 ++++++++ tests/test_wave_01.py | 6 +- tests/test_wave_03.py | 4 +- tests/test_wave_05.py | 81 ++++++++++--------- 9 files changed, 210 insertions(+), 66 deletions(-) create mode 100644 app/routes/route_utilities.py create mode 100644 migrations/versions/76582c1eac6b_add_goal_model.py diff --git a/app/__init__.py b/app/__init__.py index 9ed2c7857..2bc74bf80 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,9 +2,10 @@ 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 from dotenv import load_dotenv -load_dotenv() #Reads .env file and Loads all key-value pairs into environment +load_dotenv() # Reads .env file and Loads all key-value pairs into environment def create_app(config=None): app = Flask(__name__) @@ -22,6 +23,7 @@ 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..a92770a78 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,16 @@ 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): + return cls( + title = goal_data["title"] + ) \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..157875481 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,73 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint,make_response, abort, request, Response +from ..models.goal import Goal +from app.routes.route_utilities import validate_model +from app import db + +goal_bp = Blueprint("goal", __name__, url_prefix="/goals") + +@goal_bp.post("") +def create_goal(): + + request_body = request.get_json() + + try: + new_goal = Goal.from_dict(request_body) + except KeyError as error: + message = { + # "message": f"Missing '{error.args[0]}' attribute" + "details": "Invalid data" + } + abort(make_response(message, 400)) + db.session.add(new_goal) + db.session.commit() + + response = {"goal": new_goal.to_dict()} + return response, 201 + +@goal_bp.get("") +def get_all_goals(): + query = db.select(Goal) + goals = db.session.scalars(query) #This executes the SQL query + + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict()) + return goals_response + +@goal_bp.get("/") +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + return {"goal": goal.to_dict()} + +@goal_bp.put("/") +def update_goal(goal_id): + + goal = validate_model(Goal,goal_id) + + request_body = request.get_json() + + try: + goal.title = request_body["title"] + except KeyError as error: + message = { + "message": f"Missing '{error.args[0]}' attribute" + } + abort(make_response(message, 400)) + + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@goal_bp.delete("/") +def remove_task(goal_id): + + goal = validate_model(Goal,goal_id) + + db.session.delete(goal) + db.session.commit() + + return Response(status=204, mimetype="application/json") + + + + diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..eb90dfe59 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,17 @@ +from flask import abort, make_response +from app import db + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except ValueError: + response = {"message" : f"id {model_id} invalid"} + abort(make_response(response, 400)) + + query = db.select(cls).where(cls.id == model_id) + instance = db.session.scalar(query) + + if instance is None: + abort(make_response({"message": f"{cls.__name__} ID ({model_id}) not found."}, 404)) + return instance + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index f03a7e949..7094b3d6f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint,make_response, abort, request, Response from ..models.task import Task +from app.routes.route_utilities import validate_model from app import db from sqlalchemy import asc, desc from datetime import datetime, timezone @@ -46,34 +47,34 @@ def get_all_tasks(): @task_bp.get("/") def get_one_task(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) # return task.to_dict() return {"task": task.to_dict()} -def validate_task(task_id): - try: - task_id = int(task_id) - except ValueError: - response = {"message" : f"task {task_id} invalid"} - abort(make_response(response, 400)) +# def validate_task(task_id): +# try: +# task_id = int(task_id) +# except ValueError: +# response = {"message" : f"task {task_id} invalid"} +# abort(make_response(response, 400)) - # task = Task.query.get(task_id) - query = db.select(Task).where(Task.id == task_id) - task = db.session.scalar(query) - # db.session.get(Task, task_id) +# # task = Task.query.get(task_id) +# query = db.select(Task).where(Task.id == task_id) +# task = db.session.scalar(query) +# # db.session.get(Task, task_id) - if task is None: - message = { - "message": f"task ID ({task_id}) not found." - } - abort(make_response(message, 404)) - return task +# if task is None: +# message = { +# "message": f"task ID ({task_id}) not found." +# } +# abort(make_response(message, 404)) +# return task @task_bp.put("/") def update_task(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) request_body = request.get_json() @@ -93,7 +94,7 @@ def update_task(task_id): @task_bp.delete("/") def remove_task(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) db.session.delete(task) db.session.commit() @@ -118,7 +119,7 @@ def send_slack_message(task_title): @task_bp.patch("//mark_complete") def mark_complete(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) task.completed_at = datetime.now(timezone.utc) db.session.commit() @@ -129,7 +130,7 @@ def mark_complete(task_id): @task_bp.patch("//mark_incomplete") def mark_incomplete(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) task.completed_at = None db.session.commit() diff --git a/migrations/versions/76582c1eac6b_add_goal_model.py b/migrations/versions/76582c1eac6b_add_goal_model.py new file mode 100644 index 000000000..17e612804 --- /dev/null +++ b/migrations/versions/76582c1eac6b_add_goal_model.py @@ -0,0 +1,32 @@ +"""Add Goal model + +Revision ID: 76582c1eac6b +Revises: 3adf39c9f334 +Create Date: 2025-05-08 16:32:16.657087 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '76582c1eac6b' +down_revision = '3adf39c9f334' +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_01.py b/tests/test_wave_01.py index ee31b10b2..79dcbe723 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -63,7 +63,7 @@ def test_get_task_not_found(client): # raise Exception("Complete test with assertion about response body") assert response_body == { - "message": "task ID (1) not found." + "message": "Task ID (1) not found." } # ***************************************************************** # **Complete test with assertion about response body*************** @@ -134,7 +134,7 @@ def test_update_task_not_found(client): # raise Exception("Complete test with assertion about response body") assert response_body == { - "message": "task ID (1) not found." + "message": "Task ID (1) not found." } # ***************************************************************** # **Complete test with assertion about response body*************** @@ -163,7 +163,7 @@ def test_delete_task_not_found(client): # raise Exception("Complete test with assertion about response body") assert response_body == { - "message": "task ID (1) not found." + "message": "Task ID (1) not found." } # ***************************************************************** # **Complete test with assertion about response body*************** diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 08cd298a2..d4d46fb56 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -96,7 +96,7 @@ def test_mark_complete_missing_task(client): assert response.status_code == 404 # raise Exception("Complete test with assertion about response body") - assert response_body == {"message": "task ID (1) not found."} + assert response_body == {"message": "Task ID (1) not found."} # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -112,7 +112,7 @@ def test_mark_incomplete_missing_task(client): assert response.status_code == 404 # raise Exception("Complete test with assertion about response body") - assert response_body == {"message": "task ID (1) not found."} + assert response_body == {"message": "Task ID (1) not found."} # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 222d10cf0..a8ff98258 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,9 @@ +from app.models.goal import Goal +from app.db import db import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_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,20 @@ 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 - # ---- Complete Test ---- - + assert response.status_code == 404 + assert response_body == { + "message": "Goal ID (1) not found." + } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +80,40 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 204 + + query = db.select(Goal).where(Goal.id == 1) + goal = db.session.scalar(query) + assert goal.title == "Updated Goal Title" -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + 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 ID (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 +128,28 @@ def test_delete_goal(client, one_goal): response_body = response.get_json() assert "message" in response_body - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - + # raise Exception("Complete test with assertion about response body") + assert response_body == { + "message": "Goal ID (1) not found." + } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == { + "message": "Goal ID (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 e7bc8723aaad3fc142074c5cb9df291b2b21aec6 Mon Sep 17 00:00:00 2001 From: Gitika Kalal Date: Thu, 8 May 2025 23:27:13 -0700 Subject: [PATCH 10/10] establish one-to-many relationship between goals and tasks --- app/models/goal.py | 2 + app/models/task.py | 14 +++++-- app/routes/goal_routes.py | 41 +++++++++++++++++++ ..._add_relationship_between_goal_and_task.py | 34 +++++++++++++++ tests/test_wave_06.py | 17 ++++---- 5 files changed, 97 insertions(+), 11 deletions(-) create mode 100644 migrations/versions/72a031104380_add_relationship_between_goal_and_task.py diff --git a/app/models/goal.py b/app/models/goal.py index a92770a78..379579e7f 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,9 +1,11 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from sqlalchemy.orm import relationship 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{ diff --git a/app/models/task.py b/app/models/task.py index 9f3bad489..8ed4ed249 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,21 +1,29 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db from typing import Optional from datetime import datetime +from sqlalchemy import ForeignKey class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title : Mapped[str] description : Mapped[str] completed_at : Mapped[Optional[datetime]] = mapped_column(nullable=True) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") def to_dict(self): - return{ + task_dict = { "id": self.id, "title": self.title, "description": self.description, - "is_complete": self.completed_at is not None + "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): diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 157875481..a5fd19f7c 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint,make_response, abort, request, Response from ..models.goal import Goal +from ..models.task import Task from app.routes.route_utilities import validate_model from app import db @@ -68,6 +69,46 @@ def remove_task(goal_id): return Response(status=204, mimetype="application/json") +@goal_bp.post("//tasks") +def assign_tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + + request_body = request.get_json() + task_ids = request_body.get("task_ids", []) + + # Clear existing task associations first + for task in goal.tasks: + task.goal_id = None + + tasks = [] + for task_id in task_ids: + task = validate_model(Task, task_id) + task.goal_id = goal.id + tasks.append(task) + + db.session.commit() + + return { + "id": goal.id, + "task_ids": [task.id for task in tasks] + }, 200 + +@goal_bp.get("//tasks") +def get_tasks_of_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + + task_list = [task.to_dict() for task in goal.tasks] + tasks_response = [] + for task in goal.tasks: + task_dict = task.to_dict() + task_dict["goal_id"] = goal.id # add goal_id if not in to_dict + tasks_response.append(task_dict) + + return { + "id": goal.id, + "title": goal.title, + "tasks": tasks_response + }, 200 diff --git a/migrations/versions/72a031104380_add_relationship_between_goal_and_task.py b/migrations/versions/72a031104380_add_relationship_between_goal_and_task.py new file mode 100644 index 000000000..de6edb3dc --- /dev/null +++ b/migrations/versions/72a031104380_add_relationship_between_goal_and_task.py @@ -0,0 +1,34 @@ +"""Add relationship between Goal and Task + +Revision ID: 72a031104380 +Revises: 76582c1eac6b +Create Date: 2025-05-08 22:27:19.962653 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '72a031104380' +down_revision = '76582c1eac6b' +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/tests/test_wave_06.py b/tests/test_wave_06.py index 0317f835a..9221860ed 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -25,7 +25,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(db.session.scalar(query).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -45,7 +45,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(db.session.scalar(query).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -53,14 +53,15 @@ 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") + assert response_body == { + "message": "Goal ID (1) not found." + } # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -77,7 +78,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -102,7 +103,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json()