From 96419e315aa30684175aaaea111790536d555298 Mon Sep 17 00:00:00 2001 From: Aksana Date: Fri, 1 Nov 2024 22:12:12 -0700 Subject: [PATCH 01/11] implemented task model, generated migration --- app/__init__.py | 2 + app/models/task.py | 10 +++ app/routes/__init__.py | 0 app/routes/task_routes.py | 48 +++++++++++- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++++ migrations/env.py | 113 +++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/24bb60ac8985_.py | 39 +++++++++ 9 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 app/routes/__init__.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/24bb60ac8985_.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..84912abae 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,4 +1,5 @@ from flask import Flask +from .routes.task_routes import tasks_bp from .db import db, migrate from .models import task, goal import os @@ -18,5 +19,6 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..d2d4126e4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,15 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from datetime import datetime + +#from sqlalchemy import DateTime +from typing import Optional + class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[Optional[datetime]] + + #completed_at: Mapped[Optional[datetime]] = mapped_column(default=None) \ No newline at end of file diff --git a/app/routes/__init__.py b/app/routes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..c6ae14d38 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, abort, make_response +from app.models.task import Task + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +# @tasks_bp.get("") +# def get_all_tasks(): +# tasks_response = [] +# for task in tasks: +# tasks_response.append( +# { +# "id": task.id, +# "title": task.title, +# "description": task.description, +# "completed_at": task.completed_at +# } +# ) +# return tasks_response + +# @tasks_bp.get("/") +# def get_one_task(task_id): +# task = validate_task_id(task_id) + +# return { +# "id": task.id, +# "title": task.title, +# "description": task.description, +# "completed_at": task.completed_at +# } + +# def validate_task_id() +# try: +# task_id = int(task_id) +# except: +# response = {"message": "Task {task_id} invalid."} +# abort(make_response(response, 400)) + +# for task in tasks: +# if task.id == task_id: +# return task + +# response = {"message": "Task {task_id} not found."} +# abort(make_response(response, 404)) + + + + 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/24bb60ac8985_.py b/migrations/versions/24bb60ac8985_.py new file mode 100644 index 000000000..c67cb7aab --- /dev/null +++ b/migrations/versions/24bb60ac8985_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 24bb60ac8985 +Revises: +Create Date: 2024-11-01 14:47:23.902811 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '24bb60ac8985' +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 a61305570546c2446f09618ec9bf88019a7238f1 Mon Sep 17 00:00:00 2001 From: Aksana Date: Sat, 2 Nov 2024 00:47:45 -0700 Subject: [PATCH 02/11] implemented routes to get all tasks, one task, create a task, delete a task and update a task --- app/routes/task_routes.py | 124 ++++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 39 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index c6ae14d38..b9162a98a 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,47 +1,93 @@ -from flask import Blueprint, abort, make_response +from flask import Blueprint, abort, make_response, request, Response from app.models.task import Task +from ..db import db tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") -# @tasks_bp.get("") -# def get_all_tasks(): -# tasks_response = [] -# for task in tasks: -# tasks_response.append( -# { -# "id": task.id, -# "title": task.title, -# "description": task.description, -# "completed_at": task.completed_at -# } -# ) -# return tasks_response - -# @tasks_bp.get("/") -# def get_one_task(task_id): -# task = validate_task_id(task_id) - -# return { -# "id": task.id, -# "title": task.title, -# "description": task.description, -# "completed_at": task.completed_at -# } - -# def validate_task_id() -# try: -# task_id = int(task_id) -# except: -# response = {"message": "Task {task_id} invalid."} -# abort(make_response(response, 400)) - -# for task in tasks: -# if task.id == task_id: -# return task - -# response = {"message": "Task {task_id} not found."} -# abort(make_response(response, 404)) +@tasks_bp.get("") +def get_all_tasks(): + query = db.select(Task).order_by(Task.id) + tasks = db.session.scalars(query) + tasks_response = [] + for task in tasks: + tasks_response.append( + { + "id": task.id, + "title": task.title, + "description": task.description, + "is_completed": bool(task.completed_at) + } + ) + return tasks_response +@tasks_bp.get("/") +def get_one_task(task_id): + task = validate_task_id(task_id) + return { + "id": task.id, + "title": task.title, + "description": task.description, + "is_completed": bool(task.completed_at) + } +def validate_task_id(task_id): + try: + task_id = int(task_id) + except: + response = {"message": f"Task {task_id} invalid."} + abort(make_response(response, 400)) + query = db.select(Task).where(Task.id==task_id) + task = db.session.scalar(query) + if not task: + response = {"message": f"Task {task_id} not found."} + abort(make_response(response, 404)) + + return task + +@tasks_bp.post("") +def create_task(): + request_body = request.get_json() + + title = request_body["title"] + description = request_body["description"] + completed_at = request_body["completed_at"] + #if not completed_at: + # completed_at = None + + new_task = Task(title=title, description=description, completed_at=completed_at) + db.session.add(new_task) + db.session.commit() + + response = { + "id": new_task.id, + "title": new_task.title, + "description": new_task.description, + "is_completed": bool(new_task.completed_at) + } + return response, 201 + +@tasks_bp.put("/") +def update_task(task_id): + task = validate_task_id(task_id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + #task.completed_at = request_body["completed_at"] + + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@tasks_bp.delete("/") +def delete_task(task_id): + task = validate_task_id(task_id) + db.session.delete(task) + db.session.commit() + + response = { + "details": f"Task {task_id} successfully deleted." + } + return response, 200 \ No newline at end of file From e0ab059d91649314c55e9ec5e9b41708d2c92113 Mon Sep 17 00:00:00 2001 From: Aksana Date: Sat, 2 Nov 2024 17:39:54 -0700 Subject: [PATCH 03/11] updated routes to pass tests --- app/routes/task_routes.py | 34 ++++++++++++++++++++++------------ tests/test_wave_01.py | 12 ++++++------ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index b9162a98a..868bb49bf 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -11,24 +11,25 @@ def get_all_tasks(): tasks_response = [] for task in tasks: tasks_response.append( + { "id": task.id, "title": task.title, "description": task.description, - "is_completed": bool(task.completed_at) + "is_complete": bool(task.completed_at) } ) - return tasks_response + return tasks_response, 200 @tasks_bp.get("/") def get_one_task(task_id): task = validate_task_id(task_id) - return { + return { "task":{ "id": task.id, "title": task.title, "description": task.description, - "is_completed": bool(task.completed_at) + "is_complete": bool(task.completed_at)} } def validate_task_id(task_id): @@ -52,7 +53,7 @@ def create_task(): title = request_body["title"] description = request_body["description"] - completed_at = request_body["completed_at"] + completed_at = request_body.get("completed_at") #if not completed_at: # completed_at = None @@ -61,10 +62,11 @@ def create_task(): db.session.commit() response = { + "task":{ "id": new_task.id, "title": new_task.title, "description": new_task.description, - "is_completed": bool(new_task.completed_at) + "is_complete": bool(new_task.completed_at)} } return response, 201 @@ -75,19 +77,27 @@ def update_task(task_id): task.title = request_body["title"] task.description = request_body["description"] - #task.completed_at = request_body["completed_at"] + # task.completed_at = request_body["completed_at"] db.session.commit() + response = { + "task":{ + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at)} + } - return Response(status=204, mimetype="application/json") + return response, 200 @tasks_bp.delete("/") def delete_task(task_id): task = validate_task_id(task_id) + db.session.delete(task) db.session.commit() - response = { - "details": f"Task {task_id} successfully deleted." - } - return response, 200 \ No newline at end of file + response_message = f'Task {task.id} "{task.title}" successfully deleted' + response_body = {'details': response_message} + + return response_body, 200 \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..f5c080efd 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,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") @@ -13,7 +13,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") @@ -32,7 +32,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") @@ -66,7 +66,7 @@ def test_get_task_not_found(client): # ***************************************************************** -@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={ @@ -93,7 +93,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={ @@ -137,7 +137,7 @@ def test_update_task_not_found(client): # ***************************************************************** -@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") From 390cfb07019de3500577715b344705eb644303c2 Mon Sep 17 00:00:00 2001 From: Aksana Date: Sat, 2 Nov 2024 18:19:39 -0700 Subject: [PATCH 04/11] completed tests for non-existing tasks --- app/routes/task_routes.py | 13 ++++++++----- tests/test_wave_01.py | 19 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 868bb49bf..18f290a37 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -51,12 +51,15 @@ def validate_task_id(task_id): def create_task(): request_body = request.get_json() - title = request_body["title"] - description = request_body["description"] + title = request_body.get("title") + description = request_body.get("description") completed_at = request_body.get("completed_at") - #if not completed_at: - # completed_at = None + if title is None or description is None: + + response = {"details": "Invalid data"} + return response, 400 + new_task = Task(title=title, description=description, completed_at=completed_at) db.session.add(new_task) db.session.commit() @@ -100,4 +103,4 @@ def delete_task(task_id): response_message = f'Task {task.id} "{task.title}" successfully deleted' response_body = {'details': response_message} - return response_body, 200 \ No newline at end of file + return response_body, 200 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index f5c080efd..307cab305 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -51,7 +51,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") @@ -59,8 +59,9 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found."} - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -119,7 +120,7 @@ def test_update_task(client, one_task): assert 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_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -130,8 +131,9 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found."} - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -152,7 +154,7 @@ def test_delete_task(client, one_task): assert Task.query.get(1) == 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") @@ -160,8 +162,9 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found."} - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -169,7 +172,7 @@ def test_delete_task_not_found(client): assert Task.query.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={ @@ -186,7 +189,7 @@ def test_create_task_must_contain_title(client): assert Task.query.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 d68520595debce4c515347c24b5c7b22076554be Mon Sep 17 00:00:00 2001 From: Aksana Date: Sun, 3 Nov 2024 00:00:27 -0700 Subject: [PATCH 05/11] implemented sorting asc & desc in routes --- app/routes/task_routes.py | 8 +++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 18f290a37..bf25beaa7 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,12 +1,18 @@ from flask import Blueprint, abort, make_response, request, Response from app.models.task import Task from ..db import db +from sqlalchemy import asc, desc tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @tasks_bp.get("") def get_all_tasks(): - query = db.select(Task).order_by(Task.id) + query = db.select(Task) + sort_order = request.args.get("sort", "asc") + if sort_order == "desc": + query = query.order_by(Task.title.desc()) + else: + query = query.order_by(Task.title) tasks = db.session.scalars(query) tasks_response = [] for task in tasks: diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..c9a76e6b1 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From b9639fbf0672754114e4b4774232d7e4a892285f Mon Sep 17 00:00:00 2001 From: Aksana Date: Wed, 6 Nov 2024 14:05:31 -0800 Subject: [PATCH 06/11] added 2 routes fro wave3, completed tests fot wave 3 --- app/routes/task_routes.py | 33 +++++++++++++++++++++++++++++++++ tests/test_wave_03.py | 18 ++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index bf25beaa7..98b8fd1be 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,6 +2,7 @@ from app.models.task import Task from ..db import db from sqlalchemy import asc, desc +from datetime import datetime, date tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -110,3 +111,35 @@ def delete_task(task_id): response_body = {'details': response_message} return response_body, 200 + +@tasks_bp.patch("//mark_complete") +def mark_task_complete(task_id): + task = validate_task_id(task_id) + #now = datetime.now() + #task.competed_at = now.strftime("%m/%d/%Y") + task.completed_at = date.today() + db.session.commit() + response = { + "task":{ + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at)} + } + + return response, 200 + +@tasks_bp.patch("//mark_incomplete") +def mark_task_incomplete(task_id): + task = validate_task_id(task_id) + task.completed_at = None + db.session.commit() + response = { + "task":{ + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at)} + } + + return response, 200 \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..b03a7cfae 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,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 """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).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") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).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 """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).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") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).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") @@ -127,14 +127,15 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found."} - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@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") @@ -142,8 +143,9 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found."} - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From 4124505f8ad398d08785a8f53bc21a0b8b5875c7 Mon Sep 17 00:00:00 2001 From: Aksana Date: Wed, 6 Nov 2024 23:03:23 -0800 Subject: [PATCH 07/11] added Goal model, implemented migration, created routes to get all goals, to get one goal --- app/__init__.py | 2 ++ app/models/goal.py | 1 + app/routes/goal_routes.py | 44 +++++++++++++++++++++++++++- app/routes/task_routes.py | 22 ++++++++++++++ migrations/versions/de4c8e72b92c_.py | 32 ++++++++++++++++++++ tests/test_wave_05.py | 6 ++-- 6 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/de4c8e72b92c_.py diff --git a/app/__init__.py b/app/__init__.py index 84912abae..4e8a77f67 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,5 +1,6 @@ from flask import Flask from .routes.task_routes import tasks_bp +from .routes.goal_routes import goals_bp from .db import db, migrate from .models import task, goal import os @@ -20,5 +21,6 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..710e40e61 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,4 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..50c6b37c2 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,43 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, request, Response +from app.models.goal import Goal +from ..db import db + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@goals_bp.get("") +def get_all_goals(): + query = db.select(Goal) + goals = db.session.scalars(query) + goals_response = [] + for goal in goals: + goals_response.append( + { + "id": goal.id, + "title": goal.title + } + ) + return goals_response, 200 + +@goals_bp.get("/") +def get_one_goal(goal_id): + goal = validate_goal_id(goal_id) + + return {"goal":{ + "id": goal.id, + "title": goal.title} + } + +def validate_goal_id(goal_id): + try: + goal_id = int(goal_id) + except: + response = {"message": f"Goal {goal_id} invalid."} + abort(make_response(response, 400)) + + query = db.select(Goal).where(Goal.id==goal_id) + goal = db.session.scalar(query) + if not goal: + response = {"message": f"Goal {goal_id} not found."} + abort(make_response(response, 404)) + + return goal \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 98b8fd1be..66bac9580 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -3,6 +3,11 @@ from ..db import db from sqlalchemy import asc, desc from datetime import datetime, date +import requests +import os +from dotenv import load_dotenv + +load_dotenv() tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -119,6 +124,23 @@ def mark_task_complete(task_id): #task.competed_at = now.strftime("%m/%d/%Y") task.completed_at = date.today() db.session.commit() + + url = 'https://slack.com/api/chat.postMessage' + slack_token = os.environ.get('API_token') + # headers = {'Authorization': f'Bearer {slack_token}'} + # payload = {'channel': 'U07KBLD0ZSN', 'text': f'Someone just completed the task {task.title}'} + query_params = { + "token": slack_token, + "channel": 'U07KBLD0ZSN', + "text": f'Someone just completed the task {task.title}'} + + + response = requests.post(url, params=query_params) + + #r = requests.post(url, headers, json=payload) + if response.status_code != 200 or not response.json().get('ok'): + return {"error": f"Failed to send notification to Slack"}, 500 + response = { "task":{ "id": task.id, diff --git a/migrations/versions/de4c8e72b92c_.py b/migrations/versions/de4c8e72b92c_.py new file mode 100644 index 000000000..a92141a6a --- /dev/null +++ b/migrations/versions/de4c8e72b92c_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: de4c8e72b92c +Revises: 24bb60ac8985 +Create Date: 2024-11-06 22:49:03.783729 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'de4c8e72b92c' +down_revision = '24bb60ac8985' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..ad40ac470 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.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_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +12,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 +29,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") From 78ef4d9c6019c6b94bbb233d98a4b81f36b92c73 Mon Sep 17 00:00:00 2001 From: Aksana Date: Wed, 6 Nov 2024 23:18:48 -0800 Subject: [PATCH 08/11] created a rote to post goal and a rote to update a goal --- app/routes/goal_routes.py | 40 ++++++++++++++++++++++++++++++++++++++- tests/test_wave_05.py | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 50c6b37c2..fb706f6ed 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -40,4 +40,42 @@ def validate_goal_id(goal_id): response = {"message": f"Goal {goal_id} not found."} abort(make_response(response, 404)) - return goal \ No newline at end of file + return goal + +@goals_bp.post("") +def create_goal(): + request_body = request.get_json() + + title = request_body.get("title") + + if title is None: + + response = {"details": "Invalid data"} + return response, 400 + + new_goal = Goal(title=title) + db.session.add(new_goal) + db.session.commit() + + response = { + "goal":{ + "id": new_goal.id, + "title": new_goal.title} + } + return response, 201 + +@goals_bp.put("/") +def update_goal(goal_id): + goal = validate_goal_id(goal_id) + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + response = { + "goal":{ + "id": goal.id, + "title": goal.title} + } + + return response, 200 \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index ad40ac470..f04195348 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -61,7 +61,7 @@ def test_get_goal_not_found(client): # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ From 51da16fd2adfc976f5819c8b81387a736997ccec Mon Sep 17 00:00:00 2001 From: Aksana Date: Wed, 6 Nov 2024 23:47:08 -0800 Subject: [PATCH 09/11] wrote tests for wave 5, completed rote to delete one task --- app/routes/goal_routes.py | 14 +++++++- tests/test_wave_05.py | 69 +++++++++++++++++++++++---------------- 2 files changed, 54 insertions(+), 29 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index fb706f6ed..cfa2ad403 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -77,5 +77,17 @@ def update_goal(goal_id): "id": goal.id, "title": goal.title} } + + return response, 200 + +@goals_bp.delete("/") +def delete_goal(goal_id): + goal = validate_goal_id(goal_id) + + db.session.delete(goal) + db.session.commit() + + response_message = f'Goal {goal.id} "{goal.title}" successfully deleted' + response_body = {'details': response_message} - return response, 200 \ No newline at end of file + return response_body, 200 diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index f04195348..122e5f6da 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,4 +1,5 @@ import pytest +from app.models.goal import Goal #@pytest.mark.skip(reason="No way to test this feature yet") @@ -46,14 +47,18 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + assert response_body == {"message": "Goal 1 not found."} + assert response.status_code == 404 + + + #raise Exception("Complete test") # Assert # ---- Complete Test ---- # assertion 1 goes here @@ -80,34 +85,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") + #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 - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } + goal = Goal.query.get(1) + 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.get("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found."} -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -123,28 +134,30 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + assert response_body == { + "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted' + } + assert Goal.query.get(1) == None - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - + #raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found."} -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From 1006c52ef2c307a8b2dd93b01f0a95ef505543ed Mon Sep 17 00:00:00 2001 From: Aksana Date: Thu, 7 Nov 2024 12:01:32 -0800 Subject: [PATCH 10/11] established relation for task to goal, inilized migration --- app/models/goal.py | 7 +++++- app/models/task.py | 12 +++++++--- app/routes/task_routes.py | 4 +++- migrations/versions/e0e71edb486f_.py | 34 ++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 migrations/versions/e0e71edb486f_.py diff --git a/app/models/goal.py b/app/models/goal.py index 710e40e61..e3cddcf0e 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,11 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column,relationship from ..db import db +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") + diff --git a/app/models/task.py b/app/models/task.py index d2d4126e4..59f916340 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,9 +1,11 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db from datetime import datetime - -#from sqlalchemy import DateTime +from sqlalchemy import ForeignKey from typing import Optional +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .goal import Goal class Task(db.Model): @@ -11,5 +13,9 @@ class Task(db.Model): title: Mapped[str] description: Mapped[str] completed_at: Mapped[Optional[datetime]] + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") + + #completed_at: Mapped[Optional[datetime]] = mapped_column(default=None) \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 66bac9580..3120d481c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -136,9 +136,11 @@ def mark_task_complete(task_id): response = requests.post(url, params=query_params) + #db.session.commit() #r = requests.post(url, headers, json=payload) - if response.status_code != 200 or not response.json().get('ok'): + if response.status_code != 200: + #or not response.json().get('ok'): return {"error": f"Failed to send notification to Slack"}, 500 response = { diff --git a/migrations/versions/e0e71edb486f_.py b/migrations/versions/e0e71edb486f_.py new file mode 100644 index 000000000..2a8b98176 --- /dev/null +++ b/migrations/versions/e0e71edb486f_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: e0e71edb486f +Revises: de4c8e72b92c +Create Date: 2024-11-07 11:53:05.629059 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e0e71edb486f' +down_revision = 'de4c8e72b92c' +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 ### From e7039d3a7234d965e364bf53d197d5126015e1c6 Mon Sep 17 00:00:00 2001 From: Aksana Date: Thu, 7 Nov 2024 21:44:18 -0800 Subject: [PATCH 11/11] implemented routes for nested goal routes, implemented test for wave 6 --- app/models/task.py | 25 ++++++++++++++++++++++++- app/routes/goal_routes.py | 37 +++++++++++++++++++++++++++++++++++++ app/routes/task_routes.py | 38 +++++++++----------------------------- tests/test_wave_06.py | 15 ++++++++------- 4 files changed, 78 insertions(+), 37 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 59f916340..e8f96ebdc 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -16,6 +16,29 @@ class Task(db.Model): goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") + def to_dict(self): + task_as_dict = {} + task_as_dict["id"] = self.id + task_as_dict["title"] = self.title + task_as_dict["description"] = self.description + task_as_dict["is_complete"] = bool(self.completed_at) + #task_as_dict["goal_id"] = self.goal.id if self.goal else None + if self.goal: + task_as_dict["goal_id"] = self.goal.id + + return task_as_dict + + @classmethod + def from_dict(cls, task_data): + # Use get() to fetch values that could be undefined to avoid raising an error + goal_id = task_data.get("goal_id") + + new_task = cls( + title=task_data["title"], + description=task_data["description"], + goal_id=goal_id + ) + + return new_task - #completed_at: Mapped[Optional[datetime]] = mapped_column(default=None) \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index cfa2ad403..d0d480486 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,7 @@ from flask import Blueprint, abort, make_response, request, Response from app.models.goal import Goal +from app.models.task import Task +from app.routes.task_routes import validate_task_id from ..db import db goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @@ -91,3 +93,38 @@ def delete_goal(goal_id): response_body = {'details': response_message} return response_body, 200 + +@goals_bp.post("//tasks") +def create_goal_with_tasks(goal_id): + goal = validate_goal_id(goal_id) + request_body = request.get_json() + + task_list = request_body["task_ids"] + task_list_in_goal = [] + for task_id in task_list: + + task = validate_task_id(task_id) + task.goal_id = goal.id + task_list_in_goal.append(task.id) + + db.session.commit() + response = { + "id": goal.id, + "task_ids": task_list_in_goal} + + return response, 200 + +@goals_bp.get("//tasks") +def get_goal_with_tasks(goal_id): + goal = validate_goal_id(goal_id) + + tasks = [task.to_dict() for task in goal.tasks] + print(f"TEST{tasks}") + + response = {"id": goal.id, + "title": goal.title, + "tasks": tasks} + + + return response + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3120d481c..20cec5fd1 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, abort, make_response, request, Response from app.models.task import Task +from app.models.goal import Goal from ..db import db from sqlalchemy import asc, desc from datetime import datetime, date @@ -22,27 +23,17 @@ def get_all_tasks(): tasks = db.session.scalars(query) tasks_response = [] for task in tasks: - tasks_response.append( + tasks_response.append(task.to_dict()) - { - "id": task.id, - "title": task.title, - "description": task.description, - "is_complete": bool(task.completed_at) - } - ) return tasks_response, 200 @tasks_bp.get("/") def get_one_task(task_id): task = validate_task_id(task_id) + task_dict = task.to_dict() + + return { "task": task_dict } - return { "task":{ - "id": task.id, - "title": task.title, - "description": task.description, - "is_complete": bool(task.completed_at)} - } def validate_task_id(task_id): try: @@ -92,7 +83,7 @@ def update_task(task_id): task.title = request_body["title"] task.description = request_body["description"] - # task.completed_at = request_body["completed_at"] + db.session.commit() response = { @@ -127,21 +118,11 @@ def mark_task_complete(task_id): url = 'https://slack.com/api/chat.postMessage' slack_token = os.environ.get('API_token') - # headers = {'Authorization': f'Bearer {slack_token}'} - # payload = {'channel': 'U07KBLD0ZSN', 'text': f'Someone just completed the task {task.title}'} - query_params = { - "token": slack_token, - "channel": 'U07KBLD0ZSN', - "text": f'Someone just completed the task {task.title}'} - + headers = {'Authorization': f'Bearer {slack_token}'} + payload = {'channel': 'task-notifications', 'text': f'Someone just completed the task {task.title}'} - response = requests.post(url, params=query_params) - #db.session.commit() - #r = requests.post(url, headers, json=payload) - if response.status_code != 200: - #or not response.json().get('ok'): - return {"error": f"Failed to send notification to Slack"}, 500 + response = requests.post(url, headers=headers, data=payload) response = { "task":{ @@ -150,7 +131,6 @@ def mark_task_complete(task_id): "description": task.description, "is_complete": bool(task.completed_at)} } - return response, 200 @tasks_bp.patch("//mark_incomplete") diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..d697874af 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,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={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).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={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).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") @@ -50,14 +50,15 @@ 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") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +75,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") @@ -99,7 +100,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()