From cd7fc6cd6534847660fb84ffcedef2061e81eb7d Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Thu, 6 Nov 2025 22:58:07 -0800 Subject: [PATCH 01/12] Complete Wave 1 --- app/__init__.py | 14 ++- app/models/task.py | 30 ++++- app/routes/route_utils.py | 20 ++++ app/routes/task_routes.py | 48 +++++++- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++ migrations/env.py | 113 ++++++++++++++++++ migrations/script.py.mako | 24 ++++ .../9633754af3cf_create_task_model.py | 39 ++++++ tests/test_wave_01.py | 62 ++++------ 10 files changed, 356 insertions(+), 45 deletions(-) create mode 100644 app/routes/route_utils.py create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/9633754af3cf_create_task_model.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..80b022bdf 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,22 +1,24 @@ +import os from flask import Flask from .db import db, migrate from .models import task, goal -import os + def create_app(config=None): app = Flask(__name__) - app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_DATABASE_URI" + ) if config: - # Merge `config` into the app's configuration - # to override the app's default settings for testing app.config.update(config) db.init_app(app) migrate.init_app(app, db) - # Register Blueprints here + from .routes.task_routes import bp as tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..184c7184a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,31 @@ -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) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + completed_at = db.Column(db.DateTime, 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, data): + try: + title = data["title"] + description = data["description"] + except KeyError as exc: + raise KeyError(exc.args[0]) + + return cls( + title=title, + description=description, + completed_at=data.get("completed_at"), + ) \ No newline at end of file diff --git a/app/routes/route_utils.py b/app/routes/route_utils.py new file mode 100644 index 000000000..c31b09312 --- /dev/null +++ b/app/routes/route_utils.py @@ -0,0 +1,20 @@ +from flask import abort, jsonify, make_response +from .. import db + + +def validate_model(cls, model_id): + instance = db.session.get(cls, model_id) + if instance is None: + abort( + make_response( + jsonify({"details": f"{cls.__name__} {model_id} not found"}), 404 + ) + ) + return instance + + +def create_from_dict_or_400(model_cls, data): + try: + return model_cls.from_dict(data) + except Exception: + abort(make_response(jsonify({"details": "Invalid data"}), 400)) \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..2ad6cad4c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,47 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, jsonify, Response +from .. import db +from ..models.task import Task +from .route_utils import validate_model, create_from_dict_or_400 + +bp = Blueprint("tasks", __name__, url_prefix="/tasks") + + +@bp.post("") +def create_task(): + data = request.get_json() or {} + task = create_from_dict_or_400(Task, data) + db.session.add(task) + db.session.commit() + return jsonify(task.to_dict()), 201 + + +@bp.get("") +def get_tasks(): + tasks = Task.query.order_by(Task.id).all() + return jsonify([t.to_dict() for t in tasks]), 200 + + +@bp.get("/") +def get_task(task_id): + task = validate_model(Task, task_id) + return jsonify(task.to_dict()), 200 + + +@bp.put("/") +def update_task(task_id): + task = validate_model(Task, task_id) + data = request.get_json() or {} + if "title" in data: + task.title = data["title"] + if "description" in data: + task.description = data["description"] + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@bp.delete("/") +def delete_task(task_id): + task = validate_model(Task, task_id) + db.session.delete(task) + db.session.commit() + return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic,flask_migrate + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..4c9709271 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option('sqlalchemy.url', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=get_metadata(), literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/9633754af3cf_create_task_model.py b/migrations/versions/9633754af3cf_create_task_model.py new file mode 100644 index 000000000..5a25ad2de --- /dev/null +++ b/migrations/versions/9633754af3cf_create_task_model.py @@ -0,0 +1,39 @@ +"""create task model + +Revision ID: 9633754af3cf +Revises: +Create Date: 2025-11-06 21:49:30.642285 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9633754af3cf' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index fac95a0a3..ed5943828 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,7 @@ from app.db import db import pytest -@pytest.mark.skip(reason="No way to test this feature yet") + def test_task_to_dict(): #Arrange new_task = Task(id = 1, title="Make My Bed", @@ -19,7 +19,7 @@ def test_task_to_dict(): assert task_dict["description"] == "Start the day off right!" assert task_dict["is_complete"] == False -@pytest.mark.skip(reason="No way to test this feature yet") + def test_task_to_dict_missing_id(): #Arrange new_task = Task(title="Make My Bed", @@ -36,7 +36,7 @@ def test_task_to_dict_missing_id(): assert task_dict["description"] == "Start the day off right!" assert task_dict["is_complete"] == False -@pytest.mark.skip(reason="No way to test this feature yet") + def test_task_to_dict_missing_title(): #Arrange new_task = Task(id = 1, @@ -53,7 +53,7 @@ def test_task_to_dict_missing_title(): assert task_dict["description"] == "Start the day off right!" assert task_dict["is_complete"] == False -@pytest.mark.skip(reason="No way to test this feature yet") + def test_task_from_dict(): #Arrange task_dict = { @@ -70,7 +70,7 @@ def test_task_from_dict(): assert task_obj.description == "Start the day off right!" assert task_obj.completed_at is None -@pytest.mark.skip(reason="No way to test this feature yet") + def test_task_from_dict_no_title(): #Arrange task_dict = { @@ -82,7 +82,7 @@ def test_task_from_dict_no_title(): with pytest.raises(KeyError, match = 'title'): Task.from_dict(task_dict) -@pytest.mark.skip(reason="No way to test this feature yet") + def test_task_from_dict_no_description(): #Arrange task_dict = { @@ -94,7 +94,7 @@ def test_task_from_dict_no_description(): with pytest.raises(KeyError, match = 'description'): Task.from_dict(task_dict) -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -105,7 +105,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -124,7 +124,6 @@ def test_get_tasks_one_saved_tasks(client, one_task): ] -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -140,7 +139,7 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -148,14 +147,11 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response.is_json + assert response_body == {"details": "Task 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -181,7 +177,7 @@ def test_create_task(client): assert new_task.description == "Test Description" assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") + def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -200,26 +196,23 @@ def test_update_task(client, one_task): assert task.completed_at == None - -@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={ - "title": "Updated Task Title", - "description": "Updated Test Description", - }) + response = client.put( + "/tasks/1", + json={ + "title": "Updated Task Title", + "description": "Updated Test Description", + }, + ) response_body = response.get_json() # Assert assert response.status_code == 404 + assert response.is_json + assert response_body == {"details": "Task 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -230,7 +223,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") + def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -238,16 +231,13 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response.is_json + 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") + def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -264,7 +254,7 @@ def test_create_task_must_contain_title(client): assert db.session.scalars(db.select(Task)).all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") + def test_create_task_must_contain_description(client): # Act response = client.post("/tasks", json={ From 603837f48adec23c7561a39ac24285a28b7d17c4 Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Thu, 6 Nov 2025 23:35:57 -0800 Subject: [PATCH 02/12] Complete Wave 2 --- app/routes/task_routes.py | 10 +++++++++- tests/test_wave_02.py | 2 -- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 2ad6cad4c..3891f9342 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -17,7 +17,15 @@ def create_task(): @bp.get("") def get_tasks(): - tasks = Task.query.order_by(Task.id).all() + sort_param = request.args.get("sort", default=None, type=str) + + if sort_param == "asc": + tasks = Task.query.order_by(Task.title.asc()).all() + elif sort_param == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.order_by(Task.id).all() + return jsonify([t.to_dict() for t in tasks]), 200 diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..e03e5c99a 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,6 @@ import pytest -@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 +28,6 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@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 e6657c3318ee41a3cfd73a5de57d93aaa4cab876 Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Fri, 7 Nov 2025 00:04:12 -0800 Subject: [PATCH 03/12] Complete Wave 3 --- app/routes/task_routes.py | 32 +++++++++++++++++++------------- tests/test_wave_03.py | 19 +++---------------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3891f9342..545fe86a4 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,10 +2,10 @@ from .. import db from ..models.task import Task from .route_utils import validate_model, create_from_dict_or_400 +from datetime import datetime, UTC bp = Blueprint("tasks", __name__, url_prefix="/tasks") - @bp.post("") def create_task(): data = request.get_json() or {} @@ -14,42 +14,48 @@ def create_task(): db.session.commit() return jsonify(task.to_dict()), 201 - @bp.get("") def get_tasks(): - sort_param = request.args.get("sort", default=None, type=str) - + sort_param = request.args.get("sort") if sort_param == "asc": tasks = Task.query.order_by(Task.title.asc()).all() elif sort_param == "desc": tasks = Task.query.order_by(Task.title.desc()).all() else: tasks = Task.query.order_by(Task.id).all() - return jsonify([t.to_dict() for t in tasks]), 200 - @bp.get("/") def get_task(task_id): task = validate_model(Task, task_id) return jsonify(task.to_dict()), 200 - @bp.put("/") def update_task(task_id): task = validate_model(Task, task_id) - data = request.get_json() or {} - if "title" in data: - task.title = data["title"] - if "description" in data: - task.description = data["description"] + data = request.get_json() + task.title = data["title"] + task.description = data["description"] db.session.commit() return Response(status=204, mimetype="application/json") - @bp.delete("/") def delete_task(task_id): task = validate_model(Task, task_id) db.session.delete(task) db.session.commit() + return Response(status=204, mimetype="application/json") + +@bp.patch("//mark_complete") +def mark_complete(task_id): + task = validate_model(Task, task_id) + task.completed_at = datetime.now(UTC) + db.session.commit() + return Response(status=204, mimetype="application/json") + +@bp.patch("//mark_incomplete") +def mark_incomplete(task_id): + task = validate_model(Task, task_id) + task.completed_at = None + db.session.commit() return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..50a32c0a8 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -6,7 +6,6 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -34,7 +33,6 @@ 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") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -46,7 +44,6 @@ 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") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -74,7 +71,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") + def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -86,7 +83,6 @@ 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") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -94,14 +90,9 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"details": "Task 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -109,8 +100,4 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"details": "Task 1 not found"} From 76c39ca21bf2c26d8af3f3eceacbc69a173da79d Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Tue, 11 Nov 2025 12:05:11 -0800 Subject: [PATCH 04/12] Complete Wave 4 --- PY | 0 app/__init__.py | 10 +++------- app/routes/task_routes.py | 14 ++++++++++++++ import | 0 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 PY create mode 100644 import diff --git a/PY b/PY new file mode 100644 index 000000000..e69de29bb diff --git a/app/__init__.py b/app/__init__.py index 80b022bdf..fb2535fc0 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,16 +1,12 @@ -import os from flask import Flask from .db import db, migrate -from .models import task, goal - +import os def create_app(config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI" - ) + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI") if config: app.config.update(config) @@ -21,4 +17,4 @@ def create_app(config=None): from .routes.task_routes import bp as tasks_bp app.register_blueprint(tasks_bp) - return app + return app \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 545fe86a4..c29e09907 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -3,6 +3,8 @@ from ..models.task import Task from .route_utils import validate_model, create_from_dict_or_400 from datetime import datetime, UTC +import requests +import os bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -51,6 +53,18 @@ def mark_complete(task_id): task = validate_model(Task, task_id) task.completed_at = datetime.now(UTC) db.session.commit() + + slack_token = os.environ.get("SLACK_BOT_TOKEN") + slack_channel = os.environ.get("SLACK_CHANNEL") + message = f"Someone just completed the task: {task.title}" + + if slack_token and slack_channel: + requests.post( + "https://slack.com/api/chat.postMessage", + headers={"Authorization": f"Bearer {slack_token}"}, + json={"channel": slack_channel, "text": message} + ) + return Response(status=204, mimetype="application/json") @bp.patch("//mark_incomplete") diff --git a/import b/import new file mode 100644 index 000000000..e69de29bb From e0b42b36269682f3dd23a4e2f62dc42f5949df0a Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Sat, 15 Nov 2025 20:27:24 -0800 Subject: [PATCH 05/12] Wave 5: Goal model, CRUD, and tests --- app/__init__.py | 13 ++++++- app/models/goal.py | 15 ++++++++ app/routes/goal_routes.py | 54 +++++++++++++++++++++++++- app/routes/route_utils.py | 42 ++++++++++++-------- tests/test_wave_05.py | 80 ++++++++++++++------------------------- 5 files changed, 134 insertions(+), 70 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index fb2535fc0..0817dbae8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,11 +2,14 @@ from .db import db, migrate import os + def create_app(config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_DATABASE_URI" + ) if config: app.config.update(config) @@ -14,7 +17,13 @@ def create_app(config=None): db.init_app(app) migrate.init_app(app, db) - from .routes.task_routes import bp as tasks_bp + from app.models.task import Task + from app.models.goal import Goal + + from app.routes.task_routes import bp as tasks_bp + from app.routes.goal_routes import goal_bp + app.register_blueprint(tasks_bp) + app.register_blueprint(goal_bp) return app \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..b13aef53d 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,20 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db + class Goal(db.Model): + __tablename__ = "goal" + id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] = mapped_column(nullable=False) + + def to_dict(self) -> dict: + return { + "id": self.id, + "title": self.title, + } + + @classmethod + def from_dict(cls, data: dict): + title = data["title"] + return cls(title=title) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..8cbc4d6ea 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,53 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, jsonify, request, make_response +from app import db +from app.models.goal import Goal +from app.routes.route_utils import validate_model, create_from_dict_or_400 + + +goal_bp = Blueprint("goals", __name__, url_prefix="/goals") + + +@goal_bp.route("", methods=["POST"]) +def create_goal(): + data = request.get_json() or {} + goal = create_from_dict_or_400(Goal, data) + + db.session.add(goal) + db.session.commit() + + return jsonify(goal.to_dict()), 201 + + +@goal_bp.route("", methods=["GET"]) +def list_goals(): + goals = Goal.query.all() + return jsonify([goal.to_dict() for goal in goals]), 200 + + +@goal_bp.route("/", methods=["GET"]) +def get_goal(goal_id): + goal = validate_model(Goal, goal_id) + return jsonify(goal.to_dict()), 200 + + +@goal_bp.route("/", methods=["PUT"]) +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + data = request.get_json() or {} + + if "title" in data: + goal.title = data["title"] + + db.session.commit() + + return make_response(jsonify(goal.to_dict()), 204) + + +@goal_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = validate_model(Goal, goal_id) + + db.session.delete(goal) + db.session.commit() + + return make_response(jsonify(goal.to_dict()), 204) diff --git a/app/routes/route_utils.py b/app/routes/route_utils.py index c31b09312..d42e43af2 100644 --- a/app/routes/route_utils.py +++ b/app/routes/route_utils.py @@ -1,20 +1,32 @@ -from flask import abort, jsonify, make_response -from .. import db +from flask import abort, make_response -def validate_model(cls, model_id): - instance = db.session.get(cls, model_id) - if instance is None: - abort( - make_response( - jsonify({"details": f"{cls.__name__} {model_id} not found"}), 404 - ) - ) - return instance +def validate_model(model_cls, model_id): + try: + model_id_int = int(model_id) + except ValueError: + name = model_cls.__name__ + abort(make_response({"message": f"{name} {model_id} invalid"}, 400)) + + model = model_cls.query.get(model_id_int) + + if model is None: + name = model_cls.__name__ + + if name == "Task": + body = {"details": f"{name} {model_id_int} not found"} + else: + body = {"message": f"{name} {model_id_int} not found"} + abort(make_response(body, 404)) -def create_from_dict_or_400(model_cls, data): + return model + + +def create_from_dict_or_400(model_cls, data: dict): try: - return model_cls.from_dict(data) - except Exception: - abort(make_response(jsonify({"details": "Invalid data"}), 400)) \ No newline at end of file + model = model_cls.from_dict(data) + except (KeyError, TypeError): + abort(make_response({"details": "Invalid data"}, 400)) + + return model \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index b7cc330ae..0190504d2 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ from app.models.goal import Goal import pytest -@pytest.mark.skip(reason="No way to test this feature yet") + def test_goal_to_dict(): #Arrange new_goal = Goal(id=1, title="Seize the Day!") @@ -13,7 +13,7 @@ def test_goal_to_dict(): assert goal_dict["id"] == 1 assert goal_dict["title"] == "Seize the Day!" -@pytest.mark.skip(reason="No way to test this feature yet") + def test_goal_to_dict_no_id(): #Arrange new_goal = Goal(title="Seize the Day!") @@ -25,7 +25,7 @@ def test_goal_to_dict_no_id(): assert goal_dict["id"] is None assert goal_dict["title"] == "Seize the Day!" -@pytest.mark.skip(reason="No way to test this feature yet") + def test_goal_to_dict_no_title(): #Arrange new_goal = Goal(id=1) @@ -38,8 +38,6 @@ def test_goal_to_dict_no_title(): assert goal_dict["title"] is None - -@pytest.mark.skip(reason="No way to test this feature yet") def test_goal_from_dict(): #Arrange goal_dict = { @@ -52,7 +50,7 @@ def test_goal_from_dict(): #Assert assert goal_obj.title == "Seize the Day!" -@pytest.mark.skip(reason="No way to test this feature yet") + def test_goal_from_dict_no_title(): #Arrange goal_dict = { @@ -63,7 +61,6 @@ def test_goal_from_dict_no_title(): Goal.from_dict(goal_dict) -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -74,7 +71,6 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -91,7 +87,6 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -105,22 +100,16 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") - # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert "message" in response_body -@pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -136,34 +125,30 @@ def test_create_goal(client): } -@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 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 + + get_response = client.get("/goals/1") + get_body = get_response.get_json() + + assert get_response.status_code == 200 + assert get_body["id"] == 1 + assert get_body["title"] == "Updated Title" -@pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.put("/goals/999", json={"title": "Doesn't matter"}) + response_body = response.get_json() - # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert "message" in response_body -@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -178,27 +163,18 @@ 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*************** - # ***************************************************************** + response_body = response.get_json() + assert "message" in response_body -@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/999") + response_body = response.get_json() - # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert "message" in response_body -@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 2aa3bd81012844cbe416c9f2048b9e04fee6b3a2 Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Sat, 15 Nov 2025 22:20:24 -0800 Subject: [PATCH 06/12] Wave 6: goal-task relationship, CRUD updates, all tests passing --- app/models/goal.py | 20 ++-- app/models/task.py | 31 ++--- app/routes/goal_routes.py | 72 +++++++++--- app/routes/task_routes.py | 110 +++++++++++------- ...67a6bac3_wave_6_add_goal_id_fk_to_tasks.py | 34 ++++++ tests/test_wave_06.py | 12 +- 6 files changed, 182 insertions(+), 97 deletions(-) create mode 100644 migrations/versions/85a867a6bac3_wave_6_add_goal_id_fk_to_tasks.py diff --git a/app/models/goal.py b/app/models/goal.py index b13aef53d..2994381ca 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,20 +1,20 @@ -from sqlalchemy.orm import Mapped, mapped_column -from ..db import db - +from app import db class Goal(db.Model): - __tablename__ = "goal" + id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String, nullable=False) - id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] = mapped_column(nullable=False) + tasks = db.relationship("Task", back_populates="goal") - def to_dict(self) -> dict: + def to_dict(self): return { "id": self.id, - "title": self.title, + "title": self.title } @classmethod - def from_dict(cls, data: dict): - title = data["title"] + def from_dict(cls, data): + title = data.get("title") + if not title: + raise KeyError("title is required") return cls(title=title) diff --git a/app/models/task.py b/app/models/task.py index 184c7184a..ddad5f694 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,31 +1,36 @@ +from app import db from datetime import datetime -from ..db import db - class Task(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) + id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String, nullable=False) - description = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=True) completed_at = db.Column(db.DateTime, nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.id"), nullable=True) + goal = db.relationship("Goal", back_populates="tasks") + def to_dict(self): return { "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 } + def to_dict_with_goal(self): + d = self.to_dict() + d["goal_id"] = self.goal_id + return d + @classmethod def from_dict(cls, data): - try: - title = data["title"] - description = data["description"] - except KeyError as exc: - raise KeyError(exc.args[0]) + if "title" not in data: + raise KeyError("title") + if "description" not in data: + raise KeyError("description") return cls( - title=title, - description=description, - completed_at=data.get("completed_at"), + title=data["title"], + description=data["description"] ) \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 8cbc4d6ea..a6942a17d 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,31 +1,35 @@ -from flask import Blueprint, jsonify, request, make_response +from flask import Blueprint, request, jsonify, make_response from app import db from app.models.goal import Goal -from app.routes.route_utils import validate_model, create_from_dict_or_400 +from app.models.task import Task +from app.routes.route_utils import validate_model - -goal_bp = Blueprint("goals", __name__, url_prefix="/goals") +goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals") @goal_bp.route("", methods=["POST"]) def create_goal(): - data = request.get_json() or {} - goal = create_from_dict_or_400(Goal, data) + request_body = request.get_json() or {} + title = request_body.get("title") + if not title: + return make_response({"details": "Invalid data"}, 400) - db.session.add(goal) + new_goal = Goal(title=title) + db.session.add(new_goal) db.session.commit() - return jsonify(goal.to_dict()), 201 + return jsonify(new_goal.to_dict()), 201 @goal_bp.route("", methods=["GET"]) -def list_goals(): +def get_goals(): goals = Goal.query.all() - return jsonify([goal.to_dict() for goal in goals]), 200 + response = [goal.to_dict() for goal in goals] + return jsonify(response), 200 @goal_bp.route("/", methods=["GET"]) -def get_goal(goal_id): +def read_goal(goal_id): goal = validate_model(Goal, goal_id) return jsonify(goal.to_dict()), 200 @@ -33,21 +37,53 @@ def get_goal(goal_id): @goal_bp.route("/", methods=["PUT"]) def update_goal(goal_id): goal = validate_model(Goal, goal_id) - data = request.get_json() or {} - - if "title" in data: - goal.title = data["title"] + request_body = request.get_json() or {} + title = request_body.get("title") + if not title: + return make_response({"details": "Invalid data"}, 400) + goal.title = title db.session.commit() - return make_response(jsonify(goal.to_dict()), 204) + return "", 204 @goal_bp.route("/", methods=["DELETE"]) def delete_goal(goal_id): goal = validate_model(Goal, goal_id) - db.session.delete(goal) db.session.commit() + return "", 204 + + +@goal_bp.route("//tasks", methods=["POST"]) +def assign_tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() or {} + task_ids = request_body.get("task_ids") + if not isinstance(task_ids, list): + return make_response({"details": "Invalid data"}, 400) + + for task in goal.tasks: + task.goal_id = None - return make_response(jsonify(goal.to_dict()), 204) + validated_ids = [] + for tid in task_ids: + task = validate_model(Task, tid) + task.goal_id = goal.id + validated_ids.append(task.id) + + db.session.commit() + + return jsonify({"id": goal.id, "task_ids": validated_ids}), 200 + + +@goal_bp.route("//tasks", methods=["GET"]) +def get_tasks_of_goal(goal_id): + goal = validate_model(Goal, goal_id) + tasks_payload = [t.to_dict_with_goal() for t in goal.tasks] + return jsonify({ + "id": goal.id, + "title": goal.title, + "tasks": tasks_payload + }), 200 \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index c29e09907..fe3966654 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,75 +1,95 @@ -from flask import Blueprint, request, jsonify, Response -from .. import db -from ..models.task import Task -from .route_utils import validate_model, create_from_dict_or_400 -from datetime import datetime, UTC -import requests -import os +from flask import Blueprint, request, jsonify, make_response +from app import db +from app.models.task import Task +from app.routes.route_utils import validate_model -bp = Blueprint("tasks", __name__, url_prefix="/tasks") +bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") -@bp.post("") + +@bp.route("", methods=["POST"]) def create_task(): - data = request.get_json() or {} - task = create_from_dict_or_400(Task, data) - db.session.add(task) + request_body = request.get_json() or {} + + if "title" not in request_body or "description" not in request_body: + return make_response({"details": "Invalid data"}, 400) + + try: + new_task = Task.from_dict(request_body) + except KeyError: + return make_response({"details": "Invalid data"}, 400) + + db.session.add(new_task) db.session.commit() - return jsonify(task.to_dict()), 201 -@bp.get("") -def get_tasks(): - sort_param = request.args.get("sort") - if sort_param == "asc": + return new_task.to_dict(), 201 + + +@bp.route("", methods=["GET"]) +def get_all_tasks(): + sort_query = request.args.get("sort") + + if sort_query == "asc": tasks = Task.query.order_by(Task.title.asc()).all() - elif sort_param == "desc": + elif sort_query == "desc": tasks = Task.query.order_by(Task.title.desc()).all() else: - tasks = Task.query.order_by(Task.id).all() - return jsonify([t.to_dict() for t in tasks]), 200 + tasks = Task.query.all() + + response = [task.to_dict() for task in tasks] + return jsonify(response), 200 + -@bp.get("/") +@bp.route("/", methods=["GET"]) def get_task(task_id): task = validate_model(Task, task_id) - return jsonify(task.to_dict()), 200 + task_dict = task.to_dict() + + if task.goal_id is not None: + task_dict["goal_id"] = task.goal_id + + return task_dict, 200 + -@bp.put("/") +@bp.route("/", methods=["PUT"]) def update_task(task_id): task = validate_model(Task, task_id) - data = request.get_json() - task.title = data["title"] - task.description = data["description"] + request_body = request.get_json() or {} + + title = request_body.get("title") + description = request_body.get("description") + + if not title or not description: + return make_response({"details": "Invalid data"}, 400) + + task.title = title + task.description = description + db.session.commit() - return Response(status=204, mimetype="application/json") -@bp.delete("/") + return "", 204 + + +@bp.route("/", methods=["DELETE"]) def delete_task(task_id): task = validate_model(Task, task_id) + db.session.delete(task) db.session.commit() - return Response(status=204, mimetype="application/json") -@bp.patch("//mark_complete") + return "", 204 + + +@bp.route("//mark_complete", methods=["PATCH"]) def mark_complete(task_id): task = validate_model(Task, task_id) - task.completed_at = datetime.now(UTC) + task.completed_at = task.completed_at or db.func.now() db.session.commit() + return "", 204 - slack_token = os.environ.get("SLACK_BOT_TOKEN") - slack_channel = os.environ.get("SLACK_CHANNEL") - message = f"Someone just completed the task: {task.title}" - - if slack_token and slack_channel: - requests.post( - "https://slack.com/api/chat.postMessage", - headers={"Authorization": f"Bearer {slack_token}"}, - json={"channel": slack_channel, "text": message} - ) - - return Response(status=204, mimetype="application/json") -@bp.patch("//mark_incomplete") +@bp.route("//mark_incomplete", methods=["PATCH"]) def mark_incomplete(task_id): task = validate_model(Task, task_id) task.completed_at = None db.session.commit() - return Response(status=204, mimetype="application/json") \ No newline at end of file + return "", 204 \ No newline at end of file diff --git a/migrations/versions/85a867a6bac3_wave_6_add_goal_id_fk_to_tasks.py b/migrations/versions/85a867a6bac3_wave_6_add_goal_id_fk_to_tasks.py new file mode 100644 index 000000000..5f129b09f --- /dev/null +++ b/migrations/versions/85a867a6bac3_wave_6_add_goal_id_fk_to_tasks.py @@ -0,0 +1,34 @@ +"""Wave 6: add goal_id FK to tasks + +Revision ID: 85a867a6bac3 +Revises: 9633754af3cf +Create Date: 2025-11-15 21:23:02.857604 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '85a867a6bac3' +down_revision = '9633754af3cf' +branch_labels = None +depends_on = None + + +def upgrade(): + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key( + 'fk_task_goal_id_goal', + source_table='task', + referent_table='goal', + local_cols=['goal_id'], + remote_cols=['id'] # ВАЖНО: ссылка на goal.id + ) + + +def downgrade(): + op.drop_constraint('fk_task_goal_id_goal', 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + + # ### end Alembic commands ### diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 727fce93a..aad386271 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -3,7 +3,6 @@ import pytest -@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 +24,6 @@ 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") def test_post_task_ids_to_goal_overwrites_existing_tasks(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -45,7 +43,6 @@ def test_post_task_ids_to_goal_overwrites_existing_tasks(client, one_task_belong assert len(db.session.scalar(query).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -53,14 +50,9 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@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 +69,6 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@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 +93,6 @@ 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") 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 17e3a02374372d29b8fef2bdcd176b4151159ef3 Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Sun, 16 Nov 2025 22:38:30 -0800 Subject: [PATCH 07/12] Wave 7 complete: added route utilities, refactored routes, all tests passing --- app/routes/goal_routes.py | 2 +- app/routes/route_utilities.py | 40 ++++++++++++++++++++++++ app/routes/route_utils.py | 32 -------------------- app/routes/task_routes.py | 17 +++-------- tests/test_wave_07.py | 57 +++++++++++++++++------------------ 5 files changed, 73 insertions(+), 75 deletions(-) create mode 100644 app/routes/route_utilities.py delete mode 100644 app/routes/route_utils.py diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index a6942a17d..437384547 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -2,7 +2,7 @@ from app import db from app.models.goal import Goal from app.models.task import Task -from app.routes.route_utils import validate_model +from app.routes.route_utilities import validate_model, create_model goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals") diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..7d2cae675 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,40 @@ +from flask import abort, make_response +from app import db + + +def validate_model(model_class, model_id): + model_name = model_class.__name__ + error_key = "details" if model_name == "Task" else "message" + + try: + model_id_int = int(model_id) + except ValueError: + abort(make_response( + {error_key: f"{model_name} {model_id} invalid"}, + 400, + )) + + model = model_class.query.get(model_id_int) + + if model is None: + abort(make_response( + {error_key: f"{model_name} {model_id_int} not found"}, + 404, + )) + + return model + + +def create_model(model_class, request_body): + try: + new_model = model_class.from_dict(request_body) + except KeyError: + abort(make_response( + {"details": "Invalid data"}, + 400, + )) + + db.session.add(new_model) + db.session.commit() + + return new_model.to_dict(), 201 \ No newline at end of file diff --git a/app/routes/route_utils.py b/app/routes/route_utils.py deleted file mode 100644 index d42e43af2..000000000 --- a/app/routes/route_utils.py +++ /dev/null @@ -1,32 +0,0 @@ -from flask import abort, make_response - - -def validate_model(model_cls, model_id): - try: - model_id_int = int(model_id) - except ValueError: - name = model_cls.__name__ - abort(make_response({"message": f"{name} {model_id} invalid"}, 400)) - - model = model_cls.query.get(model_id_int) - - if model is None: - name = model_cls.__name__ - - if name == "Task": - body = {"details": f"{name} {model_id_int} not found"} - else: - body = {"message": f"{name} {model_id_int} not found"} - - abort(make_response(body, 404)) - - return model - - -def create_from_dict_or_400(model_cls, data: dict): - try: - model = model_cls.from_dict(data) - except (KeyError, TypeError): - abort(make_response({"details": "Invalid data"}, 400)) - - return model \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index fe3966654..38651558c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,7 +1,7 @@ from flask import Blueprint, request, jsonify, make_response from app import db from app.models.task import Task -from app.routes.route_utils import validate_model +from app.routes.route_utilities import validate_model, create_model bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -10,18 +10,9 @@ def create_task(): request_body = request.get_json() or {} - if "title" not in request_body or "description" not in request_body: - return make_response({"details": "Invalid data"}, 400) - - try: - new_task = Task.from_dict(request_body) - except KeyError: - return make_response({"details": "Invalid data"}, 400) + response_body, status_code = create_model(Task, request_body) - db.session.add(new_task) - db.session.commit() - - return new_task.to_dict(), 201 + return response_body, status_code @bp.route("", methods=["GET"]) @@ -84,6 +75,7 @@ def mark_complete(task_id): task = validate_model(Task, task_id) task.completed_at = task.completed_at or db.func.now() db.session.commit() + return "", 204 @@ -92,4 +84,5 @@ def mark_incomplete(task_id): task = validate_model(Task, task_id) task.completed_at = None db.session.commit() + return "", 204 \ No newline at end of file diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py index 7e7cef55a..5aece7c4f 100644 --- a/tests/test_wave_07.py +++ b/tests/test_wave_07.py @@ -4,7 +4,7 @@ from app.models.task import Task from app.routes.route_utilities import create_model, validate_model -@pytest.mark.skip(reason="No way to test this feature yet") + def test_route_utilities_validate_model_with_task(client, three_tasks): #Act task_1 = validate_model(Task, 1) @@ -24,7 +24,6 @@ def test_route_utilities_validate_model_with_task(client, three_tasks): assert task_3.title == "Pay my outstanding tickets 😭" -@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_validate_model_with_task_invalid_id(client, three_tasks): #Act & Assert # Calling `validate_model` without being invoked by a route will @@ -36,24 +35,21 @@ def test_route_utilities_validate_model_with_task_invalid_id(client, three_tasks response = e.value.get_response() assert response.status_code == 400 - raise Exception("Complete test with an assertion about the response body") - # ***************************************************************************** - # ** Complete test with an assertion about the response body **************** - # ***************************************************************************** + response_body = response.get_json() + assert response_body == {"details": "Task One invalid"} -@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_validate_model_with_task_missing_id(client, three_tasks): #Act & Assert with pytest.raises(HTTPException) as e: result_task = validate_model(Task, 4) - raise Exception("Complete test with assertion status code and response body") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 404 + + response_body = response.get_json() + assert response_body == {"details": "Task 4 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_validate_model_with_goal(client, one_goal): #Act goal_1 = validate_model(Goal, 1) @@ -62,29 +58,30 @@ def test_route_utilities_validate_model_with_goal(client, one_goal): assert goal_1.id == 1 assert goal_1.title == "Build a habit of going outside daily" -@pytest.mark.skip(reason="No way to test this feature yet") + def test_route_utilities_validate_model_with_goal_invalid_id(client, one_goal): #Act & Assert with pytest.raises(HTTPException) as e: result_task = validate_model(Goal, "One") - raise Exception("Complete test with assertion status code and response body") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 400 + + response_body = response.get_json() + assert response_body == {"message": "Goal One invalid"} + -@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_validate_model_with_goal_missing_id(client, one_goal): #Act & Assert with pytest.raises(HTTPException) as e: result_task = validate_model(Goal, 4) - raise Exception("Complete test with assertion status code and response body") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 404 + + response_body = response.get_json() + assert response_body == {"message": "Goal 4 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_create_model_with_task(client): #Arrange request_body = { @@ -103,7 +100,7 @@ def test_route_utilities_create_model_with_task(client): assert response[0]["is_complete"] == False assert response[1] == 201 -@pytest.mark.skip(reason="No way to test this feature yet") + def test_route_utilities_create_model_with_task_missing_title(client): #Arrange request_body = { @@ -120,7 +117,6 @@ def test_route_utilities_create_model_with_task_missing_title(client): assert response.get_json() == {"details": "Invalid data"} -@pytest.mark.skip(reason="No way to test this feature yet") def test_route_utilities_create_model_with_goal(client): #Arrange request_body = { @@ -135,7 +131,7 @@ def test_route_utilities_create_model_with_goal(client): assert response[0]["title"] == "Seize the Day!" assert response[1] == 201 -@pytest.mark.skip(reason="No way to test this feature yet") + def test_route_utilities_create_model_with_goal_missing_title(client): #Arrange request_body = { @@ -145,7 +141,8 @@ def test_route_utilities_create_model_with_goal_missing_title(client): with pytest.raises(HTTPException) as e: create_model(Goal, request_body) - raise Exception("Complete test with assertion status code and response body") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 400 + + response_body = response.get_json() + assert response_body == {"details": "Invalid data"} \ No newline at end of file From ddaa85ecfd4995b4993c4512956fcd1555df399e Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Sun, 16 Nov 2025 22:46:40 -0800 Subject: [PATCH 08/12] Fix Wave 7 missing title test --- tests/test_wave_07.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py index 7e7cef55a..923bce72c 100644 --- a/tests/test_wave_07.py +++ b/tests/test_wave_07.py @@ -135,7 +135,7 @@ def test_route_utilities_create_model_with_goal(client): assert response[0]["title"] == "Seize the Day!" assert response[1] == 201 -@pytest.mark.skip(reason="No way to test this feature yet") + def test_route_utilities_create_model_with_goal_missing_title(client): #Arrange request_body = { @@ -145,7 +145,8 @@ def test_route_utilities_create_model_with_goal_missing_title(client): with pytest.raises(HTTPException) as e: create_model(Goal, request_body) - raise Exception("Complete test with assertion status code and response body") - # ***************************************************************************** - # **Complete test with assertion about status code response body*************** - # ***************************************************************************** + response = e.value.get_response() + assert response.status_code == 400 + + response_body = response.get_json() + assert response_body == {"details": "Invalid data"} From 6de448336a7fcede7894885b2384c738a60a8213 Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Sun, 16 Nov 2025 23:08:09 -0800 Subject: [PATCH 09/12] Finalize Wave 7 tests --- tests/test_wave_07.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py index 9678d6740..a317e5fc7 100644 --- a/tests/test_wave_07.py +++ b/tests/test_wave_07.py @@ -141,7 +141,7 @@ def test_route_utilities_create_model_with_goal_missing_title(client): with pytest.raises(HTTPException) as e: create_model(Goal, request_body) - response = e.value.get_response() + response = e.value.get_response() assert response.status_code == 400 response_body = response.get_json() From cf34ff2ff3f5d3d8d9e4512a180ac8fa224abe9f Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Mon, 17 Nov 2025 00:13:59 -0800 Subject: [PATCH 10/12] Add migration for Goal model --- .../7520b2ea5ed3_create_goal_model.py | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 migrations/versions/7520b2ea5ed3_create_goal_model.py diff --git a/migrations/versions/7520b2ea5ed3_create_goal_model.py b/migrations/versions/7520b2ea5ed3_create_goal_model.py new file mode 100644 index 000000000..b0b056846 --- /dev/null +++ b/migrations/versions/7520b2ea5ed3_create_goal_model.py @@ -0,0 +1,36 @@ +"""Create goal model + +Revision ID: 7520b2ea5ed3 +Revises: 85a867a6bac3 +Create Date: 2025-11-17 00:11:16.527288 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '7520b2ea5ed3' +down_revision = '85a867a6bac3' +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.alter_column('description', + existing_type=sa.VARCHAR(), + nullable=True) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.alter_column('description', + existing_type=sa.VARCHAR(), + nullable=False) + + # ### end Alembic commands ### From 074e9111c99efd946c162c402cc88b670c592686 Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Mon, 17 Nov 2025 01:13:44 -0800 Subject: [PATCH 11/12] Add migration for goal title column --- ...ee8e5_add_title_column_to_goal_manually.py | 27 +++++++++++++++++++ .../7520b2ea5ed3_create_goal_model.py | 4 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 migrations/versions/499d291ee8e5_add_title_column_to_goal_manually.py diff --git a/migrations/versions/499d291ee8e5_add_title_column_to_goal_manually.py b/migrations/versions/499d291ee8e5_add_title_column_to_goal_manually.py new file mode 100644 index 000000000..5014c3b2e --- /dev/null +++ b/migrations/versions/499d291ee8e5_add_title_column_to_goal_manually.py @@ -0,0 +1,27 @@ +"""Add title column to goal manually + +Revision ID: 499d291ee8e5 +Revises: 7520b2ea5ed3 +Create Date: 2025-11-17 01:07:37.471697 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '499d291ee8e5' +down_revision = '7520b2ea5ed3' +branch_labels = None +depends_on = None + + +def upgrade(): + op.add_column( + "goal", + sa.Column("title", sa.String(), nullable=True), + ) + + +def downgrade(): + op.drop_column("goal", "title") diff --git a/migrations/versions/7520b2ea5ed3_create_goal_model.py b/migrations/versions/7520b2ea5ed3_create_goal_model.py index b0b056846..6c7452931 100644 --- a/migrations/versions/7520b2ea5ed3_create_goal_model.py +++ b/migrations/versions/7520b2ea5ed3_create_goal_model.py @@ -30,7 +30,7 @@ def downgrade(): # ### commands auto generated by Alembic - please adjust! ### with op.batch_alter_table('task', schema=None) as batch_op: batch_op.alter_column('description', - existing_type=sa.VARCHAR(), - nullable=False) + existing_type=sa.VARCHAR(), + nullable=False) # ### end Alembic commands ### From 13e714e8dd3fbe674a15907e887e088dcd641b8e Mon Sep 17 00:00:00 2001 From: Tatiana Didenko Date: Tue, 2 Dec 2025 10:12:04 -0800 Subject: [PATCH 12/12] Refactored code based on feedback: updated queries, responses, helper functions, Slack integration, and tests. --- app/__init__.py | 10 ++--- app/models/goal.py | 21 +++++++--- app/models/task.py | 33 ++++++++------- app/routes/goal_routes.py | 54 +++++++++--------------- app/routes/route_utilities.py | 15 +++++-- app/routes/task_routes.py | 77 +++++++++++++++++++---------------- tests/test_wave_05.py | 9 ++-- 7 files changed, 114 insertions(+), 105 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 0817dbae8..f17de5b8a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,10 @@ from flask import Flask from .db import db, migrate import os +from app.models.task import Task +from app.models.goal import Goal +from app.routes.task_routes import bp as tasks_bp +from app.routes.goal_routes import bp as goal_bp def create_app(config=None): @@ -17,12 +21,6 @@ def create_app(config=None): db.init_app(app) migrate.init_app(app, db) - from app.models.task import Task - from app.models.goal import Goal - - from app.routes.task_routes import bp as tasks_bp - from app.routes.goal_routes import goal_bp - app.register_blueprint(tasks_bp) app.register_blueprint(goal_bp) diff --git a/app/models/goal.py b/app/models/goal.py index 2994381ca..a02c67126 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,17 +1,26 @@ +from typing import List +from sqlalchemy.orm import Mapped, mapped_column, relationship from app import db + class Goal(db.Model): - id = db.Column(db.Integer, primary_key=True) - title = db.Column(db.String, nullable=False) + __tablename__ = "goal" - tasks = db.relationship("Task", back_populates="goal") + id: Mapped[int] = mapped_column(primary_key=True) + title: Mapped[str] = mapped_column(db.String, nullable=False) + tasks: Mapped[List["Task"]] = relationship(back_populates="goal") - def to_dict(self): - return { + def to_dict(self, with_tasks: bool = False): + goal_dict = { "id": self.id, - "title": self.title + "title": self.title, } + if with_tasks: + goal_dict["tasks"] = [task.to_dict() for task in self.tasks] + + return goal_dict + @classmethod def from_dict(cls, data): title = data.get("title") diff --git a/app/models/task.py b/app/models/task.py index ddad5f694..45b7a28ad 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,28 +1,33 @@ -from app import db from datetime import datetime +from typing import Optional +from sqlalchemy.orm import Mapped, mapped_column, relationship +from app import db + class Task(db.Model): - id = db.Column(db.Integer, primary_key=True) - title = db.Column(db.String, nullable=False) - description = db.Column(db.String, nullable=True) - completed_at = db.Column(db.DateTime, nullable=True) + __tablename__ = "task" - goal_id = db.Column(db.Integer, db.ForeignKey("goal.id"), nullable=True) - goal = db.relationship("Goal", back_populates="tasks") + id: Mapped[int] = mapped_column(primary_key=True) + title: Mapped[str] = mapped_column(db.String, nullable=False) + description: Mapped[Optional[str]] = mapped_column(db.String, nullable=True) + completed_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime, nullable=True) + + goal_id: Mapped[Optional[int]] = mapped_column( + db.Integer, + db.ForeignKey("goal.id"), + nullable=True, + ) + goal: Mapped["Goal"] = relationship(back_populates="tasks") def to_dict(self): return { "id": self.id, "title": self.title, "description": self.description, - "is_complete": self.completed_at is not None + "is_complete": bool(self.completed_at), + **({"goal_id": self.goal_id} if self.goal_id is not None else {}) } - def to_dict_with_goal(self): - d = self.to_dict() - d["goal_id"] = self.goal_id - return d - @classmethod def from_dict(cls, data): if "title" not in data: @@ -32,5 +37,5 @@ def from_dict(cls, data): return cls( title=data["title"], - description=data["description"] + description=data["description"], ) \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 437384547..82e2fa9c5 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,40 +1,34 @@ -from flask import Blueprint, request, jsonify, make_response +from flask import Blueprint, request, make_response, Response from app import db from app.models.goal import Goal from app.models.task import Task -from app.routes.route_utilities import validate_model, create_model +from app.routes.route_utilities import validate_model, create_model, update_model -goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals") +bp = Blueprint("goal_bp", __name__, url_prefix="/goals") -@goal_bp.route("", methods=["POST"]) +@bp.post("") def create_goal(): request_body = request.get_json() or {} - title = request_body.get("title") - if not title: - return make_response({"details": "Invalid data"}, 400) - - new_goal = Goal(title=title) - db.session.add(new_goal) - db.session.commit() - - return jsonify(new_goal.to_dict()), 201 + response_body, status_code = create_model(Goal, request_body) + return response_body, status_code -@goal_bp.route("", methods=["GET"]) +@bp.get("") def get_goals(): - goals = Goal.query.all() + goals_stmt = db.select(Goal) + goals = db.session.scalars(goals_stmt).all() response = [goal.to_dict() for goal in goals] - return jsonify(response), 200 + return response, 200 -@goal_bp.route("/", methods=["GET"]) +@bp.get("/") def read_goal(goal_id): goal = validate_model(Goal, goal_id) - return jsonify(goal.to_dict()), 200 + return goal.to_dict(), 200 -@goal_bp.route("/", methods=["PUT"]) +@bp.put("/") def update_goal(goal_id): goal = validate_model(Goal, goal_id) request_body = request.get_json() or {} @@ -42,21 +36,18 @@ def update_goal(goal_id): if not title: return make_response({"details": "Invalid data"}, 400) - goal.title = title - db.session.commit() - - return "", 204 + return update_model(goal, {"title": title}) -@goal_bp.route("/", methods=["DELETE"]) +@bp.delete("/") def delete_goal(goal_id): goal = validate_model(Goal, goal_id) db.session.delete(goal) db.session.commit() - return "", 204 + return Response(status=204) -@goal_bp.route("//tasks", methods=["POST"]) +@bp.post("//tasks") def assign_tasks_to_goal(goal_id): goal = validate_model(Goal, goal_id) request_body = request.get_json() or {} @@ -75,15 +66,10 @@ def assign_tasks_to_goal(goal_id): db.session.commit() - return jsonify({"id": goal.id, "task_ids": validated_ids}), 200 + return {"id": goal.id, "task_ids": validated_ids}, 200 -@goal_bp.route("//tasks", methods=["GET"]) +@bp.get("//tasks") def get_tasks_of_goal(goal_id): goal = validate_model(Goal, goal_id) - tasks_payload = [t.to_dict_with_goal() for t in goal.tasks] - return jsonify({ - "id": goal.id, - "title": goal.title, - "tasks": tasks_payload - }), 200 \ No newline at end of file + return goal.to_dict(with_tasks=True), 200 \ No newline at end of file diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 7d2cae675..e5313dfdc 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,4 +1,4 @@ -from flask import abort, make_response +from flask import abort, make_response, Response from app import db @@ -14,7 +14,7 @@ def validate_model(model_class, model_id): 400, )) - model = model_class.query.get(model_id_int) + model = db.session.get(model_class, model_id_int) if model is None: abort(make_response( @@ -37,4 +37,13 @@ def create_model(model_class, request_body): db.session.add(new_model) db.session.commit() - return new_model.to_dict(), 201 \ No newline at end of file + return new_model.to_dict(), 201 + + +def update_model(obj, data): + for attr, value in data.items(): + if hasattr(obj, attr): + setattr(obj, attr, value) + + db.session.commit() + return Response(status=204) \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 38651558c..aa3e045ea 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,47 +1,60 @@ -from flask import Blueprint, request, jsonify, make_response +from flask import Blueprint, request, make_response from app import db from app.models.task import Task -from app.routes.route_utilities import validate_model, create_model +from app.routes.route_utilities import validate_model, create_model, update_model +import os +import requests -bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +bp = Blueprint("task_bp", __name__, url_prefix="/tasks") +SLACK_API_URL = "https://slack.com/api/chat.postMessage" +SLACK_BOT_TOKEN = os.getenv("SLACK_BOT_TOKEN") +SLACK_CHANNEL = os.getenv("SLACK_CHANNEL", "task-notifications") -@bp.route("", methods=["POST"]) + +def send_task_completed_notification(task): + if not SLACK_BOT_TOKEN: + return + + message = f"Someone just completed the task: {task.title}" + headers = {"Authorization": f"Bearer {SLACK_BOT_TOKEN}"} + data = { + "channel": SLACK_CHANNEL, + "text": message, + } + requests.post(SLACK_API_URL, data=data, headers=headers) + + +@bp.post("") def create_task(): request_body = request.get_json() or {} - response_body, status_code = create_model(Task, request_body) - return response_body, status_code -@bp.route("", methods=["GET"]) +@bp.get("") def get_all_tasks(): sort_query = request.args.get("sort") + tasks_stmt = db.select(Task) + if sort_query == "asc": - tasks = Task.query.order_by(Task.title.asc()).all() + tasks_stmt = tasks_stmt.order_by(Task.title.asc()) elif sort_query == "desc": - tasks = Task.query.order_by(Task.title.desc()).all() - else: - tasks = Task.query.all() + tasks_stmt = tasks_stmt.order_by(Task.title.desc()) + tasks = db.session.scalars(tasks_stmt).all() response = [task.to_dict() for task in tasks] - return jsonify(response), 200 + return response, 200 -@bp.route("/", methods=["GET"]) +@bp.get("/") def get_task(task_id): task = validate_model(Task, task_id) - task_dict = task.to_dict() - - if task.goal_id is not None: - task_dict["goal_id"] = task.goal_id + return task.to_dict(), 200 - return task_dict, 200 - -@bp.route("/", methods=["PUT"]) +@bp.put("/") def update_task(task_id): task = validate_model(Task, task_id) request_body = request.get_json() or {} @@ -52,37 +65,29 @@ def update_task(task_id): if not title or not description: return make_response({"details": "Invalid data"}, 400) - task.title = title - task.description = description - - db.session.commit() - - return "", 204 + return update_model(task, {"title": title, "description": description}) -@bp.route("/", methods=["DELETE"]) +@bp.delete("/") def delete_task(task_id): task = validate_model(Task, task_id) - db.session.delete(task) db.session.commit() - - return "", 204 + return make_response("", 204) -@bp.route("//mark_complete", methods=["PATCH"]) +@bp.patch("//mark_complete") def mark_complete(task_id): task = validate_model(Task, task_id) task.completed_at = task.completed_at or db.func.now() db.session.commit() + send_task_completed_notification(task) + return make_response("", 204) - return "", 204 - -@bp.route("//mark_incomplete", methods=["PATCH"]) +@bp.patch("//mark_incomplete") def mark_incomplete(task_id): task = validate_model(Task, task_id) task.completed_at = None db.session.commit() - - return "", 204 \ No newline at end of file + return make_response("", 204) \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 0190504d2..393976e9d 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -133,12 +133,9 @@ def test_update_goal(client, one_goal): assert response.status_code == 204 - get_response = client.get("/goals/1") - get_body = get_response.get_json() - - assert get_response.status_code == 200 - assert get_body["id"] == 1 - assert get_body["title"] == "Updated Title" + updated_goal = Goal.query.get(1) + assert updated_goal is not None + assert updated_goal.title == "Updated Title" def test_update_goal_not_found(client):