From 1ad756032924eb3602b508cca2c9dc9c814498b8 Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Wed, 2 Nov 2022 13:47:40 -0700 Subject: [PATCH 01/10] Updated with completion of setting up development and test databases, creating an .env file, and testing that flask runs properly. --- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++ migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++++ 4 files changed, 166 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# 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 + +[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 + +[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..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +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') + +# 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', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# 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 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=target_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.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} From 61d7e7f7d5a4718b634a540f9a76a86bb0597d25 Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Tue, 8 Nov 2022 13:51:32 -0800 Subject: [PATCH 02/10] Updated to complete Test Wave 01, test_create_task. I updated my Task model to return is_complete to false when is_complete is empty/None. --- app/__init__.py | 2 + app/models/goal.py | 2 +- app/models/task.py | 27 ++++++++++- app/routes.py | 110 +++++++++++++++++++++++++++++++++++++++++- tests/test_wave_01.py | 18 +++---- 5 files changed, 144 insertions(+), 15 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..14b242cca 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from app.routes import task_bp + app.register_blueprint(task_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..775574f44 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,4 +2,4 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..1b2a6eb55 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,28 @@ from app import db - class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True) + is_complete = db.Column(db.Boolean, nullable=True) + + + def to_dict(self): + task_dict = { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete + } + + if self.is_complete is None: + task_dict["is_complete"] = False + else: + task_dict["is_complete"] = True + + return task_dict + + + + diff --git a/app/routes.py b/app/routes.py index 3aae38d49..3adc6568d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,109 @@ -from flask import Blueprint \ No newline at end of file +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response, request + + + +task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") + + +#-------------------------------------POST------------------------------------------------ +@task_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + new_task = Task(title = request_body["title"], description = request_body["description"]) + + db.session.add(new_task) + db.session.commit() + + + return jsonify({"task": new_task.to_dict()}), 201 + +#---------------------------------------GET------------------------------------------------ +@task_bp.route("", methods=["GET"]) +def read_all_tasks(): + name_param = request.args.get("title") + + if name_param is None: + tasks = Task.query.all() + else: + tasks = Task.query.filter_by(title=name_param) + + response = [] + + for task in tasks: + if task.completed_at is None: + task_dict = { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + response.append(task_dict) + else: + task_dict = { + "id": task.task_id, + "title": task.title, + "description": task.description, + "completed at": task.completed_at, + "is_complete": True} + response.append(task_dict) + return jsonify(response), 200 + +def get_one_task_or_abort(task_id): + try: + task_id = int(task_id) + except ValueError: + response_str = f"Invalid task ID: {task_id}. ID must be an integer." + abort(make_response(jsonify({"message":response_str}), 400)) + + matching_task = Task.query.get(task_id) + + if not matching_task: + response_str = f"Task with id #{task_id} was not found in the database." + abort(make_response(jsonify(f"message: {response_str}"), 404)) + + return matching_task + + + +@task_bp.route("/", methods=["GET"]) +def get_one_task(task_id): + chosen_task = get_one_task_or_abort(task_id) + + if chosen_task.completed_at is None: + task = { + "id": chosen_task.task_id, + "title": chosen_task.title, + "description": chosen_task.description, + "is_complete": False + } + + else: + task = { + "id": chosen_task.task_id, + "title": chosen_task.title, + "description": chosen_task.description, + "completed at": chosen_task.completed_at, + "is_complete": True} + + + return jsonify({"task": task}), 200 + + + + +#---------------------------------------UPDATE------------------------------------------------ +@task_bp.route("/", methods=["PUT"]) +def update_task(task_id): + chosen_task = get_one_task_or_abort(task_id) + + request_body = request.get_json() + + if "title" not in request_body or \ + "description" not in request_body: + return jsonify({"Message":"Request must include title and description"}) + + chosen_task.title = request_body["title"] + chosen_task.description = request_body["description]"] diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..19474ec21 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") @@ -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,14 +59,10 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == "message: Task with id #1 was not found in the database." -@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 +89,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={ From 118fa91b22b163e36ef72aab9efa25254b609866 Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Tue, 8 Nov 2022 16:18:19 -0800 Subject: [PATCH 03/10] Completed all tests in test_wave_01 and completed the CRUD endpoints --- app/routes.py | 70 ++++++++++++++++++++++++++----------------- tests/test_wave_01.py | 26 +++++++--------- 2 files changed, 52 insertions(+), 44 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3adc6568d..52dd34fae 100644 --- a/app/routes.py +++ b/app/routes.py @@ -6,21 +6,23 @@ task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") +#---------------------------------------GET------------------------------------------------ -#-------------------------------------POST------------------------------------------------ -@task_bp.route("", methods=["POST"]) -def create_task(): - request_body = request.get_json() +def get_one_task_or_abort(task_id): + try: + task_id = int(task_id) + except ValueError: + response_str = f"Invalid task ID: {task_id}. ID must be an integer." + abort(make_response(jsonify({"Message":response_str}), 400)) - new_task = Task(title = request_body["title"], description = request_body["description"]) - - db.session.add(new_task) - db.session.commit() + matching_task = Task.query.get(task_id) + if not matching_task: + response_str = f"Task with id #{task_id} was not found in the database." + abort(make_response(jsonify({"Message": response_str}), 404)) - return jsonify({"task": new_task.to_dict()}), 201 + return matching_task -#---------------------------------------GET------------------------------------------------ @task_bp.route("", methods=["GET"]) def read_all_tasks(): name_param = request.args.get("title") @@ -51,23 +53,6 @@ def read_all_tasks(): response.append(task_dict) return jsonify(response), 200 -def get_one_task_or_abort(task_id): - try: - task_id = int(task_id) - except ValueError: - response_str = f"Invalid task ID: {task_id}. ID must be an integer." - abort(make_response(jsonify({"message":response_str}), 400)) - - matching_task = Task.query.get(task_id) - - if not matching_task: - response_str = f"Task with id #{task_id} was not found in the database." - abort(make_response(jsonify(f"message: {response_str}"), 404)) - - return matching_task - - - @task_bp.route("/", methods=["GET"]) def get_one_task(task_id): chosen_task = get_one_task_or_abort(task_id) @@ -92,7 +77,23 @@ def get_one_task(task_id): return jsonify({"task": task}), 200 +#-------------------------------------POST------------------------------------------------ +@task_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + if "title" not in request_body or \ + "description" not in request_body: + return jsonify({"details": "Invalid data"}), 400 + + new_task = Task(title = request_body["title"], description = request_body["description"]) + + + db.session.add(new_task) + db.session.commit() + + return jsonify({"task": new_task.to_dict()}), 201 #---------------------------------------UPDATE------------------------------------------------ @task_bp.route("/", methods=["PUT"]) @@ -106,4 +107,17 @@ def update_task(task_id): return jsonify({"Message":"Request must include title and description"}) chosen_task.title = request_body["title"] - chosen_task.description = request_body["description]"] + chosen_task.description = request_body["description"] + + db.session.commit() + + return jsonify({"task": chosen_task.to_dict()}), 200 + +#---------------------------------------DELETE------------------------------------------------ +@task_bp.route("/", methods=["DELETE"]) +def delete_one_task(task_id): + chosen_task = get_one_task_or_abort(task_id) + + db.session.delete(chosen_task) + db.session.commit() + return jsonify({"details": f'Task {task_id} "{chosen_task.title}" successfully deleted'}), 200 \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 19474ec21..fbbfe171e 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -59,7 +59,7 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - assert response_body == "message: Task with id #1 was not found in the database." + assert response_body == {"Message": 'Task with id #1 was not found in the database.'} #@pytest.mark.skip(reason="No way to test this feature yet") @@ -115,7 +115,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={ @@ -126,14 +126,11 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "Message": 'Task with id #1 was not found in the database.'} -@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") @@ -148,7 +145,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") @@ -156,16 +153,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 "Message" in response_body + assert response_body == {"Message": "Task with id #1 was not found in the database."} 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={ @@ -182,7 +176,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 a160f1c1d4f9677b4da5962a71cd37c324895231 Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Tue, 8 Nov 2022 17:16:45 -0800 Subject: [PATCH 04/10] Completed test wave 02 by creating a sorted by asscending and descending alphabetical order of title --- app/routes.py | 24 +++++++++++++++++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 52dd34fae..3b9dabe94 100644 --- a/app/routes.py +++ b/app/routes.py @@ -25,6 +25,27 @@ def get_one_task_or_abort(task_id): @task_bp.route("", methods=["GET"]) def read_all_tasks(): + + sort_param = request.args.get("sort") + if sort_param == "asc": + tasks = Task.query.order_by(Task.title.asc()).all() + elif sort_param is None: + tasks = Task.query.all() + elif sort_param == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + + response = [] + for task in tasks: + task_dict = { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + response.append(task_dict) + return jsonify(response), 200 + + name_param = request.args.get("title") if name_param is None: @@ -73,10 +94,11 @@ def get_one_task(task_id): "completed at": chosen_task.completed_at, "is_complete": True} - return jsonify({"task": task}), 200 + + #-------------------------------------POST------------------------------------------------ @task_bp.route("", methods=["POST"]) def create_task(): 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 96613d7cbdb4b97406b673466d659b29545494ea Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Tue, 8 Nov 2022 21:36:03 -0800 Subject: [PATCH 05/10] Completed test_wave_03 with PATCH request endpoints for marking complete or incomplete on tasks --- app/routes.py | 35 ++++++++++++++++++++++++++++++++++- tests/test_wave_03.py | 27 ++++++++++----------------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3b9dabe94..7aa130018 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request +from datetime import datetime @@ -142,4 +143,36 @@ def delete_one_task(task_id): db.session.delete(chosen_task) db.session.commit() - return jsonify({"details": f'Task {task_id} "{chosen_task.title}" successfully deleted'}), 200 \ No newline at end of file + return jsonify({"details": f'Task {task_id} "{chosen_task.title}" successfully deleted'}), 200 + + +#---------------------------------------PATCH------------------------------------------------ +@task_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete_on_incompleted_task(task_id): + chosen_task = get_one_task_or_abort(task_id) + today = datetime.now() + + if chosen_task.completed_at is None: + chosen_task.completed_at = today + chosen_task.is_complete = True + + else: + chosen_task.completed_at = today + chosen_task.is_complete = True + db.session.commit() + return jsonify({"task": chosen_task.to_dict()}), 200 + +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete_on_completed_task(task_id): + chosen_task = get_one_task_or_abort(task_id) + today = datetime.now() + + if chosen_task.completed_at: + chosen_task.completed_at = None + chosen_task.is_complete = None + else: + chosen_task.completed_at = None + chosen_task.is_complete = None + + db.session.commit() + return jsonify({"task": chosen_task.to_dict()}), 200 \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..04cf9771a 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,10 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert "Message" in response_body + assert response_body == {"Message": "Task with id #1 was not found in the database."} - 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 +138,5 @@ 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 "Message" in response_body + assert response_body == {"Message": "Task with id #1 was not found in the database."} \ No newline at end of file From eb851b45fade6c04bde26e490d07f780c98a5a1c Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Wed, 9 Nov 2022 12:04:20 -0800 Subject: [PATCH 06/10] Updated the mark_complete function with the post to slack API integration to complete test_wave_04 --- app/routes.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 7aa130018..fbc5b2a85 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from app.models.task import Task -from flask import Blueprint, jsonify, abort, make_response, request +from flask import Blueprint, jsonify, abort, make_response +import requests from datetime import datetime @@ -160,8 +161,17 @@ def mark_complete_on_incompleted_task(task_id): chosen_task.completed_at = today chosen_task.is_complete = True db.session.commit() + + url = "http://slack.com/api/chat.postMessage" + response_str = f"Someone just completed the task {chosen_task.title}" + data = {"channel":"task-notifications", "text": response_str} + r = requests.post(url, params=data, headers={"Authorization":"Bearer xoxb-4333767251127-4348222382131-lzlAgHnxk3ScNrMmjV6Kgy3s"}) + + return jsonify({"task": chosen_task.to_dict()}), 200 + + @task_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_incomplete_on_completed_task(task_id): chosen_task = get_one_task_or_abort(task_id) @@ -175,4 +185,5 @@ def mark_incomplete_on_completed_task(task_id): chosen_task.is_complete = None db.session.commit() - return jsonify({"task": chosen_task.to_dict()}), 200 \ No newline at end of file + return jsonify({"task": chosen_task.to_dict()}), 200 + From dd3b22f4e1596ddd0f4463f803c5096ac949efa5 Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Sun, 13 Nov 2022 14:36:34 -0800 Subject: [PATCH 07/10] Updated task routes to reference api slack token that is stored as an environmental variable to prevent open access --- app/__init__.py | 5 +- app/goal_routes.py | 102 ++++++++++++++++++++++++++++++ app/helper_routes.py | 16 +++++ app/models/goal.py | 11 ++++ app/models/task.py | 2 + app/{routes.py => task_routes.py} | 7 +- tests/test_wave_05.py | 79 +++++++++++------------ tests/test_wave_06.py | 6 +- 8 files changed, 180 insertions(+), 48 deletions(-) create mode 100644 app/goal_routes.py create mode 100644 app/helper_routes.py rename app/{routes.py => task_routes.py} (97%) diff --git a/app/__init__.py b/app/__init__.py index 14b242cca..69f8aa8bd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,10 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from app.routes import task_bp + from app.task_routes import task_bp app.register_blueprint(task_bp) + from app.goal_routes import goal_bp + app.register_blueprint(goal_bp) + return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..4a795a911 --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,102 @@ +from app import db +from app.models.goal import Goal +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response, request +import requests +from app.helper_routes import get_one_obj_or_abort + +goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals") +#--------------------------------POST------------------------------- +@goal_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + if "title" not in request_body: + return jsonify({"details": "Invalid data"}), 400 + + new_goal = Goal(title = request_body["title"]) + + + db.session.add(new_goal) + db.session.commit() + + + return jsonify({"goal": new_goal.to_dict()}), 201 + +@goal_bp.route("//tasks", methods=["POST"]) +def send_a_task_to_goal(goal_id): + request_body = request.get_json() + + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + list_of_chosen_tasks = [get_one_obj_or_abort(Task, task_id) for task_id in request_body["task_ids"]] + # for task_id in request_body["task_ids"]: + # chosen_task = get_one_obj_or_abort(Task, task_id) + # list_of_chosen_tasks.append(chosen_task) + + chosen_goal.tasks = list_of_chosen_tasks + + db.session.commit() + + return jsonify({"id": int(goal_id), "task_ids": request_body["task_ids"]}), 200 + + +#--------------------------------GET------------------------------- +@goal_bp.route("", methods=["GET"]) +def get_all_saved_goals(): + goals = Goal.query.all() + + response = [] + for goal in goals: + goal_dict = { + "id": goal.goal_id, + "title": goal.title, + } + response.append(goal_dict) + + return jsonify(response), 200 + +@goal_bp.route("/", methods=["GET"]) +def get_one_saved_goal(goal_id): + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + goal = {"id": chosen_goal.goal_id, "title": chosen_goal.title} + return jsonify({"goal": goal}), 200 + + +@goal_bp.route("//tasks", methods=["GET"]) +def get_tasks_of_one_goal(goal_id): + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + tasks = Task.query.filter_by(goal_id=goal_id) + list_of_tasks = [task.to_dict() for task in tasks] + + chosen_goal_dict = { + "id":chosen_goal.goal_id, + "title":chosen_goal.title, + "tasks":list_of_tasks + } + + return jsonify(chosen_goal_dict), 200 + +#--------------------------------PUT------------------------------- +@goal_bp.route("/", methods=["PUT"]) +def update_goal(goal_id): + + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + request_body = request.get_json() + + chosen_goal.title = request_body["title"] + db.session.commit() + + return jsonify({"goal": chosen_goal.to_dict()}), 200 + +#---------------------------------------DELETE------------------------------------------------ +@goal_bp.route("/", methods=["DELETE"]) +def delete_one_task(goal_id): + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + + db.session.delete(chosen_goal) + db.session.commit() + + return jsonify({"details": f'Goal {goal_id} "{chosen_goal.title}" successfully deleted'}), 200 + + + diff --git a/app/helper_routes.py b/app/helper_routes.py new file mode 100644 index 000000000..efa42df68 --- /dev/null +++ b/app/helper_routes.py @@ -0,0 +1,16 @@ +from flask import jsonify, abort, make_response + +def get_one_obj_or_abort(cls, obj_id): + try: + obj_id = int(obj_id) + except ValueError: + response_str = f"Invalid ID. Please submit an integer for the ID." + abort(make_response(jsonify({"Message":response_str}), 400)) + + matching_obj = cls.query.get(obj_id) + + if not matching_obj: + response_str = f"{cls.__name__} with id #{obj_id} was not found in the database." + abort(make_response(jsonify({"Message": response_str}), 404)) + + return matching_obj \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index 775574f44..a8d2de74e 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,14 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + tasks = db.relationship("Task", back_populates="goal") + + def to_dict(self): + tasks_list = [task.to_dict() for task in self.tasks] + goal_dict = { + "id": self.goal_id, + "title": self.title, + } + + return goal_dict \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 1b2a6eb55..27ec232d3 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,8 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) is_complete = db.Column(db.Boolean, nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + goal = db.relationship("Goal", back_populates = "tasks") def to_dict(self): diff --git a/app/routes.py b/app/task_routes.py similarity index 97% rename from app/routes.py rename to app/task_routes.py index fbc5b2a85..30b0f0d9a 100644 --- a/app/routes.py +++ b/app/task_routes.py @@ -1,9 +1,9 @@ from app import db from app.models.task import Task -from flask import Blueprint, jsonify, abort, make_response +from flask import Blueprint, jsonify, abort, make_response, request import requests from datetime import datetime - +import os task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") @@ -162,10 +162,11 @@ def mark_complete_on_incompleted_task(task_id): chosen_task.is_complete = True db.session.commit() + header = os.environ.get("api_slack") url = "http://slack.com/api/chat.postMessage" response_str = f"Someone just completed the task {chosen_task.title}" data = {"channel":"task-notifications", "text": response_str} - r = requests.post(url, params=data, headers={"Authorization":"Bearer xoxb-4333767251127-4348222382131-lzlAgHnxk3ScNrMmjV6Kgy3s"}) + r = requests.post(url, params=data, headers={"Authorization":header}) return jsonify({"task": chosen_task.to_dict()}), 200 diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..257fde9f5 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,9 @@ import pytest +from app.models.goal import Goal -@pytest.mark.skip(reason="No way to test this feature yet") + +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +14,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +31,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +48,19 @@ 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 - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert "Message" in response_body + assert response_body == {"Message": "Goal with id #1 was not found in the database."} -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +79,42 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert + # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes 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) # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + response = client.put("/goals/1", json={ + "title": "Updated Goal Title"}) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == { + "Message": 'Goal with id #1 was not found in the database.'} # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -119,32 +126,22 @@ def test_delete_goal(client, one_goal): assert response_body == { "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted' } + assert Goal.query.get(1) == None - # Check that the goal was deleted - response = client.get("/goals/1") - assert response.status_code == 404 - - 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") - # 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 "Message" in response_body + assert response_body == {"Message": "Goal with id #1 was not found in the database."} -@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={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..1ca789a57 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={ @@ -74,7 +74,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") From 8729de5f52a055f1bbc8eaad8c9996874d9495f9 Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Sun, 13 Nov 2022 14:37:00 -0800 Subject: [PATCH 08/10] updated env file --- migrations/versions/40c6101fb418_.py | 30 +++++++++++++++++++++ migrations/versions/606ba514f74d_.py | 40 ++++++++++++++++++++++++++++ migrations/versions/d4a92b2d5feb_.py | 28 +++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 migrations/versions/40c6101fb418_.py create mode 100644 migrations/versions/606ba514f74d_.py create mode 100644 migrations/versions/d4a92b2d5feb_.py diff --git a/migrations/versions/40c6101fb418_.py b/migrations/versions/40c6101fb418_.py new file mode 100644 index 000000000..fc45b6405 --- /dev/null +++ b/migrations/versions/40c6101fb418_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 40c6101fb418 +Revises: d4a92b2d5feb +Create Date: 2022-11-09 13:24:34.287015 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '40c6101fb418' +down_revision = 'd4a92b2d5feb' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/606ba514f74d_.py b/migrations/versions/606ba514f74d_.py new file mode 100644 index 000000000..1751c2475 --- /dev/null +++ b/migrations/versions/606ba514f74d_.py @@ -0,0 +1,40 @@ +"""empty message + +Revision ID: 606ba514f74d +Revises: +Create Date: 2022-11-03 12:17:59.147486 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '606ba514f74d' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('is_complete', sa.Boolean(), nullable=True), + sa.PrimaryKeyConstraint('task_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/migrations/versions/d4a92b2d5feb_.py b/migrations/versions/d4a92b2d5feb_.py new file mode 100644 index 000000000..0e3c4d298 --- /dev/null +++ b/migrations/versions/d4a92b2d5feb_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: d4a92b2d5feb +Revises: 606ba514f74d +Create Date: 2022-11-09 12:06:42.540305 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd4a92b2d5feb' +down_revision = '606ba514f74d' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### From b4f8fdc765bb593f67f1123c97eb15f20e003d2d Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Mon, 14 Nov 2022 07:41:05 -0800 Subject: [PATCH 09/10] Updated with the Procfile addition with web: gunicorn --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file From 81bda6cc1cf3f681d13adbd41b376154e861992b Mon Sep 17 00:00:00 2001 From: nina-tuyen tran Date: Mon, 14 Nov 2022 12:25:13 -0800 Subject: [PATCH 10/10] Updated to complete test wave 06 --- app/goal_routes.py | 20 ++++++++++++++++---- app/models/task.py | 4 ++++ app/task_routes.py | 32 ++++++++++++++++---------------- tests/test_wave_06.py | 14 ++++++-------- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 4a795a911..3147c163c 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -26,7 +26,7 @@ def create_goal(): @goal_bp.route("//tasks", methods=["POST"]) def send_a_task_to_goal(goal_id): request_body = request.get_json() - + chosen_goal = get_one_obj_or_abort(Goal, goal_id) list_of_chosen_tasks = [get_one_obj_or_abort(Task, task_id) for task_id in request_body["task_ids"]] # for task_id in request_body["task_ids"]: @@ -65,13 +65,25 @@ def get_one_saved_goal(goal_id): @goal_bp.route("//tasks", methods=["GET"]) def get_tasks_of_one_goal(goal_id): chosen_goal = get_one_obj_or_abort(Goal, goal_id) - tasks = Task.query.filter_by(goal_id=goal_id) - list_of_tasks = [task.to_dict() for task in tasks] + #tasks = Task.query.filter_by(goal_id=goal_id) + list_of_tasks = [task.to_dict() for task in chosen_goal.tasks] + #list_of_tasks = [task.to_dict() for task in tasks] + # list_of_tasks = [] + # for task in tasks: + # task_dict = { + # "id": task.id, + # "title": task.title, + # "description": task.description, + # "goal_id": int(goal_id), + # "is_complete": task.is_complete + + # } + # list_of_tasks.append(task_dict) chosen_goal_dict = { "id":chosen_goal.goal_id, "title":chosen_goal.title, - "tasks":list_of_tasks + "tasks": list_of_tasks } return jsonify(chosen_goal_dict), 200 diff --git a/app/models/task.py b/app/models/task.py index 27ec232d3..c166b5402 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -13,6 +13,7 @@ class Task(db.Model): def to_dict(self): task_dict = { "id": self.task_id, + "goal_id": self.goal_id, "title": self.title, "description": self.description, "is_complete": self.is_complete @@ -23,6 +24,9 @@ def to_dict(self): else: task_dict["is_complete"] = True + if self.goal_id is None: + task_dict.pop("goal_id") + return task_dict diff --git a/app/task_routes.py b/app/task_routes.py index 30b0f0d9a..cf7e6ea22 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -80,23 +80,23 @@ def read_all_tasks(): def get_one_task(task_id): chosen_task = get_one_task_or_abort(task_id) - if chosen_task.completed_at is None: - task = { - "id": chosen_task.task_id, - "title": chosen_task.title, - "description": chosen_task.description, - "is_complete": False - } - - else: - task = { - "id": chosen_task.task_id, - "title": chosen_task.title, - "description": chosen_task.description, - "completed at": chosen_task.completed_at, - "is_complete": True} + # if chosen_task.completed_at is None: + # task = { + # "id": chosen_task.task_id, + # "title": chosen_task.title, + # "description": chosen_task.description, + # "is_complete": False + # } + + # else: + # task = { + # "id": chosen_task.task_id, + # "title": chosen_task.title, + # "description": chosen_task.description, + # "completed at": chosen_task.completed_at, + # "is_complete": True} - return jsonify({"task": task}), 200 + return jsonify({"task": chosen_task.to_dict()}), 200 diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 1ca789a57..efd6148e7 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -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,12 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert "Message" in response_body + assert response_body == {"Message": "Goal with id #1 was not found in the database."} + -@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") @@ -99,7 +97,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()