From 93663e3fc4a5cf2925cd5dd9cb93fb8cc656a56e Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Thu, 5 May 2022 13:39:53 -0700 Subject: [PATCH 01/15] completed setup --- 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 d352f462623c8e97d3d5fb1fc8ea53fb465935c7 Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 6 May 2022 11:58:56 -0700 Subject: [PATCH 02/15] added task model --- app/models/task.py | 5 +++- migrations/versions/e233315c8a70_.py | 39 ++++++++++++++++++++++++++++ tests/test_wave_01.py | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 migrations/versions/e233315c8a70_.py diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..9823f4c23 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +2,7 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + task_title = db.Column(db.String) + task_description = db.Column(db.String) + completed_at = db.Column(db.DateTime) \ No newline at end of file diff --git a/migrations/versions/e233315c8a70_.py b/migrations/versions/e233315c8a70_.py new file mode 100644 index 000000000..7be45524f --- /dev/null +++ b/migrations/versions/e233315c8a70_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: e233315c8a70 +Revises: +Create Date: 2022-05-06 11:54:34.736431 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e233315c8a70' +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(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('task_title', sa.String(), nullable=True), + sa.Column('task_description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), 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/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..9dd8fe3e6 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") From 0d566d44ef99a83aa9c670d6faf4bca00e23d510 Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 6 May 2022 12:28:00 -0700 Subject: [PATCH 03/15] created task blueprint --- app/__init__.py | 3 ++- app/routes.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..358633204 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,6 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/routes.py b/app/routes.py index 3aae38d49..314e45531 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,3 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") From 38d9f8aada233c55173478c242bdeb0e3334f11f Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Wed, 11 May 2022 17:07:26 -0700 Subject: [PATCH 04/15] adds POST route for single task --- app/models/task.py | 7 ++++--- app/routes.py | 18 +++++++++++++++++- migrations/versions/169136ea9374_.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/169136ea9374_.py diff --git a/app/models/task.py b/app/models/task.py index 9823f4c23..c1f78b2d1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,6 +3,7 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) - task_title = db.Column(db.String) - task_description = db.Column(db.String) - completed_at = db.Column(db.DateTime) \ No newline at end of file + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime) + is_complete = db.Column(db.Boolean) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 314e45531..2759bb63e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,3 +1,19 @@ -from flask import Blueprint +from app import db +from flask import Blueprint, jsonify, make_response, request +from app.models.task import Task tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + new_task = Task(title=request_body["title"], + description=request_body["description"], completed_at=request_body["completed_at"]) + + db.session.add(new_task) + db.session.commit() + + return {"task": {"id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": False}}, 201 diff --git a/migrations/versions/169136ea9374_.py b/migrations/versions/169136ea9374_.py new file mode 100644 index 000000000..40482c094 --- /dev/null +++ b/migrations/versions/169136ea9374_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 169136ea9374 +Revises: e233315c8a70 +Create Date: 2022-05-11 16:00:39.774392 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '169136ea9374' +down_revision = 'e233315c8a70' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### From 9b673c2b53326b91245e0145eb14bf59378fc486 Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Wed, 11 May 2022 18:33:35 -0700 Subject: [PATCH 05/15] adds GET routes for tasks --- app/routes.py | 31 +++++++++++++++++++++++++++++++ tests/test_wave_01.py | 10 ++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 2759bb63e..82a452aff 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,3 +17,34 @@ def create_task(): "title": new_task.title, "description": new_task.description, "is_complete": False}}, 201 + +@tasks_bp.route("", methods=["GET"]) +def get_all_tasks(): + response = [] + tasks = Task.query.all() + for task in tasks: + response.append( + {"id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False} + ) + + return jsonify(response) + +@tasks_bp.route("/", methods=["GET"]) +def one_task(task_id): + try: + task_id = int(task_id) + except ValueError: + return jsonify({"msg":f"Invalid task id: {task_id}. ID must be an integer."}), 400 + + requested_task = Task.query.get(task_id) + + if requested_task is None: + return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + + return {"task": {"id": requested_task.task_id, + "title": requested_task.title, + "description": requested_task.description, + "is_complete": False}} \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 9dd8fe3e6..16f5b6469 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -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") @@ -60,11 +60,13 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == {"msg":"Could not find task with id: 1"} + @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): From b7af28f734b479db6e8340c97b7b9c81b7baea3d Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Thu, 12 May 2022 08:42:41 -0700 Subject: [PATCH 06/15] adds DELETE route for single task; passes wave 01 --- app/routes.py | 59 +++++++++++++++++++++++----- migrations/versions/18eda02cfff8_.py | 28 +++++++++++++ migrations/versions/4f521f9f6e38_.py | 28 +++++++++++++ tests/test_wave_01.py | 21 +++++----- 4 files changed, 116 insertions(+), 20 deletions(-) create mode 100644 migrations/versions/18eda02cfff8_.py create mode 100644 migrations/versions/4f521f9f6e38_.py diff --git a/app/routes.py b/app/routes.py index 82a452aff..1c952cd73 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,11 +4,21 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +def validate_task(task_id): + try: + task_id = int(task_id) + except ValueError: + return jsonify({"msg":f"Invalid task id: {task_id}. ID must be an integer."}), 400 + + @tasks_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() - new_task = Task(title=request_body["title"], - description=request_body["description"], completed_at=request_body["completed_at"]) + try: + new_task = Task(title=request_body["title"], + description=request_body["description"]) + except KeyError: + return {"details": "Invalid data"}, 400 db.session.add(new_task) db.session.commit() @@ -16,7 +26,7 @@ def create_task(): return {"task": {"id": new_task.task_id, "title": new_task.title, "description": new_task.description, - "is_complete": False}}, 201 + "is_complete": False,}}, 201 @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): @@ -33,12 +43,8 @@ def get_all_tasks(): return jsonify(response) @tasks_bp.route("/", methods=["GET"]) -def one_task(task_id): - try: - task_id = int(task_id) - except ValueError: - return jsonify({"msg":f"Invalid task id: {task_id}. ID must be an integer."}), 400 - +def get_one_task(task_id): + task = validate_task(task_id) requested_task = Task.query.get(task_id) if requested_task is None: @@ -47,4 +53,37 @@ def one_task(task_id): return {"task": {"id": requested_task.task_id, "title": requested_task.title, "description": requested_task.description, - "is_complete": False}} \ No newline at end of file + "is_complete": False}} + +@tasks_bp.route("/", methods=["PUT"]) +def replace_task(task_id): + task = validate_task(task_id) + request_body = request.get_json() + + requested_task = Task.query.get(task_id) + if requested_task is None: + return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + + requested_task.title = request_body["title"] + requested_task.description = request_body["description"] + + db.session.commit() + + return {"task": {"id": requested_task.task_id, + "title": requested_task.title, + "description": requested_task.description, + "is_complete": False}} + +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = validate_task(task_id) + + requested_task = Task.query.get(task_id) + if requested_task is None: + return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + + db.session.delete(requested_task) + db.session.commit() + + return jsonify({"details": f'Task {requested_task.task_id} "{requested_task.title}" successfully deleted'}) + diff --git a/migrations/versions/18eda02cfff8_.py b/migrations/versions/18eda02cfff8_.py new file mode 100644 index 000000000..fca3c577b --- /dev/null +++ b/migrations/versions/18eda02cfff8_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 18eda02cfff8 +Revises: 169136ea9374 +Create Date: 2022-05-11 19:36:58.267054 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '18eda02cfff8' +down_revision = '169136ea9374' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'completed_at') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True)) + # ### end Alembic commands ### diff --git a/migrations/versions/4f521f9f6e38_.py b/migrations/versions/4f521f9f6e38_.py new file mode 100644 index 000000000..ffbef6182 --- /dev/null +++ b/migrations/versions/4f521f9f6e38_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 4f521f9f6e38 +Revises: 18eda02cfff8 +Create Date: 2022-05-11 19:39:35.117299 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4f521f9f6e38' +down_revision = '18eda02cfff8' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'completed_at') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 16f5b6469..5724d0283 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -68,7 +68,7 @@ def test_get_task_not_found(client): assert response_body == {"msg":"Could not find task with id: 1"} -@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={ @@ -95,7 +95,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={ @@ -121,7 +121,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={ @@ -133,13 +133,13 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == {"msg":"Could not find task with id: 1"} - -@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") @@ -154,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") @@ -163,15 +163,16 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** assert Task.query.all() == [] + assert response_body == {"msg":"Could not find task with id: 1"} -@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={ @@ -188,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 5a6a5322211deefc98b84123f18690451be3c80c Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Thu, 12 May 2022 09:26:49 -0700 Subject: [PATCH 07/15] adds sorting by title functionality using query parameters; passes wave 02 --- app/routes.py | 9 ++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 1c952cd73..9385e7efa 100644 --- a/app/routes.py +++ b/app/routes.py @@ -30,8 +30,15 @@ def create_task(): @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): + title_sort_query = request.args.get("sort") + if title_sort_query == "asc": + tasks = Task.query.order_by(Task.title.asc()) + elif title_sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + response = [] - tasks = Task.query.all() for task in tasks: response.append( {"id": task.task_id, diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From 55d99e4e3741c651841f1103b9b921aca5071ceb Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Thu, 12 May 2022 19:49:08 -0700 Subject: [PATCH 08/15] adds task completion functionality; passes wave 03 --- app/models/task.py | 34 ++++++++++++- app/routes.py | 71 +++++++++++++++++++--------- migrations/versions/e6c8fa53f88a_.py | 28 +++++++++++ tests/test_wave_03.py | 24 +++++----- 4 files changed, 120 insertions(+), 37 deletions(-) create mode 100644 migrations/versions/e6c8fa53f88a_.py diff --git a/app/models/task.py b/app/models/task.py index c1f78b2d1..8344ef296 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,9 +1,39 @@ from app import db - class Task(db.Model): 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) - is_complete = db.Column(db.Boolean) \ No newline at end of file + + def create_task_dict(self): + task_dict = { + "task": { + "id": self.task_id, + "title": self.title, + "description": self.description + } + } + if self.completed_at is None: + task_dict["task"]["is_complete"] = False + else: + task_dict["task"]["is_complete"] = True + return task_dict + + def create_simple_task_dict(self): + task_dict = { + "id": self.task_id, + "title": self.title, + "description": self.description + } + if self.completed_at is None: + task_dict["is_complete"] = False + else: + task_dict["is_complete"] = True + return task_dict + + def validate_task(self): + try: + task_id = int(self.task_id) + except ValueError: + return {"msg":f"Invalid task id: {self.task_id}. ID must be an integer."}, 400 \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 9385e7efa..baa4e10fb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from flask import Blueprint, jsonify, make_response, request from app.models.task import Task +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -10,23 +11,26 @@ def validate_task(task_id): except ValueError: return jsonify({"msg":f"Invalid task id: {task_id}. ID must be an integer."}), 400 - @tasks_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() - try: - new_task = Task(title=request_body["title"], - description=request_body["description"]) - except KeyError: + + if "title" not in request_body or "description" not in request_body: return {"details": "Invalid data"}, 400 + if "completed_at" in request_body: + new_task = Task(title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"]) + else: + new_task = Task(title=request_body["title"], + description=request_body["description"]) + db.session.add(new_task) db.session.commit() - return {"task": {"id": new_task.task_id, - "title": new_task.title, - "description": new_task.description, - "is_complete": False,}}, 201 + response = new_task.create_task_dict() + return jsonify(response), 201 @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): @@ -40,12 +44,7 @@ def get_all_tasks(): response = [] for task in tasks: - response.append( - {"id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False} - ) + response.append(task.create_simple_task_dict()) return jsonify(response) @@ -57,10 +56,8 @@ def get_one_task(task_id): if requested_task is None: return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 - return {"task": {"id": requested_task.task_id, - "title": requested_task.title, - "description": requested_task.description, - "is_complete": False}} + response = requested_task.create_task_dict() + return jsonify(response) @tasks_bp.route("/", methods=["PUT"]) def replace_task(task_id): @@ -76,10 +73,8 @@ def replace_task(task_id): db.session.commit() - return {"task": {"id": requested_task.task_id, - "title": requested_task.title, - "description": requested_task.description, - "is_complete": False}} + response = requested_task.create_task_dict() + return jsonify(response) @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): @@ -94,3 +89,33 @@ def delete_task(task_id): return jsonify({"details": f'Task {requested_task.task_id} "{requested_task.title}" successfully deleted'}) +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_task_complete(task_id): + task = validate_task(task_id) + + requested_task = Task.query.get(task_id) + if requested_task is None: + return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + + requested_task.completed_at = datetime.now() + + db.session.commit() + + response = requested_task.create_task_dict() + return jsonify(response) + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_task_incomplete(task_id): + task = validate_task(task_id) + + requested_task = Task.query.get(task_id) + if requested_task is None: + return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + + requested_task.completed_at = None + requested_task.is_complete = False + + db.session.commit() + + response = requested_task.create_task_dict() + return jsonify(response) diff --git a/migrations/versions/e6c8fa53f88a_.py b/migrations/versions/e6c8fa53f88a_.py new file mode 100644 index 000000000..3f52c37c3 --- /dev/null +++ b/migrations/versions/e6c8fa53f88a_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: e6c8fa53f88a +Revises: 4f521f9f6e38 +Create Date: 2022-05-12 11:48:23.367172 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e6c8fa53f88a' +down_revision = '4f521f9f6e38' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) + # ### end Alembic commands ### diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 959176ceb..a2e2dbbc9 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") @@ -128,13 +128,13 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == {"msg":f"Could not find task with id: 1"} - -@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") @@ -143,15 +143,15 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** - + assert response_body == {"msg":f"Could not find task with id: 1"} # Let's add this test for creating tasks, now that # the completion functionality has been implemented -@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_with_valid_completed_at(client): # Act response = client.post("/tasks", json={ @@ -181,7 +181,7 @@ def test_create_task_with_valid_completed_at(client): # Let's add this test for updating tasks, now that # the completion functionality has been implemented -@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_with_completed_at_date(client, completed_task): # Act response = client.put("/tasks/1", json={ From 4f8eb463314a381e5c6e1c61d2afb690fa86fa1a Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 13 May 2022 00:33:31 -0700 Subject: [PATCH 09/15] adds slackbot functionality to PATCH route for completed tasks --- app/routes.py | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/app/routes.py b/app/routes.py index baa4e10fb..e996800f5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,8 @@ from flask import Blueprint, jsonify, make_response, request from app.models.task import Task from datetime import datetime +from dotenv import load_dotenv +import os, requests tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -9,7 +11,8 @@ def validate_task(task_id): try: task_id = int(task_id) except ValueError: - return jsonify({"msg":f"Invalid task id: {task_id}. ID must be an integer."}), 400 + response = {"msg":f"Invalid task id: {task_id}. ID must be an integer."} + return response, 400 @tasks_bp.route("", methods=["POST"]) def create_task(): @@ -30,7 +33,7 @@ def create_task(): db.session.commit() response = new_task.create_task_dict() - return jsonify(response), 201 + return response, 201 @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): @@ -54,10 +57,10 @@ def get_one_task(task_id): requested_task = Task.query.get(task_id) if requested_task is None: - return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + return {"msg":f"Could not find task with id: {task_id}"}, 404 response = requested_task.create_task_dict() - return jsonify(response) + return response @tasks_bp.route("/", methods=["PUT"]) def replace_task(task_id): @@ -66,7 +69,7 @@ def replace_task(task_id): requested_task = Task.query.get(task_id) if requested_task is None: - return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + return {"msg":f"Could not find task with id: {task_id}"}, 404 requested_task.title = request_body["title"] requested_task.description = request_body["description"] @@ -74,7 +77,7 @@ def replace_task(task_id): db.session.commit() response = requested_task.create_task_dict() - return jsonify(response) + return response @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): @@ -82,12 +85,15 @@ def delete_task(task_id): requested_task = Task.query.get(task_id) if requested_task is None: - return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + response = {"msg":f"Could not find task with id: {task_id}"} + return response, 404 db.session.delete(requested_task) db.session.commit() - return jsonify({"details": f'Task {requested_task.task_id} "{requested_task.title}" successfully deleted'}) + response = {"details": f'Task {requested_task.task_id} "{requested_task.title}" successfully deleted'} + + return response @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): @@ -95,27 +101,41 @@ def mark_task_complete(task_id): requested_task = Task.query.get(task_id) if requested_task is None: - return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + response = {"msg":f"Could not find task with id: {task_id}"} + return response, 404 requested_task.completed_at = datetime.now() db.session.commit() response = requested_task.create_task_dict() - return jsonify(response) + + path = "https://slack.com/api/chat.postMessage" + data = { + "channel": "task-notifications", + "text": f"Someone just completed the task {requested_task.title}" + } + headers = { + "authorization": "Bearer " + os.environ.get("SLACKBOT_API_KEY") + } + + post_message = requests.post(path, data=data, headers=headers) + + return response @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_task_incomplete(task_id): task = validate_task(task_id) - + requested_task = Task.query.get(task_id) if requested_task is None: - return jsonify({"msg":f"Could not find task with id: {task_id}"}), 404 + response = {"msg":f"Could not find task with id: {task_id}"} + return response, 404 requested_task.completed_at = None - requested_task.is_complete = False + db.session.commit() response = requested_task.create_task_dict() - return jsonify(response) + return response From 02d7df4b2d28217406973aa14830afba372e96e2 Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 13 May 2022 00:59:04 -0700 Subject: [PATCH 10/15] adds goal model and POST route for goal --- app/__init__.py | 3 +++ app/models/goal.py | 1 + app/routes.py | 20 ++++++++++++++++++++ migrations/versions/5da8104dc942_.py | 28 ++++++++++++++++++++++++++++ tests/test_wave_05.py | 2 +- 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 migrations/versions/5da8104dc942_.py diff --git a/app/__init__.py b/app/__init__.py index 358633204..c12a83be5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -31,5 +31,8 @@ def create_app(test_config=None): # Register Blueprints here from .routes import tasks_bp + from .routes import goals_bp 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 b0ed11dd8..de44a76f3 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,4 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) diff --git a/app/routes.py b/app/routes.py index e996800f5..70bfb0f4e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from flask import Blueprint, jsonify, make_response, request from app.models.task import Task +from app.models.goal import Goal from datetime import datetime from dotenv import load_dotenv import os, requests @@ -139,3 +140,22 @@ def mark_task_incomplete(task_id): response = requested_task.create_task_dict() return response + +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + new_goal = Goal(title=request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + + goal_dict = { + "goal": { + "id": new_goal.goal_id, + "title": new_goal.title + } + } + return goal_dict, 201 \ No newline at end of file diff --git a/migrations/versions/5da8104dc942_.py b/migrations/versions/5da8104dc942_.py new file mode 100644 index 000000000..489496ece --- /dev/null +++ b/migrations/versions/5da8104dc942_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 5da8104dc942 +Revises: e6c8fa53f88a +Create Date: 2022-05-13 00:37:46.358654 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5da8104dc942' +down_revision = 'e6c8fa53f88a' +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 ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..33fe33fde 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 f088c2a7a15624efc0544de145f266010df33bcd Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 13 May 2022 02:21:54 -0700 Subject: [PATCH 11/15] adds GET, UPDATE, and DELETE routes for goal; passes wave 05 --- app/routes.py | 83 ++++++++++++++++++++++++++++++++++++++++++- tests/test_wave_05.py | 61 ++++++++++++++++++++++--------- 2 files changed, 126 insertions(+), 18 deletions(-) diff --git a/app/routes.py b/app/routes.py index 70bfb0f4e..194a0c706 100644 --- a/app/routes.py +++ b/app/routes.py @@ -143,9 +143,19 @@ def mark_task_incomplete(task_id): goals_bp = Blueprint("goals", __name__, url_prefix="/goals") +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except ValueError: + response = {"msg":f"Invalid goal id: {goal_id}. ID must be an integer."} + return response, 400 + @goals_bp.route("", methods=["POST"]) def create_goal(): request_body = request.get_json() + + if "title" not in request_body: + return {"details": "Invalid data"}, 400 new_goal = Goal(title=request_body["title"]) @@ -158,4 +168,75 @@ def create_goal(): "title": new_goal.title } } - return goal_dict, 201 \ No newline at end of file + return goal_dict, 201 + +@goals_bp.route("", methods=["GET"]) +def get_all_goals(): + goals = Goal.query.all() + response = [] + for goal in goals: + response.append({ + "id": goal.goal_id, + "title": goal.title + }) + + return jsonify(response) + +@goals_bp.route("/", methods=["GET"]) +def get_one_goal(goal_id): + goal = validate_goal(goal_id) + requested_goal = Goal.query.get(goal_id) + + if requested_goal is None: + return {"msg":f"Could not find goal with id: {goal_id}"}, 404 + + try: + goal_id = int(goal_id) + except ValueError: + response = {"msg":f"Invalid task id: {goal_id}. ID must be an integer."} + return response, 400 + + response = { + "goal": { + "id": requested_goal.goal_id, + "title": requested_goal.title + } + } + return response + +@goals_bp.route("/", methods=["PUT"]) +def replace_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + + requested_goal = Goal.query.get(goal_id) + if requested_goal is None: + return {"msg":f"Could not find goal with id: {goal_id}"}, 404 + + requested_goal.title = request_body["title"] + + db.session.commit() + + response = { + "goal": { + "id": requested_goal.goal_id, + "title": requested_goal.title + } + } + return response + +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = validate_goal(goal_id) + + requested_goal = Goal.query.get(goal_id) + if requested_goal is None: + response = {"msg":f"Could not find goal with id: {goal_id}"} + return response, 404 + + db.session.delete(requested_goal) + db.session.commit() + + response = {"details": f'Goal {requested_goal.goal_id} "{requested_goal.title}" successfully deleted'} + + return response \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 33fe33fde..40035f6a7 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ +from app.models.goal import Goal 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 +13,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 +30,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,18 +47,20 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): - pass + # pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # raise Exception("Complete test") # Assert # ---- Complete Test ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here + assert response_body == {"msg":"Could not find goal with id: 1"} # ---- Complete Test ---- @@ -80,34 +83,50 @@ 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 + assert response.status_code == 200 # assertion 2 goes here + assert "goal" in response_body # assertion 3 goes here + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here + assert response_body == {"msg":"Could not find goal with id: 1"} # ---- 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") @@ -124,27 +143,35 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted' + } -@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 + response = client.delete("/goals/1") + response_body = response.get_json() # ---- Complete Act Here ---- # Assert + assert response.status_code == 404 # ---- Complete Assertions Here ---- # assertion 1 goes here + assert Goal.query.all() == [] # assertion 2 goes here + assert response_body == {"msg":"Could not find goal with id: 1"} # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From 4a52e54f7400fc8d97debb202bd9b515ce61d7e3 Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 13 May 2022 13:11:51 -0700 Subject: [PATCH 12/15] adds POST and GET routes for tasks associated with a goal --- app/__init__.py | 3 +- app/models/goal.py | 10 +- app/models/task.py | 15 +- app/routes.py | 199 ++++++++++++++------------- migrations/versions/169136ea9374_.py | 28 ---- migrations/versions/18eda02cfff8_.py | 28 ---- migrations/versions/4f521f9f6e38_.py | 28 ---- migrations/versions/5da8104dc942_.py | 28 ---- migrations/versions/e233315c8a70_.py | 39 ------ migrations/versions/e6c8fa53f88a_.py | 28 ---- tests/test_wave_06.py | 13 +- 11 files changed, 131 insertions(+), 288 deletions(-) delete mode 100644 migrations/versions/169136ea9374_.py delete mode 100644 migrations/versions/18eda02cfff8_.py delete mode 100644 migrations/versions/4f521f9f6e38_.py delete mode 100644 migrations/versions/5da8104dc942_.py delete mode 100644 migrations/versions/e233315c8a70_.py delete mode 100644 migrations/versions/e6c8fa53f88a_.py diff --git a/app/__init__.py b/app/__init__.py index c12a83be5..6e7af4446 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,9 +1,8 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate -import os from dotenv import load_dotenv - +import os db = SQLAlchemy() migrate = Migrate() diff --git a/app/models/goal.py b/app/models/goal.py index de44a76f3..8c47427e0 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,5 +2,13 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) + tasks = db.relationship('Task', backref='goal', lazy=True) + + def create_goal_dict(self): + 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 8344ef296..b922286a6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,6 +2,7 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime) @@ -18,6 +19,10 @@ def create_task_dict(self): task_dict["task"]["is_complete"] = False else: task_dict["task"]["is_complete"] = True + + if self.goal_id: + task_dict["goal_id"] = self.goal_id + return task_dict def create_simple_task_dict(self): @@ -32,8 +37,8 @@ def create_simple_task_dict(self): task_dict["is_complete"] = True return task_dict - def validate_task(self): - try: - task_id = int(self.task_id) - except ValueError: - return {"msg":f"Invalid task id: {self.task_id}. ID must be an integer."}, 400 \ No newline at end of file + # def validate_task(self): + # try: + # task_id = int(self.task_id) + # except ValueError: + # return {"msg":f"Invalid task id: {self.task_id}. ID must be an integer."}, 400 \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 194a0c706..eba8e8f80 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,5 +1,5 @@ from app import db -from flask import Blueprint, jsonify, make_response, request +from flask import Blueprint, jsonify, make_response, request, abort from app.models.task import Task from app.models.goal import Goal from datetime import datetime @@ -8,12 +8,6 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") -def validate_task(task_id): - try: - task_id = int(task_id) - except ValueError: - response = {"msg":f"Invalid task id: {task_id}. ID must be an integer."} - return response, 400 @tasks_bp.route("", methods=["POST"]) def create_task(): @@ -54,102 +48,75 @@ def get_all_tasks(): @tasks_bp.route("/", methods=["GET"]) def get_one_task(task_id): - task = validate_task(task_id) - requested_task = Task.query.get(task_id) + task = get_one_task_or_abort(task_id) + response = task.create_task_dict() + return response - if requested_task is None: - return {"msg":f"Could not find task with id: {task_id}"}, 404 +def get_one_task_or_abort(task_id): + try: + task_id = int(task_id) + except ValueError: + response = {"msg":f"Invalid task id: {task_id}. ID must be an integer."} + abort(make_response(jsonify(response), 400)) - response = requested_task.create_task_dict() - return response + requested_task = Task.query.get(task_id) + if requested_task is None: + response = {"msg":f"Could not find task with id: {task_id}"} + abort(make_response(jsonify(response), 404)) + + return requested_task @tasks_bp.route("/", methods=["PUT"]) def replace_task(task_id): - task = validate_task(task_id) + task = get_one_task_or_abort(task_id) request_body = request.get_json() - requested_task = Task.query.get(task_id) - if requested_task is None: - return {"msg":f"Could not find task with id: {task_id}"}, 404 - - requested_task.title = request_body["title"] - requested_task.description = request_body["description"] + task.title = request_body["title"] + task.description = request_body["description"] db.session.commit() - - response = requested_task.create_task_dict() + response = task.create_task_dict() return response @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): - task = validate_task(task_id) - - requested_task = Task.query.get(task_id) - if requested_task is None: - response = {"msg":f"Could not find task with id: {task_id}"} - return response, 404 - - db.session.delete(requested_task) + task = get_one_task_or_abort(task_id) + db.session.delete(task) db.session.commit() - - response = {"details": f'Task {requested_task.task_id} "{requested_task.title}" successfully deleted'} - + response = {"details": f'Task {task.task_id} "{task.title}" successfully deleted'} return response @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): - task = validate_task(task_id) - - requested_task = Task.query.get(task_id) - if requested_task is None: - response = {"msg":f"Could not find task with id: {task_id}"} - return response, 404 - - requested_task.completed_at = datetime.now() + task = get_one_task_or_abort(task_id) + task.completed_at = datetime.now() db.session.commit() - - response = requested_task.create_task_dict() + response = task.create_task_dict() path = "https://slack.com/api/chat.postMessage" data = { "channel": "task-notifications", - "text": f"Someone just completed the task {requested_task.title}" + "text": f"Someone just completed the task {task.title}" } headers = { "authorization": "Bearer " + os.environ.get("SLACKBOT_API_KEY") } post_message = requests.post(path, data=data, headers=headers) - + return response @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_task_incomplete(task_id): - task = validate_task(task_id) - - requested_task = Task.query.get(task_id) - if requested_task is None: - response = {"msg":f"Could not find task with id: {task_id}"} - return response, 404 - - requested_task.completed_at = None - - + task = get_one_task_or_abort(task_id) + task.completed_at = None db.session.commit() - - response = requested_task.create_task_dict() + response = task.create_task_dict() return response goals_bp = Blueprint("goals", __name__, url_prefix="/goals") -def validate_goal(goal_id): - try: - goal_id = int(goal_id) - except ValueError: - response = {"msg":f"Invalid goal id: {goal_id}. ID must be an integer."} - return response, 400 - @goals_bp.route("", methods=["POST"]) def create_goal(): request_body = request.get_json() @@ -184,59 +151,99 @@ def get_all_goals(): @goals_bp.route("/", methods=["GET"]) def get_one_goal(goal_id): - goal = validate_goal(goal_id) - requested_goal = Goal.query.get(goal_id) - - if requested_goal is None: - return {"msg":f"Could not find goal with id: {goal_id}"}, 404 - - try: - goal_id = int(goal_id) - except ValueError: - response = {"msg":f"Invalid task id: {goal_id}. ID must be an integer."} - return response, 400 - + goal = get_one_goal_or_abort(goal_id) response = { "goal": { - "id": requested_goal.goal_id, - "title": requested_goal.title + "id": goal.goal_id, + "title": goal.title } } return response +def get_one_goal_or_abort(goal_id): + try: + goal_id = int(goal_id) + except ValueError: + response = {"msg":f"Invalid goal id: {goal_id}. ID must be an integer."} + abort(make_response(jsonify(response), 400)) + + requested_goal = Goal.query.get(goal_id) + + # if requested_goal is None: + if not requested_goal: + response = {"msg":f"Could not find goal with id: {goal_id}"} + abort(make_response(jsonify(response), 404)) + + return requested_goal + @goals_bp.route("/", methods=["PUT"]) def replace_goal(goal_id): - goal = validate_goal(goal_id) + goal = get_one_goal_or_abort(goal_id) request_body = request.get_json() - requested_goal = Goal.query.get(goal_id) - if requested_goal is None: - return {"msg":f"Could not find goal with id: {goal_id}"}, 404 - - requested_goal.title = request_body["title"] - + goal.title = request_body["title"] db.session.commit() - response = { "goal": { - "id": requested_goal.goal_id, - "title": requested_goal.title + "id": goal.goal_id, + "title": goal.title } } return response @goals_bp.route("/", methods=["DELETE"]) def delete_goal(goal_id): - goal = validate_goal(goal_id) + goal = get_one_goal_or_abort(goal_id) - requested_goal = Goal.query.get(goal_id) - if requested_goal is None: - response = {"msg":f"Could not find goal with id: {goal_id}"} - return response, 404 + db.session.delete(goal) + db.session.commit() + response = {"details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'} - db.session.delete(requested_goal) + return response + +@goals_bp.route("//tasks", methods=["POST"]) +def associate_tasks_goals(goal_id): + goal = get_one_goal_or_abort(goal_id) + request_body = request.get_json() + + try: + task_ids = request_body["task_ids"] + except KeyError: + return {"msg": "Missing task_ids in request body"}, 400 + + if not isinstance(task_ids, list): + return {"msg": "Expected list of task ids"}, 400 + + tasks = [] + for id in task_ids: + tasks.append(get_one_task_or_abort(id)) + + for task in tasks: + task.goal = goal + db.session.commit() - response = {"details": f'Goal {requested_goal.goal_id} "{requested_goal.title}" successfully deleted'} + return { + "id": goal.goal_id, + "task_ids": task_ids + }, 200 - return response \ No newline at end of file +@goals_bp.route("//tasks", methods=["GET"]) +def get_tasks_assoc_goal(goal_id): + goal = get_one_goal_or_abort(goal_id) + request_body = request.get_json() + + goal_tasks = [] + for task in goal.tasks: + goal_tasks.append(task) + + response = { + "id": goal.goal_id, + "title": goal.title, + "tasks": [] + } + + for task in goal.tasks: + response["tasks"].append(task.create_task_dict()) + + return response diff --git a/migrations/versions/169136ea9374_.py b/migrations/versions/169136ea9374_.py deleted file mode 100644 index 40482c094..000000000 --- a/migrations/versions/169136ea9374_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: 169136ea9374 -Revises: e233315c8a70 -Create Date: 2022-05-11 16:00:39.774392 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '169136ea9374' -down_revision = 'e233315c8a70' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'is_complete') - # ### end Alembic commands ### diff --git a/migrations/versions/18eda02cfff8_.py b/migrations/versions/18eda02cfff8_.py deleted file mode 100644 index fca3c577b..000000000 --- a/migrations/versions/18eda02cfff8_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: 18eda02cfff8 -Revises: 169136ea9374 -Create Date: 2022-05-11 19:36:58.267054 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -# revision identifiers, used by Alembic. -revision = '18eda02cfff8' -down_revision = '169136ea9374' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'completed_at') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True)) - # ### end Alembic commands ### diff --git a/migrations/versions/4f521f9f6e38_.py b/migrations/versions/4f521f9f6e38_.py deleted file mode 100644 index ffbef6182..000000000 --- a/migrations/versions/4f521f9f6e38_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: 4f521f9f6e38 -Revises: 18eda02cfff8 -Create Date: 2022-05-11 19:39:35.117299 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '4f521f9f6e38' -down_revision = '18eda02cfff8' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'completed_at') - # ### end Alembic commands ### diff --git a/migrations/versions/5da8104dc942_.py b/migrations/versions/5da8104dc942_.py deleted file mode 100644 index 489496ece..000000000 --- a/migrations/versions/5da8104dc942_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: 5da8104dc942 -Revises: e6c8fa53f88a -Create Date: 2022-05-13 00:37:46.358654 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '5da8104dc942' -down_revision = 'e6c8fa53f88a' -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 ### diff --git a/migrations/versions/e233315c8a70_.py b/migrations/versions/e233315c8a70_.py deleted file mode 100644 index 7be45524f..000000000 --- a/migrations/versions/e233315c8a70_.py +++ /dev/null @@ -1,39 +0,0 @@ -"""empty message - -Revision ID: e233315c8a70 -Revises: -Create Date: 2022-05-06 11:54:34.736431 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'e233315c8a70' -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(), nullable=False), - sa.PrimaryKeyConstraint('goal_id') - ) - op.create_table('task', - sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), - sa.Column('task_title', sa.String(), nullable=True), - sa.Column('task_description', sa.String(), nullable=True), - sa.Column('completed_at', sa.DateTime(), 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/e6c8fa53f88a_.py b/migrations/versions/e6c8fa53f88a_.py deleted file mode 100644 index 3f52c37c3..000000000 --- a/migrations/versions/e6c8fa53f88a_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: e6c8fa53f88a -Revises: 4f521f9f6e38 -Create Date: 2022-05-12 11:48:23.367172 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'e6c8fa53f88a' -down_revision = '4f521f9f6e38' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'is_complete') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) - # ### end Alembic commands ### diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..7df800063 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") @@ -51,13 +51,16 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { + "msg":"Could not find goal with id: 1" + } -@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") From 9dbf2f7257c745214de71db8977a47c118d924d4 Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 13 May 2022 15:26:08 -0700 Subject: [PATCH 13/15] refactored and passes wave 06 --- app/models/goal.py | 3 ++- app/models/task.py | 29 ++++------------------- app/routes.py | 53 ++++++++++++++++++++----------------------- tests/test_wave_06.py | 4 ++-- 4 files changed, 34 insertions(+), 55 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 8c47427e0..5ca4d2c2e 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -11,4 +11,5 @@ def create_goal_dict(self): "id": self.goal_id, "title": self.title, } - return goal_dict \ No newline at end of file + return goal_dict + \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index b922286a6..8ffe34d21 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,24 +8,6 @@ class Task(db.Model): completed_at = db.Column(db.DateTime) def create_task_dict(self): - task_dict = { - "task": { - "id": self.task_id, - "title": self.title, - "description": self.description - } - } - if self.completed_at is None: - task_dict["task"]["is_complete"] = False - else: - task_dict["task"]["is_complete"] = True - - if self.goal_id: - task_dict["goal_id"] = self.goal_id - - return task_dict - - def create_simple_task_dict(self): task_dict = { "id": self.task_id, "title": self.title, @@ -35,10 +17,9 @@ def create_simple_task_dict(self): task_dict["is_complete"] = False else: task_dict["is_complete"] = True + + if self.goal_id: + task_dict["goal_id"] = self.goal_id + return task_dict - - # def validate_task(self): - # try: - # task_id = int(self.task_id) - # except ValueError: - # return {"msg":f"Invalid task id: {self.task_id}. ID must be an integer."}, 400 \ No newline at end of file + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index eba8e8f80..d40ba8081 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,7 +8,6 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") - @tasks_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() @@ -27,7 +26,9 @@ def create_task(): db.session.add(new_task) db.session.commit() - response = new_task.create_task_dict() + response = { + "task": new_task.create_task_dict() + } return response, 201 @tasks_bp.route("", methods=["GET"]) @@ -42,14 +43,16 @@ def get_all_tasks(): response = [] for task in tasks: - response.append(task.create_simple_task_dict()) + response.append(task.create_task_dict()) return jsonify(response) @tasks_bp.route("/", methods=["GET"]) def get_one_task(task_id): task = get_one_task_or_abort(task_id) - response = task.create_task_dict() + response = { + "task": task.create_task_dict() + } return response def get_one_task_or_abort(task_id): @@ -75,7 +78,9 @@ def replace_task(task_id): task.description = request_body["description"] db.session.commit() - response = task.create_task_dict() + response = { + "task": task.create_task_dict() + } return response @tasks_bp.route("/", methods=["DELETE"]) @@ -92,7 +97,9 @@ def mark_task_complete(task_id): task.completed_at = datetime.now() db.session.commit() - response = task.create_task_dict() + response = { + "task": task.create_task_dict() + } path = "https://slack.com/api/chat.postMessage" data = { @@ -112,7 +119,9 @@ def mark_task_incomplete(task_id): task = get_one_task_or_abort(task_id) task.completed_at = None db.session.commit() - response = task.create_task_dict() + response = { + "task": task.create_task_dict() + } return response goals_bp = Blueprint("goals", __name__, url_prefix="/goals") @@ -129,23 +138,19 @@ def create_goal(): db.session.add(new_goal) db.session.commit() - goal_dict = { - "goal": { - "id": new_goal.goal_id, - "title": new_goal.title - } - } - return goal_dict, 201 + response = { + "goal": new_goal.create_goal_dict() + } + return response, 201 @goals_bp.route("", methods=["GET"]) def get_all_goals(): goals = Goal.query.all() response = [] for goal in goals: - response.append({ - "id": goal.goal_id, - "title": goal.title - }) + response.append( + goal.create_goal_dict() + ) return jsonify(response) @@ -153,10 +158,7 @@ def get_all_goals(): def get_one_goal(goal_id): goal = get_one_goal_or_abort(goal_id) response = { - "goal": { - "id": goal.goal_id, - "title": goal.title - } + "goal": goal.create_goal_dict() } return response @@ -168,8 +170,6 @@ def get_one_goal_or_abort(goal_id): abort(make_response(jsonify(response), 400)) requested_goal = Goal.query.get(goal_id) - - # if requested_goal is None: if not requested_goal: response = {"msg":f"Could not find goal with id: {goal_id}"} abort(make_response(jsonify(response), 404)) @@ -184,10 +184,7 @@ def replace_goal(goal_id): goal.title = request_body["title"] db.session.commit() response = { - "goal": { - "id": goal.goal_id, - "title": goal.title - } + "goal": goal.create_goal_dict() } return response diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 7df800063..9d1b87022 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -77,7 +77,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -102,7 +102,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From 9228f5c84ff1948b8d0b11360b300fc77b8155ba Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 13 May 2022 15:34:02 -0700 Subject: [PATCH 14/15] adds Procfile for deployment --- 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 fe953dd990694eb58435d5aa6ee174fa50b6157e Mon Sep 17 00:00:00 2001 From: Gabriela Webb Date: Fri, 13 May 2022 17:32:25 -0700 Subject: [PATCH 15/15] adds migrations --- migrations/versions/a5ab46b96d26_.py | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 migrations/versions/a5ab46b96d26_.py diff --git a/migrations/versions/a5ab46b96d26_.py b/migrations/versions/a5ab46b96d26_.py new file mode 100644 index 000000000..bf3a51aec --- /dev/null +++ b/migrations/versions/a5ab46b96d26_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: a5ab46b96d26 +Revises: +Create Date: 2022-05-13 17:29:08.644688 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a5ab46b96d26' +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.Column('title', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ), + 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 ###