From 44f1defcccf4fa07bc3aefdf93698e1e6b844089 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 5 May 2022 13:45:13 -0700 Subject: [PATCH 01/31] created Task model, initialized test and development dbs --- app/models/task.py | 5 +- app/routes.py | 18 +++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/a6af0dd79516_.py | 39 +++++++++++ 7 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/a6af0dd79516_.py diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..569493509 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) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True) diff --git a/app/routes.py b/app/routes.py index 3aae38d49..d19dbfda0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,17 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, jsonify, request, abort, make_response +from app import db +from app.models.task import Task + +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"'{task_id}' is invalid"}), 400 + + task = Task.query.get(task_id) + + if not task: + return jsonify({"message" : f"Could not find '{task_id}'"}), 404 + return task \ No newline at end of file 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"} diff --git a/migrations/versions/a6af0dd79516_.py b/migrations/versions/a6af0dd79516_.py new file mode 100644 index 000000000..95d84865f --- /dev/null +++ b/migrations/versions/a6af0dd79516_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: a6af0dd79516 +Revises: +Create Date: 2022-05-05 13:35:47.629690 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a6af0dd79516' +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('title', sa.String(), nullable=True), + sa.Column('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 ### From 0cbb311d50be8654f822ca2ecbe686c842d370a5 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 5 May 2022 14:56:57 -0700 Subject: [PATCH 02/31] registered blueprints, added create_task POST route: --- app/__init__.py | 5 ++++- app/routes.py | 26 +++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..db1068d71 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -29,6 +29,9 @@ def create_app(test_config=None): db.init_app(app) migrate.init_app(app, db) - # Register Blueprints here + # Register blueprints + + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/routes.py b/app/routes.py index d19dbfda0..ac0f1f675 100644 --- a/app/routes.py +++ b/app/routes.py @@ -14,4 +14,28 @@ def validate_task(task_id): if not task: return jsonify({"message" : f"Could not find '{task_id}'"}), 404 - return task \ No newline at end of file + return task + +@tasks_bp.route('', methods=['POST']) +def create_task(): + request_body = request.get_json() + + new_task = Task ( + description = request_body['description'], + title = request_body['title'] + ) + db.session.add(new_task) + db.session.commit() + + response = { + "task" : + { + "is_complete" : False, + "description" : new_task.description, + "title" : new_task.title, + "id" : new_task.task_id + } + } + + return response, 201 + From e7feabbfd348e398a49e4b2789b3f967066ad195 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 6 May 2022 11:26:28 -0700 Subject: [PATCH 03/31] created get_tasks route for all tasks --- app/routes.py | 16 ++++++++++++++++ tests/test_wave_01.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index ac0f1f675..7e28501fc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -39,3 +39,19 @@ def create_task(): return response, 201 +@tasks_bp.route('', methods=['GET']) +def get_tasks(): + tasks = Task.query.all() + tasks_response = [] + + for task in tasks: + tasks_response.append( + { + "is_complete" : False, + "description" : task.description, + "title" : task.title, + "id" : task.task_id + } + ) + + return jsonify(tasks_response), 200 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..292d2a5c4 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -66,7 +66,7 @@ def test_get_task_not_found(client): # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ From 8de89600415e888ef774eb64d332f57e8a5a5177 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 6 May 2022 11:41:08 -0700 Subject: [PATCH 04/31] added get_one_task route, refactored validate_task --- app/routes.py | 17 +++++++++++++++-- tests/test_wave_01.py | 14 ++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/routes.py b/app/routes.py index 7e28501fc..581e3a6b9 100644 --- a/app/routes.py +++ b/app/routes.py @@ -11,10 +11,18 @@ def validate_task(task_id): return jsonify({"msg" : f"'{task_id}' is invalid"}), 400 task = Task.query.get(task_id) - if not task: return jsonify({"message" : f"Could not find '{task_id}'"}), 404 - return task + + return { + "task" : + { + "is_complete" : False, + "description" : task.description, + "title" : task.title, + "id" : task.task_id + } + }, 200 @tasks_bp.route('', methods=['POST']) def create_task(): @@ -55,3 +63,8 @@ def get_tasks(): ) return jsonify(tasks_response), 200 + +@tasks_bp.route('/', methods=['GET']) +def get_one_task(task_id): + task = validate_task(task_id) + return task \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 292d2a5c4..f088b5b2a 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,11 +59,9 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message" : f"Could not find '1'"} + - 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") From 4150fb86c1b61927fd023fde1eeba6fb9f0faa97 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 6 May 2022 11:44:49 -0700 Subject: [PATCH 05/31] refactored validate_task AGAIN, refactored get_one_task --- app/routes.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/app/routes.py b/app/routes.py index 581e3a6b9..f7d6a436e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -13,16 +13,8 @@ def validate_task(task_id): task = Task.query.get(task_id) if not task: return jsonify({"message" : f"Could not find '{task_id}'"}), 404 - - return { - "task" : - { - "is_complete" : False, - "description" : task.description, - "title" : task.title, - "id" : task.task_id - } - }, 200 + + return task @tasks_bp.route('', methods=['POST']) def create_task(): @@ -67,4 +59,17 @@ def get_tasks(): @tasks_bp.route('/', methods=['GET']) def get_one_task(task_id): task = validate_task(task_id) - return task \ No newline at end of file + + if isinstance(task, Task): + return { + "task" : + { + "is_complete" : False, + "description" : task.description, + "title" : task.title, + "id" : task.task_id + } + }, 200 + + return task + From c73290a4d7e0dd767e2e1bcc0f558c01303ae083 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 6 May 2022 11:50:20 -0700 Subject: [PATCH 06/31] created update_task route --- app/routes.py | 22 ++++++++++++++++++++++ tests/test_wave_01.py | 10 +++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index f7d6a436e..5d11a27aa 100644 --- a/app/routes.py +++ b/app/routes.py @@ -73,3 +73,25 @@ def get_one_task(task_id): return task +@tasks_bp.route('/', methods=['PUT']) +def update_task(task_id): + task = validate_task(task_id) + request_body = request.get_json() + + if isinstance(task, Task): + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return { + "task" : + { + "is_complete" : False, + "description" : task.description, + "title" : task.title, + "id" : task.task_id + } + }, 200 + + return task \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index f088b5b2a..7600a8e28 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -91,7 +91,7 @@ def test_create_task(client): assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -117,7 +117,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={ @@ -128,11 +128,7 @@ 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" : f"Could not find '1'"} @pytest.mark.skip(reason="No way to test this feature yet") From 1d027f238def8a2ce9e28acdf03c23ea7e2f7a4d Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 6 May 2022 12:12:21 -0700 Subject: [PATCH 07/31] updated create_task to validata description and title are in request body --- app/routes.py | 19 +++++++++++++++++-- tests/test_wave_01.py | 24 +++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/routes.py b/app/routes.py index 5d11a27aa..5cd9f0e74 100644 --- a/app/routes.py +++ b/app/routes.py @@ -20,6 +20,11 @@ def validate_task(task_id): def create_task(): request_body = request.get_json() + if "description" not in request_body or "title" not in request_body: + return { + "details" : "Invalid data" + }, 400 + new_task = Task ( description = request_body['description'], title = request_body['title'] @@ -81,7 +86,6 @@ def update_task(task_id): if isinstance(task, Task): task.title = request_body["title"] task.description = request_body["description"] - db.session.commit() return { @@ -94,4 +98,15 @@ def update_task(task_id): } }, 200 - return task \ No newline at end of file + return task + +@tasks_bp.route('/', methods=['DELETE']) +def delete_task(task_id): + task = validate_task(task_id) + if isinstance(task, Task): + db.session.delete(task) + db.session.commit() + return { + "details" : f'Task {task_id} "{task.title}" successfully deleted' + } + return task diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 7600a8e28..a2118501c 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,6 @@ import pytest -# @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 +12,6 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -32,7 +30,6 @@ def test_get_tasks_one_saved_tasks(client, one_task): ] -# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -51,7 +48,6 @@ def test_get_task(client, one_task): } -# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -60,11 +56,9 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 assert response_body == {"message" : f"Could not find '1'"} + assert Task.query.all() == [] - - -# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -91,7 +85,6 @@ def test_create_task(client): assert new_task.completed_at == None -# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -117,7 +110,6 @@ def test_update_task(client, one_task): assert task.completed_at == None -# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -129,9 +121,9 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 assert response_body == {"message" : f"Could not find '1'"} + assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -146,7 +138,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") + def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -154,16 +146,10 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - + assert response_body == {"message" : f"Could not find '1'"} assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -180,7 +166,7 @@ def test_create_task_must_contain_title(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") + def test_create_task_must_contain_description(client): # Act response = client.post("/tasks", json={ From 0e9fabf18e823e3f428706740274b2410f1926b4 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 6 May 2022 12:18:49 -0700 Subject: [PATCH 08/31] created format_response helper function to display task details consistently --- app/routes.py | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/app/routes.py b/app/routes.py index 5cd9f0e74..3f9c4c9b3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,6 +16,19 @@ def validate_task(task_id): return task +def format_response(task): + response = { + "task" : + { + "is_complete" : False, + "description" : task.description, + "title" : task.title, + "id" : task.task_id + } + } + return response + + @tasks_bp.route('', methods=['POST']) def create_task(): request_body = request.get_json() @@ -32,17 +45,7 @@ def create_task(): db.session.add(new_task) db.session.commit() - response = { - "task" : - { - "is_complete" : False, - "description" : new_task.description, - "title" : new_task.title, - "id" : new_task.task_id - } - } - - return response, 201 + return format_response(new_task), 201 @tasks_bp.route('', methods=['GET']) def get_tasks(): @@ -66,15 +69,7 @@ def get_one_task(task_id): task = validate_task(task_id) if isinstance(task, Task): - return { - "task" : - { - "is_complete" : False, - "description" : task.description, - "title" : task.title, - "id" : task.task_id - } - }, 200 + return format_response(task), 200 return task @@ -88,15 +83,7 @@ def update_task(task_id): task.description = request_body["description"] db.session.commit() - return { - "task" : - { - "is_complete" : False, - "description" : task.description, - "title" : task.title, - "id" : task.task_id - } - }, 200 + return format_response(task), 200 return task From 03f2610098fdf5da0bea950932bc1d5cae01c591 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Sat, 7 May 2022 12:45:44 -0700 Subject: [PATCH 09/31] added sort param to get_tasks --- app/routes.py | 20 ++++++++++++++++---- tests/test_wave_02.py | 3 +-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3f9c4c9b3..9dfb846ae 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,8 @@ from flask import Blueprint, jsonify, request, abort, make_response from app import db from app.models.task import Task +from sqlalchemy import desc, asc + tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -13,9 +15,9 @@ def validate_task(task_id): task = Task.query.get(task_id) if not task: return jsonify({"message" : f"Could not find '{task_id}'"}), 404 - return task + def format_response(task): response = { "task" : @@ -47,9 +49,19 @@ def create_task(): return format_response(new_task), 201 + @tasks_bp.route('', methods=['GET']) def get_tasks(): - tasks = Task.query.all() + + # check for sort parameter + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(asc(Task.title)).all() + elif sort_query == "desc": + tasks = Task.query.order_by(desc(Task.title)).all() + else: + tasks = Task.query.all() + tasks_response = [] for task in tasks: @@ -64,15 +76,16 @@ def get_tasks(): return jsonify(tasks_response), 200 + @tasks_bp.route('/', methods=['GET']) def get_one_task(task_id): task = validate_task(task_id) if isinstance(task, Task): return format_response(task), 200 - return task + @tasks_bp.route('/', methods=['PUT']) def update_task(task_id): task = validate_task(task_id) @@ -84,7 +97,6 @@ def update_task(task_id): db.session.commit() return format_response(task), 200 - return task @tasks_bp.route('/', methods=['DELETE']) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..7b662b0eb 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") + def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,6 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From 185595bbd7caf5115f877fa044e478e83b53f195 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Sat, 7 May 2022 12:48:05 -0700 Subject: [PATCH 10/31] created check_if_task_complete function --- app/routes.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 9dfb846ae..9642f9d67 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,12 +17,11 @@ def validate_task(task_id): return jsonify({"message" : f"Could not find '{task_id}'"}), 404 return task - def format_response(task): response = { "task" : { - "is_complete" : False, + "is_complete" : check_if_task_complete(task), "description" : task.description, "title" : task.title, "id" : task.task_id @@ -30,6 +29,11 @@ def format_response(task): } return response +def check_if_task_complete(task): + if task.completed_at == None: + return False + return True + @tasks_bp.route('', methods=['POST']) def create_task(): @@ -67,7 +71,7 @@ def get_tasks(): for task in tasks: tasks_response.append( { - "is_complete" : False, + "is_complete" : check_if_task_complete(task), "description" : task.description, "title" : task.title, "id" : task.task_id From f2d05de97aa2132d22e99b34540384f8c3441530 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Sat, 7 May 2022 12:57:34 -0700 Subject: [PATCH 11/31] added mark_complete route --- app/routes.py | 13 +++++++++++++ tests/test_wave_03.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 9642f9d67..0abca1082 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app import db from app.models.task import Task from sqlalchemy import desc, asc +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -113,3 +114,15 @@ def delete_task(task_id): "details" : f'Task {task_id} "{task.title}" successfully deleted' } return task + +@tasks_bp.route('//mark_complete', methods=['PATCH']) +def mark_complete(task_id): + task = validate_task(task_id) + + if isinstance(task, Task): + task.completed_at = datetime.now() + db.session.commit() + return format_response(task), 200 + return task + + diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 959176ceb..ffc49a5b4 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 """ From 278593c51709a87227d428f75e0c5b1971e0f27c Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Sat, 7 May 2022 13:04:40 -0700 Subject: [PATCH 12/31] created mark_complete and mark_incomplete routes --- app/routes.py | 11 ++++++++++- tests/test_wave_03.py | 21 ++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0abca1082..a20833f66 100644 --- a/app/routes.py +++ b/app/routes.py @@ -120,9 +120,18 @@ def mark_complete(task_id): task = validate_task(task_id) if isinstance(task, Task): - task.completed_at = datetime.now() + task.completed_at = datetime.utcnow() db.session.commit() return format_response(task), 200 return task +@tasks_bp.route('//mark_incomplete', methods=['PATCH']) +def mark_incomplete(task_id): + task = validate_task(task_id) + + if isinstance(task, Task): + task.completed_at = None + db.session.commit() + return format_response(task), 200 + return task diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index ffc49a5b4..b92e7fb1e 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,6 @@ import pytest -# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +41,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") + def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +61,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") + def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +98,6 @@ 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") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +117,6 @@ 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") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +124,11 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message" : f"Could not find '1'"} + assert Task.query.all() == [] - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,11 +136,8 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message" : f"Could not find '1'"} + assert Task.query.all() == [] # Let's add this test for creating tasks, now that From ee148b36ad638d8717951147c3b1f1491ca976fc Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Sat, 7 May 2022 13:31:14 -0700 Subject: [PATCH 13/31] added option to mark task complete when created or updates --- app/routes.py | 9 ++++++++- tests/test_wave_03.py | 6 ------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index a20833f66..c71ebdcb2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint, jsonify, request, abort, make_response +from flask import Blueprint, jsonify, request from app import db from app.models.task import Task from sqlalchemy import desc, asc @@ -49,6 +49,10 @@ def create_task(): description = request_body['description'], title = request_body['title'] ) + + if "completed_at" in request_body: + new_task.completed_at = request_body['completed_at'] + db.session.add(new_task) db.session.commit() @@ -101,6 +105,9 @@ def update_task(task_id): task.description = request_body["description"] db.session.commit() + if "completed_at" in request_body: + task.completed_at = request_body['completed_at'] + return format_response(task), 200 return task diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index b92e7fb1e..fd20d979c 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -140,9 +140,6 @@ def test_mark_incomplete_missing_task(client): assert Task.query.all() == [] -# 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") def test_create_task_with_valid_completed_at(client): # Act response = client.post("/tasks", json={ @@ -170,9 +167,6 @@ def test_create_task_with_valid_completed_at(client): assert new_task.completed_at -# 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") def test_update_task_with_completed_at_date(client, completed_task): # Act response = client.put("/tasks/1", json={ From 190b1d162d1f59c561c8cd11ebbf3b2ec5e40177 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Sat, 7 May 2022 13:31:35 -0700 Subject: [PATCH 14/31] added option to mark task complete when created or updated --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index c71ebdcb2..7adaf84c9 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint, jsonify, request +from flask import Blueprint, jsonify, request from app import db from app.models.task import Task from sqlalchemy import desc, asc From c709e41be4d03c9a644e82a104c80e972520f641 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Sat, 7 May 2022 13:54:21 -0700 Subject: [PATCH 15/31] refactored to check boolean value of completed_at, removed redundant helper function --- app/routes.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/routes.py b/app/routes.py index 7adaf84c9..2a1cec1ae 100644 --- a/app/routes.py +++ b/app/routes.py @@ -22,7 +22,7 @@ def format_response(task): response = { "task" : { - "is_complete" : check_if_task_complete(task), + "is_complete" : bool(task.completed_at), "description" : task.description, "title" : task.title, "id" : task.task_id @@ -30,12 +30,6 @@ def format_response(task): } return response -def check_if_task_complete(task): - if task.completed_at == None: - return False - return True - - @tasks_bp.route('', methods=['POST']) def create_task(): request_body = request.get_json() @@ -76,7 +70,7 @@ def get_tasks(): for task in tasks: tasks_response.append( { - "is_complete" : check_if_task_complete(task), + "is_complete" : bool(task.completed_at), "description" : task.description, "title" : task.title, "id" : task.task_id From c93bcacc0606e52e649c8be44b746c09b11eb1ea Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Tue, 10 May 2022 15:00:33 -0700 Subject: [PATCH 16/31] removed asc order_by conditional as it is asc by default --- app/routes.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/routes.py b/app/routes.py index 2a1cec1ae..9bcf9ccdf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -55,15 +55,11 @@ def create_task(): @tasks_bp.route('', methods=['GET']) def get_tasks(): - - # check for sort parameter sort_query = request.args.get("sort") - if sort_query == "asc": - tasks = Task.query.order_by(asc(Task.title)).all() - elif sort_query == "desc": + if sort_query == "desc": tasks = Task.query.order_by(desc(Task.title)).all() else: - tasks = Task.query.all() + tasks = Task.query.order_by(asc(Task.title)).all() tasks_response = [] From 0cb2473d9ab8597f19988adbc54e8be103a740c9 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Tue, 10 May 2022 16:36:10 -0700 Subject: [PATCH 17/31] added push_complete_task_to_slack for when a task is marked complete --- app/__init__.py | 3 +++ app/routes.py | 26 ++++++++++++++++++++------ requirements.txt | 2 ++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index db1068d71..32ad8b58c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,11 +5,14 @@ from dotenv import load_dotenv + + db = SQLAlchemy() migrate = Migrate() load_dotenv() + def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False diff --git a/app/routes.py b/app/routes.py index 9bcf9ccdf..c1b3cb921 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,6 +3,9 @@ from app.models.task import Task from sqlalchemy import desc, asc from datetime import datetime +import requests +import os + tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -18,7 +21,7 @@ def validate_task(task_id): return jsonify({"message" : f"Could not find '{task_id}'"}), 404 return task -def format_response(task): +def format_as_dict(task): response = { "task" : { @@ -30,6 +33,15 @@ def format_response(task): } return response +def push_complete_to_slack(task): + bot_token = os.environ.get("SLACK_BOT_TOKEN") + params = { + "channel" : "task-notifications", + "text" : f"Someone just completed the task {task.title}" + } + headers = {"authorization" : "Bearer " + bot_token} + requests.post("https://slack.com/api/chat.postMessage", params=params, headers=headers) + @tasks_bp.route('', methods=['POST']) def create_task(): request_body = request.get_json() @@ -50,7 +62,7 @@ def create_task(): db.session.add(new_task) db.session.commit() - return format_response(new_task), 201 + return format_as_dict(new_task), 201 @tasks_bp.route('', methods=['GET']) @@ -81,7 +93,7 @@ def get_one_task(task_id): task = validate_task(task_id) if isinstance(task, Task): - return format_response(task), 200 + return format_as_dict(task), 200 return task @@ -98,7 +110,7 @@ def update_task(task_id): if "completed_at" in request_body: task.completed_at = request_body['completed_at'] - return format_response(task), 200 + return format_as_dict(task), 200 return task @tasks_bp.route('/', methods=['DELETE']) @@ -117,9 +129,11 @@ def mark_complete(task_id): task = validate_task(task_id) if isinstance(task, Task): + task.completed_at = datetime.utcnow() db.session.commit() - return format_response(task), 200 + push_complete_to_slack(task) + return format_as_dict(task), 200 return task @tasks_bp.route('//mark_incomplete', methods=['PATCH']) @@ -129,6 +143,6 @@ def mark_incomplete(task_id): if isinstance(task, Task): task.completed_at = None db.session.commit() - return format_response(task), 200 + return format_as_dict(task), 200 return task diff --git a/requirements.txt b/requirements.txt index 30ff414fe..52f18dc93 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,3 +32,5 @@ SQLAlchemy==1.3.23 toml==0.10.2 urllib3==1.26.5 Werkzeug==1.0.1 + + From 418921fbde84e0f46e59f64163779244e4c10a59 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Tue, 10 May 2022 16:59:47 -0700 Subject: [PATCH 18/31] created goal model, added create_goal and get_goals routes --- app/__init__.py | 3 ++ app/models/goal.py | 1 + app/routes.py | 57 ++++++++++++++++++++++++---- migrations/versions/4154fa388b17_.py | 28 ++++++++++++++ tests/test_wave_05.py | 4 +- 5 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 migrations/versions/4154fa388b17_.py diff --git a/app/__init__.py b/app/__init__.py index 32ad8b58c..51c76180a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -37,4 +37,7 @@ def create_app(test_config=None): from .routes import tasks_bp app.register_blueprint(tasks_bp) + from .routes import goals_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 c1b3cb921..666fdb0ef 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, jsonify, request from app import db from app.models.task import Task +from app.models.goal import Goal from sqlalchemy import desc, asc from datetime import datetime import requests @@ -9,6 +10,7 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") def validate_task(task_id): try: @@ -21,7 +23,7 @@ def validate_task(task_id): return jsonify({"message" : f"Could not find '{task_id}'"}), 404 return task -def format_as_dict(task): +def format_task(task): response = { "task" : { @@ -33,6 +35,15 @@ def format_as_dict(task): } return response +def format_goal(goal): + return { + "goal": { + "id" : goal.goal_id, + "title" : goal.title + } + } + + def push_complete_to_slack(task): bot_token = os.environ.get("SLACK_BOT_TOKEN") params = { @@ -42,6 +53,7 @@ def push_complete_to_slack(task): headers = {"authorization" : "Bearer " + bot_token} requests.post("https://slack.com/api/chat.postMessage", params=params, headers=headers) + @tasks_bp.route('', methods=['POST']) def create_task(): request_body = request.get_json() @@ -51,7 +63,7 @@ def create_task(): "details" : "Invalid data" }, 400 - new_task = Task ( + new_task = Task( description = request_body['description'], title = request_body['title'] ) @@ -62,7 +74,7 @@ def create_task(): db.session.add(new_task) db.session.commit() - return format_as_dict(new_task), 201 + return format_task(new_task), 201 @tasks_bp.route('', methods=['GET']) @@ -93,7 +105,7 @@ def get_one_task(task_id): task = validate_task(task_id) if isinstance(task, Task): - return format_as_dict(task), 200 + return format_task(task), 200 return task @@ -110,7 +122,7 @@ def update_task(task_id): if "completed_at" in request_body: task.completed_at = request_body['completed_at'] - return format_as_dict(task), 200 + return format_task(task), 200 return task @tasks_bp.route('/', methods=['DELETE']) @@ -133,7 +145,7 @@ def mark_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() push_complete_to_slack(task) - return format_as_dict(task), 200 + return format_task(task), 200 return task @tasks_bp.route('//mark_incomplete', methods=['PATCH']) @@ -143,6 +155,37 @@ def mark_incomplete(task_id): if isinstance(task, Task): task.completed_at = None db.session.commit() - return format_as_dict(task), 200 + return format_task(task), 200 return task +@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'] + ) + + db.session.add(new_goal) + db.session.commit() + + return format_goal(new_goal), 201 + +@goals_bp.route('', methods=['GET']) +def get_goals(): + goals = Goal.query.order_by(asc(Goal.title)).all() + goals_response = [] + + for goal in goals: + goals_response.append( + { + "id" : goal.goal_id, + "title" : goal.title + } + ) + return jsonify(goals_response), 200 \ No newline at end of file diff --git a/migrations/versions/4154fa388b17_.py b/migrations/versions/4154fa388b17_.py new file mode 100644 index 000000000..dcdaf0106 --- /dev/null +++ b/migrations/versions/4154fa388b17_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 4154fa388b17 +Revises: a6af0dd79516 +Create Date: 2022-05-10 16:40:09.928791 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4154fa388b17' +down_revision = 'a6af0dd79516' +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..39db3b8c6 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +12,6 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -61,7 +60,6 @@ def test_get_goal_not_found(client): # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ From 2b4fef247021695b9db6470e4c88942b7e96cb85 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Tue, 10 May 2022 17:07:12 -0700 Subject: [PATCH 19/31] added get_one_goal route, validate_goal helper --- app/routes.py | 22 +++++++++++++++++++++- tests/test_wave_05.py | 13 +++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/routes.py b/app/routes.py index 666fdb0ef..2499bfe97 100644 --- a/app/routes.py +++ b/app/routes.py @@ -23,6 +23,18 @@ def validate_task(task_id): return jsonify({"message" : f"Could not find '{task_id}'"}), 404 return task +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except ValueError: + return jsonify({"msg" : f"'{goal_id}' is invalid"}), 400 + + goal = Goal.query.get(goal_id) + if not goal: + return jsonify({"message" : f"Could not find '{goal_id}'"}), 404 + return goal + + def format_task(task): response = { "task" : @@ -188,4 +200,12 @@ def get_goals(): "title" : goal.title } ) - return jsonify(goals_response), 200 \ No newline at end of file + return jsonify(goals_response), 200 + +@goals_bp.route('/', methods=['GET']) +def get_one_goal(goal_id): + goal = validate_goal(goal_id) + + if isinstance(goal, Goal): + return format_goal(goal), 200 + return goal \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 39db3b8c6..71043a1a2 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,4 +1,5 @@ import pytest +from app.models.goal import Goal @@ -28,7 +29,6 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -45,19 +45,16 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") - # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + #Assert + assert response.status_code == 404 + assert response_body == {"message" : f"Could not find '1'"} + assert Goal.query.all() == [] def test_create_goal(client): From 623514d7f99db7615d471e0e25adff7a3c2d13ee Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Tue, 10 May 2022 17:25:07 -0700 Subject: [PATCH 20/31] added update_goal route, completed related tests --- app/routes.py | 19 ++++++++++++++++--- tests/test_wave_01.py | 2 +- tests/test_wave_05.py | 38 +++++++++++++++++++++++--------------- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/app/routes.py b/app/routes.py index 2499bfe97..881f34597 100644 --- a/app/routes.py +++ b/app/routes.py @@ -36,7 +36,7 @@ def validate_goal(goal_id): def format_task(task): - response = { + return { "task" : { "is_complete" : bool(task.completed_at), @@ -45,7 +45,7 @@ def format_task(task): "id" : task.task_id } } - return response + def format_goal(goal): return { @@ -208,4 +208,17 @@ def get_one_goal(goal_id): if isinstance(goal, Goal): return format_goal(goal), 200 - return goal \ No newline at end of file + return goal + +@goals_bp.route('/', methods=['PUT']) +def update_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + + if isinstance(goal, Goal): + goal.title = request_body["title"] + db.session.commit() + + return format_goal(goal), 200 + return goal + diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index a2118501c..3c1d7cfd0 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -166,7 +166,6 @@ def test_create_task_must_contain_title(client): assert Task.query.all() == [] - def test_create_task_must_contain_description(client): # Act response = client.post("/tasks", json={ @@ -181,3 +180,4 @@ def test_create_task_must_contain_description(client): "details": "Invalid data" } assert Task.query.all() == [] + diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 71043a1a2..a4b531335 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -75,31 +75,39 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title" : "Updated Goal Title" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title", + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" + -@pytest.mark.skip(reason="test to be completed by student") 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 - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message" : f"Could not find '1'"} + assert Goal.query.all() == [] @pytest.mark.skip(reason="No way to test this feature yet") From 0ca6a41fb97dd5ad14d0c57948972e0e1e3bfd26 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 12 May 2022 10:41:59 -0700 Subject: [PATCH 21/31] created delete_goal route --- app/routes.py | 10 ++++++++++ tests/test_wave_05.py | 23 +++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/routes.py b/app/routes.py index 881f34597..84a6a6c10 100644 --- a/app/routes.py +++ b/app/routes.py @@ -222,3 +222,13 @@ def update_goal(goal_id): return format_goal(goal), 200 return goal +@goals_bp.route('/', methods=['DELETE']) +def delete_goal(goal_id): + goal = validate_goal(goal_id) + if isinstance(goal, Goal): + db.session.delete(goal) + db.session.commit() + return { + "details" : f'Goal {goal_id} "{goal.title}" successfully deleted' + } + return goal diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index a4b531335..123f04e6c 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -110,7 +110,6 @@ def test_update_goal_not_found(client): assert Goal.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -126,28 +125,20 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + assert Goal.query.get(1) == None - 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") def test_delete_goal_not_found(client): - raise Exception("Complete test") - - # Act - # ---- Complete Act Here ---- + # Act + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message" : f"Could not find '1'"} + assert Goal.query.all() == [] -@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 f9b0feacff4084fa3fe3a11bc171af7f0754d6ea Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 12 May 2022 10:53:36 -0700 Subject: [PATCH 22/31] created model between task and goal --- app/models/goal.py | 1 + app/models/task.py | 2 ++ app/routes.py | 2 ++ 3 files changed, 5 insertions(+) diff --git a/app/models/goal.py b/app/models/goal.py index de44a76f3..1924d1f44 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,4 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) + tasks = db.relationship("Task", back_populates="goal", lazy=True) diff --git a/app/models/task.py b/app/models/task.py index 569493509..ca5572cc9 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,3 +6,5 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) + goal = db.relationship("Goal", back_populates="tasks") diff --git a/app/routes.py b/app/routes.py index 84a6a6c10..a9bc03c6c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -232,3 +232,5 @@ def delete_goal(goal_id): "details" : f'Goal {goal_id} "{goal.title}" successfully deleted' } return goal + + From 7d165490a68e940899cbba30ac97005df06f18de Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 12 May 2022 11:42:17 -0700 Subject: [PATCH 23/31] created assign_task_to_goal route --- app/routes.py | 16 ++++++++++++++++ tests/test_wave_06.py | 3 +-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index a9bc03c6c..c919a1cff 100644 --- a/app/routes.py +++ b/app/routes.py @@ -233,4 +233,20 @@ def delete_goal(goal_id): } return goal +@goals_bp.route('/tasks', methods=['POST']) +def assign_task_to_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + tasks = [] + for task_id in request_body['task_ids']: + task = validate_task(task_id) + task.goal_id = goal_id + tasks.append(task.task_id) + db.session.commit() + + return { + "id" : goal.goal_id, + "task_ids" : tasks + } + diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..be4db0b2d 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") + def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,6 @@ 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") 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={ From 5ce2e7d4519bf47fb7f1536965e1816a44f61e6a Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 12 May 2022 12:08:09 -0700 Subject: [PATCH 24/31] updated get_tasks_of_goal to account for missing goal, added asserts to wave 01 and 03 to account for new goal_id attribute --- app/routes.py | 51 +++++++++++++++++++++++++++++++++---------- tests/test_wave_01.py | 9 +++++--- tests/test_wave_03.py | 18 ++++++++++----- tests/test_wave_06.py | 12 ++-------- 4 files changed, 59 insertions(+), 31 deletions(-) diff --git a/app/routes.py b/app/routes.py index c919a1cff..dc483f3a9 100644 --- a/app/routes.py +++ b/app/routes.py @@ -42,7 +42,8 @@ def format_task(task): "is_complete" : bool(task.completed_at), "description" : task.description, "title" : task.title, - "id" : task.task_id + "id" : task.task_id, + "goal_id" : task.goal_id } } @@ -233,20 +234,46 @@ def delete_goal(goal_id): } return goal -@goals_bp.route('/tasks', methods=['POST']) +@goals_bp.route('//tasks', methods=['POST']) def assign_task_to_goal(goal_id): goal = validate_goal(goal_id) request_body = request.get_json() - tasks = [] - for task_id in request_body['task_ids']: - task = validate_task(task_id) - task.goal_id = goal_id - tasks.append(task.task_id) - db.session.commit() + if isinstance(goal, Goal): + tasks = [] + for task_id in request_body['task_ids']: + task = validate_task(task_id) + task.goal_id = goal_id + tasks.append(task.task_id) + db.session.commit() + + return { + "id" : goal.goal_id, + "task_ids" : tasks + } + return goal + +@goals_bp.route('//tasks', methods=['GET']) +def get_tasks_of_goal(goal_id): + goal = validate_goal(goal_id) + + if isinstance(goal, Goal): + tasks = [] + for task in goal.tasks: + tasks.append({ + "id" : task.task_id, + "goal_id" : task.goal_id, + "title" : task.title, + "description" : task.description, + "is_complete" : bool(task.completed_at) + }) + + return { + "id" : goal.goal_id, + "title" : goal.title, + "tasks" : tasks + } + return goal + - return { - "id" : goal.goal_id, - "task_ids" : tasks - } diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 3c1d7cfd0..9b8a555a8 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -43,7 +43,8 @@ def test_get_task(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, + "goal_id" : None } } @@ -75,7 +76,8 @@ def test_create_task(client): "id": 1, "title": "A Brand New Task", "description": "Test Description", - "is_complete": False + "is_complete": False, + "goal_id" : None } } new_task = Task.query.get(1) @@ -101,7 +103,8 @@ def test_update_task(client, one_task): "id": 1, "title": "Updated Task Title", "description": "Updated Test Description", - "is_complete": False + "is_complete": False, + "goal_id" : None } } task = Task.query.get(1) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index fd20d979c..5f55e66fc 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -35,7 +35,8 @@ def test_mark_complete_on_incomplete_task(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": True + "is_complete": True, + "goal_id" : None } } assert Task.query.get(1).completed_at @@ -55,7 +56,8 @@ def test_mark_incomplete_on_complete_task(client, completed_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, + "goal_id" : None } } assert Task.query.get(1).completed_at == None @@ -92,7 +94,8 @@ def test_mark_complete_on_completed_task(client, completed_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": True + "is_complete": True, + "goal_id" : None } } assert Task.query.get(1).completed_at @@ -111,7 +114,8 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, + "goal_id" : None } } assert Task.query.get(1).completed_at == None @@ -157,7 +161,8 @@ def test_create_task_with_valid_completed_at(client): "id": 1, "title": "A Brand New Task", "description": "Test Description", - "is_complete": True + "is_complete": True, + "goal_id" : None } } new_task = Task.query.get(1) @@ -184,7 +189,8 @@ def test_update_task_with_completed_at_date(client, completed_task): "id": 1, "title": "Updated Task Title", "description": "Updated Test Description", - "is_complete": True + "is_complete": True, + "goal_id" : None } } task = Task.query.get(1) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index be4db0b2d..ae79e0013 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -41,7 +41,6 @@ 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") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -49,14 +48,10 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message" : f"Could not find '1'"} + assert Goal.query.all() == [] - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -73,7 +68,6 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -97,8 +91,6 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): ] } - -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From 27a54a3d8e473471758a9025c3c1c53bfc558b78 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 12 May 2022 13:01:17 -0700 Subject: [PATCH 25/31] separated goal and task route files --- app/__init__.py | 8 +- app/goal_routes.py | 130 +++++++++++++++++++++++++++++ app/{routes.py => task_routes.py} | 132 +----------------------------- requirements.txt | 36 -------- 4 files changed, 133 insertions(+), 173 deletions(-) create mode 100644 app/goal_routes.py rename app/{routes.py => task_routes.py} (55%) delete mode 100644 requirements.txt diff --git a/app/__init__.py b/app/__init__.py index 51c76180a..d86c78234 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,15 +4,11 @@ import os from dotenv import load_dotenv - - - db = SQLAlchemy() migrate = Migrate() load_dotenv() - def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False @@ -34,10 +30,10 @@ def create_app(test_config=None): # Register blueprints - from .routes import tasks_bp + from .task_routes import tasks_bp app.register_blueprint(tasks_bp) - from .routes import goals_bp + from .goal_routes import goals_bp app.register_blueprint(goals_bp) return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..4a4d6c13a --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,130 @@ +from flask import Blueprint, jsonify, request +from app import db +from app.models.goal import Goal +from sqlalchemy import asc +from app.task_routes import validate_task + +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except ValueError: + return jsonify({"msg" : f"'{goal_id}' is invalid"}), 400 + + goal = Goal.query.get(goal_id) + if not goal: + return jsonify({"message" : f"Could not find '{goal_id}'"}), 404 + return goal + +def format_goal(goal): + return { + "goal": { + "id" : goal.goal_id, + "title" : goal.title + } + } + +@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'] + ) + + db.session.add(new_goal) + db.session.commit() + + return format_goal(new_goal), 201 + +@goals_bp.route('', methods=['GET']) +def get_goals(): + goals = Goal.query.order_by(asc(Goal.title)).all() + goals_response = [] + + for goal in goals: + goals_response.append( + { + "id" : goal.goal_id, + "title" : goal.title + } + ) + return jsonify(goals_response), 200 + +@goals_bp.route('/', methods=['GET']) +def get_one_goal(goal_id): + goal = validate_goal(goal_id) + + if isinstance(goal, Goal): + return format_goal(goal), 200 + return goal + +@goals_bp.route('/', methods=['PUT']) +def update_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + + if isinstance(goal, Goal): + goal.title = request_body["title"] + db.session.commit() + + return format_goal(goal), 200 + return goal + +@goals_bp.route('/', methods=['DELETE']) +def delete_goal(goal_id): + goal = validate_goal(goal_id) + if isinstance(goal, Goal): + db.session.delete(goal) + db.session.commit() + return { + "details" : f'Goal {goal_id} "{goal.title}" successfully deleted' + } + return goal + +@goals_bp.route('//tasks', methods=['POST']) +def assign_task_to_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + + if isinstance(goal, Goal): + tasks = [] + for task_id in request_body['task_ids']: + task = validate_task(task_id) + task.goal_id = goal_id + tasks.append(task.task_id) + db.session.commit() + + return { + "id" : goal.goal_id, + "task_ids" : tasks + } + return goal + +@goals_bp.route('//tasks', methods=['GET']) +def get_tasks_of_goal(goal_id): + goal = validate_goal(goal_id) + + if isinstance(goal, Goal): + tasks = [] + for task in goal.tasks: + tasks.append({ + "id" : task.task_id, + "goal_id" : task.goal_id, + "title" : task.title, + "description" : task.description, + "is_complete" : bool(task.completed_at) + }) + + return { + "id" : goal.goal_id, + "title" : goal.title, + "tasks" : tasks + } + return goal \ No newline at end of file diff --git a/app/routes.py b/app/task_routes.py similarity index 55% rename from app/routes.py rename to app/task_routes.py index dc483f3a9..246aa9c4e 100644 --- a/app/routes.py +++ b/app/task_routes.py @@ -7,10 +7,8 @@ import requests import os - - tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") -goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + def validate_task(task_id): try: @@ -23,18 +21,6 @@ def validate_task(task_id): return jsonify({"message" : f"Could not find '{task_id}'"}), 404 return task -def validate_goal(goal_id): - try: - goal_id = int(goal_id) - except ValueError: - return jsonify({"msg" : f"'{goal_id}' is invalid"}), 400 - - goal = Goal.query.get(goal_id) - if not goal: - return jsonify({"message" : f"Could not find '{goal_id}'"}), 404 - return goal - - def format_task(task): return { "task" : @@ -47,16 +33,6 @@ def format_task(task): } } - -def format_goal(goal): - return { - "goal": { - "id" : goal.goal_id, - "title" : goal.title - } - } - - def push_complete_to_slack(task): bot_token = os.environ.get("SLACK_BOT_TOKEN") params = { @@ -66,7 +42,6 @@ def push_complete_to_slack(task): headers = {"authorization" : "Bearer " + bot_token} requests.post("https://slack.com/api/chat.postMessage", params=params, headers=headers) - @tasks_bp.route('', methods=['POST']) def create_task(): request_body = request.get_json() @@ -89,7 +64,6 @@ def create_task(): return format_task(new_task), 201 - @tasks_bp.route('', methods=['GET']) def get_tasks(): sort_query = request.args.get("sort") @@ -112,7 +86,6 @@ def get_tasks(): return jsonify(tasks_response), 200 - @tasks_bp.route('/', methods=['GET']) def get_one_task(task_id): task = validate_task(task_id) @@ -121,7 +94,6 @@ def get_one_task(task_id): return format_task(task), 200 return task - @tasks_bp.route('/', methods=['PUT']) def update_task(task_id): task = validate_task(task_id) @@ -171,109 +143,7 @@ def mark_incomplete(task_id): return format_task(task), 200 return task -@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'] - ) - - db.session.add(new_goal) - db.session.commit() - - return format_goal(new_goal), 201 -@goals_bp.route('', methods=['GET']) -def get_goals(): - goals = Goal.query.order_by(asc(Goal.title)).all() - goals_response = [] - - for goal in goals: - goals_response.append( - { - "id" : goal.goal_id, - "title" : goal.title - } - ) - return jsonify(goals_response), 200 - -@goals_bp.route('/', methods=['GET']) -def get_one_goal(goal_id): - goal = validate_goal(goal_id) - - if isinstance(goal, Goal): - return format_goal(goal), 200 - return goal - -@goals_bp.route('/', methods=['PUT']) -def update_goal(goal_id): - goal = validate_goal(goal_id) - request_body = request.get_json() - - if isinstance(goal, Goal): - goal.title = request_body["title"] - db.session.commit() - - return format_goal(goal), 200 - return goal - -@goals_bp.route('/', methods=['DELETE']) -def delete_goal(goal_id): - goal = validate_goal(goal_id) - if isinstance(goal, Goal): - db.session.delete(goal) - db.session.commit() - return { - "details" : f'Goal {goal_id} "{goal.title}" successfully deleted' - } - return goal - -@goals_bp.route('//tasks', methods=['POST']) -def assign_task_to_goal(goal_id): - goal = validate_goal(goal_id) - request_body = request.get_json() - - if isinstance(goal, Goal): - tasks = [] - for task_id in request_body['task_ids']: - task = validate_task(task_id) - task.goal_id = goal_id - tasks.append(task.task_id) - db.session.commit() - - return { - "id" : goal.goal_id, - "task_ids" : tasks - } - return goal - -@goals_bp.route('//tasks', methods=['GET']) -def get_tasks_of_goal(goal_id): - goal = validate_goal(goal_id) - - if isinstance(goal, Goal): - tasks = [] - for task in goal.tasks: - tasks.append({ - "id" : task.task_id, - "goal_id" : task.goal_id, - "title" : task.title, - "description" : task.description, - "is_complete" : bool(task.completed_at) - }) - - return { - "id" : goal.goal_id, - "title" : goal.title, - "tasks" : tasks - } - return goal diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 52f18dc93..000000000 --- a/requirements.txt +++ /dev/null @@ -1,36 +0,0 @@ -alembic==1.5.4 -attrs==20.3.0 -autopep8==1.5.5 -blinker==1.4 -certifi==2020.12.5 -chardet==4.0.0 -click==7.1.2 -Flask==1.1.2 -Flask-Migrate==2.6.0 -Flask-SQLAlchemy==2.4.4 -gunicorn==20.1.0 -idna==2.10 -iniconfig==1.1.1 -itsdangerous==1.1.0 -Jinja2==2.11.3 -Mako==1.1.4 -MarkupSafe==1.1.1 -packaging==20.9 -pluggy==0.13.1 -psycopg2-binary==2.8.6 -py==1.10.0 -pycodestyle==2.6.0 -pyparsing==2.4.7 -pytest==6.2.3 -pytest-cov==2.12.1 -python-dateutil==2.8.1 -python-dotenv==0.15.0 -python-editor==1.0.4 -requests==2.25.1 -six==1.15.0 -SQLAlchemy==1.3.23 -toml==0.10.2 -urllib3==1.26.5 -Werkzeug==1.0.1 - - From ecdb5ac9d85cf45dc1570f5d88f7548e2131bf53 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Thu, 12 May 2022 13:02:19 -0700 Subject: [PATCH 26/31] removed unused import --- app/task_routes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/task_routes.py b/app/task_routes.py index 246aa9c4e..1e2d22598 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -1,7 +1,6 @@ from flask import Blueprint, jsonify, request from app import db from app.models.task import Task -from app.models.goal import Goal from sqlalchemy import desc, asc from datetime import datetime import requests From 8cbfd0293feb7caf9a02b28ff9edcbbaa4e67f6c Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 13 May 2022 09:07:08 -0700 Subject: [PATCH 27/31] updated requirements --- requirements.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..4e3b88829 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,36 @@ +alembic==1.5.4 +attrs==20.3.0 +autopep8==1.5.5 +blinker==1.4 +certifi==2020.12.5 +chardet==4.0.0 +click==7.1.2 +coverage==6.3.2 +Flask==1.1.2 +Flask-Migrate==2.6.0 +Flask-SQLAlchemy==2.4.4 +gunicorn==20.1.0 +idna==2.10 +iniconfig==1.1.1 +itsdangerous==1.1.0 +Jinja2==2.11.3 +Mako==1.1.4 +MarkupSafe==1.1.1 +packaging==20.9 +pluggy==0.13.1 +psycopg2-binary==2.8.6 +py==1.10.0 +pycodestyle==2.6.0 +pyparsing==2.4.7 +pytest==6.2.3 +pytest-cov==2.12.1 +python-dateutil==2.8.1 +python-dotenv==0.15.0 +python-editor==1.0.4 +requests==2.25.1 +six==1.15.0 +slack-sdk==3.16.1 +SQLAlchemy==1.3.23 +toml==0.10.2 +urllib3==1.26.5 +Werkzeug==1.0.1 From 9229915bfa1b5fa8ae862935cb40fd4b55b49e94 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 13 May 2022 09:08:19 -0700 Subject: [PATCH 28/31] added Procfile for Heroku --- 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 dfa21d10007b9b1c6117788082636fb3f65c7dc5 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 13 May 2022 09:47:09 -0700 Subject: [PATCH 29/31] fixed migrations --- migrations/versions/4154fa388b17_.py | 28 ------------------- .../{a6af0dd79516_.py => 5255467e7176_.py} | 9 ++++-- 2 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 migrations/versions/4154fa388b17_.py rename migrations/versions/{a6af0dd79516_.py => 5255467e7176_.py} (77%) diff --git a/migrations/versions/4154fa388b17_.py b/migrations/versions/4154fa388b17_.py deleted file mode 100644 index dcdaf0106..000000000 --- a/migrations/versions/4154fa388b17_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: 4154fa388b17 -Revises: a6af0dd79516 -Create Date: 2022-05-10 16:40:09.928791 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '4154fa388b17' -down_revision = 'a6af0dd79516' -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/a6af0dd79516_.py b/migrations/versions/5255467e7176_.py similarity index 77% rename from migrations/versions/a6af0dd79516_.py rename to migrations/versions/5255467e7176_.py index 95d84865f..a6158edc6 100644 --- a/migrations/versions/a6af0dd79516_.py +++ b/migrations/versions/5255467e7176_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: a6af0dd79516 +Revision ID: 5255467e7176 Revises: -Create Date: 2022-05-05 13:35:47.629690 +Create Date: 2022-05-13 09:36:55.785523 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'a6af0dd79516' +revision = '5255467e7176' down_revision = None branch_labels = None depends_on = None @@ -20,6 +20,7 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.create_table('goal', sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), sa.PrimaryKeyConstraint('goal_id') ) op.create_table('task', @@ -27,6 +28,8 @@ def upgrade(): sa.Column('title', sa.String(), nullable=True), sa.Column('description', sa.String(), nullable=True), sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ), sa.PrimaryKeyConstraint('task_id') ) # ### end Alembic commands ### From c7f02258704301c606a131668f786c8936941bd9 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 13 May 2022 10:10:13 -0700 Subject: [PATCH 30/31] updated migrations --- migrations/versions/5255467e7176_.py | 42 ---------------------------- 1 file changed, 42 deletions(-) delete mode 100644 migrations/versions/5255467e7176_.py diff --git a/migrations/versions/5255467e7176_.py b/migrations/versions/5255467e7176_.py deleted file mode 100644 index a6158edc6..000000000 --- a/migrations/versions/5255467e7176_.py +++ /dev/null @@ -1,42 +0,0 @@ -"""empty message - -Revision ID: 5255467e7176 -Revises: -Create Date: 2022-05-13 09:36:55.785523 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '5255467e7176' -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.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('title', sa.String(), nullable=True), - sa.Column('description', sa.String(), nullable=True), - sa.Column('completed_at', sa.DateTime(), nullable=True), - sa.Column('goal_id', sa.Integer(), 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 ### From 511cf1413125ad1ab7c3ac746ac2723732f7db19 Mon Sep 17 00:00:00 2001 From: Alexa Coffman Date: Fri, 13 May 2022 10:39:33 -0700 Subject: [PATCH 31/31] fixed migrations AGAIN --- migrations/versions/0335b9a4e231_.py | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 migrations/versions/0335b9a4e231_.py diff --git a/migrations/versions/0335b9a4e231_.py b/migrations/versions/0335b9a4e231_.py new file mode 100644 index 000000000..f0534cc9d --- /dev/null +++ b/migrations/versions/0335b9a4e231_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 0335b9a4e231 +Revises: +Create Date: 2022-05-13 10:39:10.213626 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0335b9a4e231' +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.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('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), 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 ###