From a2cf3fc1cdbc5f9b8736e758a579bf97084fe410 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 15:14:54 -0700 Subject: [PATCH 01/18] initial set up and working get,post for a single task --- app/__init__.py | 2 + app/models/task.py | 5 +- app/routes.py | 36 ++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/3fa3879e3bef_.py | 39 +++++++++++ 8 files changed, 246 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/3fa3879e3bef_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..9ae36e3d6 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -29,6 +29,8 @@ def create_app(test_config=None): db.init_app(app) migrate.init_app(app, db) + from .routes import tasks_bp # Register Blueprints here + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..8bf3e9734 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,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 8e9dfe684..6059ea27a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,36 @@ -from flask import Blueprint +from flask.json import jsonify +from app import db +from app.models.task import Task +from flask import request, Blueprint, make_response, jsonify +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["GET","POST"]) +def handle_tasks(): + if request.method == "POST": + 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 jsonify(f"Task {new_task.title} successfully created"), 201 + + elif request.method == "GET": + title_query = request.args.get("title") + if title_query: + tasks = Task.query.filter_by(title=title_query) + else: + tasks = Task.query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append({ + "task_id": task.task_id, + "title": task.title, + "description": task.description, + "completed_at": task.completed_at + }) + return jsonify(tasks_response) \ 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/3fa3879e3bef_.py b/migrations/versions/3fa3879e3bef_.py new file mode 100644 index 000000000..dd8e45c55 --- /dev/null +++ b/migrations/versions/3fa3879e3bef_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 3fa3879e3bef +Revises: +Create Date: 2021-06-09 14:08:06.995630 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3fa3879e3bef' +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 37f607047545cbfe327317ea20fe3cab6d2c6077 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 15:22:58 -0700 Subject: [PATCH 02/18] remove unasked for filtering on title in routes --- app/routes.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6059ea27a..a83973714 100644 --- a/app/routes.py +++ b/app/routes.py @@ -19,12 +19,7 @@ def handle_tasks(): return jsonify(f"Task {new_task.title} successfully created"), 201 elif request.method == "GET": - title_query = request.args.get("title") - if title_query: - tasks = Task.query.filter_by(title=title_query) - else: - tasks = Task.query.all() - + tasks = Task.query.all() tasks_response = [] for task in tasks: tasks_response.append({ From 7d6f0f46718f99ac9b16a5248aab65b54bded942 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 15:23:48 -0700 Subject: [PATCH 03/18] add endpoints for updating, deleting, and getting a single task --- app/routes.py | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index a83973714..0e3dd893c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -28,4 +28,31 @@ def handle_tasks(): "description": task.description, "completed_at": task.completed_at }) - return jsonify(tasks_response) \ No newline at end of file + return jsonify(tasks_response) + +@tasks_bp.route("/", methods=["GET","PUT","DELETE"]) +def handle_task(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + if request.method == "GET": + return { + "task_id": task.task_id, + "title": task.title, + "description": task.description, + "completed_at": task.completed_at + } + + elif request.method == "PUT": + form_data = request.get_json() + task.title = form_data["title"] + task.description = form_data["description"] + task.completed_at = form_data["completed_at"] + db.session.commit() + return make_response(f"Task #{task.task_id} successfully updated") + + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + return make_response(f"Task #{task.task_id} successfully deleted.") From a4f161feed038fb056de8138b8e0ae4eb5d3f3c7 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 19:50:54 -0700 Subject: [PATCH 04/18] first seven tests in wave 1 passing --- app/routes.py | 55 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0e3dd893c..1987747e9 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,19 +16,34 @@ def handle_tasks(): ) db.session.add(new_task) db.session.commit() - return jsonify(f"Task {new_task.title} successfully created"), 201 + if new_task.completed_at == None: + completed_at = False + else: + completed_at = True + return make_response({ + "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": completed_at + } + }, 201) elif request.method == "GET": tasks = Task.query.all() tasks_response = [] for task in tasks: + if task.completed_at == None: + completed_at = False + else: + completed_at = True tasks_response.append({ - "task_id": task.task_id, + "id": task.task_id, "title": task.title, "description": task.description, - "completed_at": task.completed_at + "is_complete": completed_at }) - return jsonify(tasks_response) + return make_response(jsonify(tasks_response)) @tasks_bp.route("/", methods=["GET","PUT","DELETE"]) def handle_task(task_id): @@ -37,20 +52,38 @@ def handle_task(task_id): return make_response("", 404) if request.method == "GET": - return { - "task_id": task.task_id, - "title": task.title, - "description": task.description, - "completed_at": task.completed_at - } + if task.completed_at == None: + completed_at = False + else: + completed_at = True + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } + }) elif request.method == "PUT": form_data = request.get_json() + if ("completed_at" not in form_data or form_data["completed_at"] == None): + is_complete = False + else: + is_complete = True task.title = form_data["title"] task.description = form_data["description"] task.completed_at = form_data["completed_at"] db.session.commit() - return make_response(f"Task #{task.task_id} successfully updated") + response_task = { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": is_complete + } + } + return make_response(response_task, 200) elif request.method == "DELETE": db.session.delete(task) From 559a4418786737c2703b1f723bc560fc37112bde Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 20:09:04 -0700 Subject: [PATCH 05/18] complete wave 1 tests. added invalid logic --- app/routes.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 1987747e9..4b43202a0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -9,6 +9,10 @@ def handle_tasks(): if request.method == "POST": request_body = request.get_json() + if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: + return { + "details": f"Invalid data" + }, 400 new_task = Task( title=request_body["title"], description=request_body["description"], @@ -88,4 +92,13 @@ def handle_task(task_id): elif request.method == "DELETE": db.session.delete(task) db.session.commit() - return make_response(f"Task #{task.task_id} successfully deleted.") + if task.completed_at == None: + completed_at = False + else: + completed_at = True + return make_response( + { + "details": + f"Task {task.task_id} \"{task.title}\" successfully deleted" + } + ) From 013a7b93147ca7a863c71f8b079ccac10906fe77 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 20:23:27 -0700 Subject: [PATCH 06/18] Wave 2 complete. Add title sorting for asc and desc --- app/routes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 4b43202a0..5493ab2f2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -34,7 +34,14 @@ def handle_tasks(): }, 201) elif request.method == "GET": - tasks = Task.query.all() + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(Task.title).all() + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.all() + tasks_response = [] for task in tasks: if task.completed_at == None: From f2a5b68a4b427f3ba2c99b348c4c8d82cbcce328 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 20:47:24 -0700 Subject: [PATCH 07/18] add mark_complete endpoint --- app/routes.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/routes.py b/app/routes.py index 5493ab2f2..5a5758475 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app import db from app.models.task import Task from flask import request, Blueprint, make_response, jsonify +from datetime import date, datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -109,3 +110,21 @@ def handle_task(task_id): f"Task {task.task_id} \"{task.title}\" successfully deleted" } ) +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete(task_id): + task = Task.query.get(task_id) + + if task == None: + return make_response("Task {task_id} not found", 404) + + task.completed_at = datetime.now() + db.session.commit() + + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True + } + }, 200 From 242262f979bc0173af1d36cfbaae4889c568a3aa Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 21:16:47 -0700 Subject: [PATCH 08/18] create and test mark incomplete task endpoint.End of wave3 --- app/routes.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 5a5758475..1688a8f46 100644 --- a/app/routes.py +++ b/app/routes.py @@ -117,7 +117,7 @@ def mark_complete(task_id): if task == None: return make_response("Task {task_id} not found", 404) - task.completed_at = datetime.now() + task.completed_at = datetime.utcnow() db.session.commit() return { @@ -128,3 +128,21 @@ def mark_complete(task_id): "is_complete": True } }, 200 + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + task = Task.query.get(task_id) + + if task == None: + return make_response("Task {taske_id} not found", 404) + task.completed_at = None + + db.session.commit() + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + }, 200 \ No newline at end of file From 636204e5e6f41637795ce39b8ccb8af8a3c15d75 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 22:53:54 -0700 Subject: [PATCH 09/18] hook up slack bot to notify channel when task is complete --- app/routes.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/routes.py b/app/routes.py index 1688a8f46..bcc6f8178 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,7 +3,11 @@ from app.models.task import Task from flask import request, Blueprint, make_response, jsonify from datetime import date, datetime +from dotenv import load_dotenv +import requests +import os +load_dotenv() tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @tasks_bp.route("", methods=["GET","POST"]) @@ -119,6 +123,14 @@ def mark_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() + slack_token = os.environ.get("SLACK_BOT_TOKEN") + slack_path = "https://slack.com/api/chat.postMessage" + query_params = { + "channel": "task-notifications", + "text": f"A human just completed the following Task: {task.title}", + } + headers = {"Authorization": f"Bearer {slack_token}"} + requests.post(slack_path, params = query_params, headers = headers) return { "task": { From ab6d94305f80621221e3830aab3e0e71007943fd Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 23:28:02 -0700 Subject: [PATCH 10/18] add new migrations --- migrations/versions/422c9d9ef6f1_.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 migrations/versions/422c9d9ef6f1_.py diff --git a/migrations/versions/422c9d9ef6f1_.py b/migrations/versions/422c9d9ef6f1_.py new file mode 100644 index 000000000..7be7b867d --- /dev/null +++ b/migrations/versions/422c9d9ef6f1_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 422c9d9ef6f1 +Revises: 3fa3879e3bef +Create Date: 2021-06-09 23:09:36.907328 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '422c9d9ef6f1' +down_revision = '3fa3879e3bef' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### From 4335b1d9f97be68b4c8ea4a4d667013a3733b235 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 23:31:36 -0700 Subject: [PATCH 11/18] add goal model, and post goal endpoint --- app/__init__.py | 2 ++ app/models/goal.py | 1 + app/routes.py | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 9ae36e3d6..25d66a016 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,9 @@ def create_app(test_config=None): migrate.init_app(app, db) from .routes import tasks_bp + from .routes import goals_bp # Register Blueprints here app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..0bdc1731d 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) diff --git a/app/routes.py b/app/routes.py index bcc6f8178..3fa9070b1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from flask.json import jsonify from app import db from app.models.task import Task +from app.models.goal import Goal from flask import request, Blueprint, make_response, jsonify from datetime import date, datetime from dotenv import load_dotenv @@ -9,6 +10,7 @@ load_dotenv() tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint('goals', __name__, url_prefix="/goals") @tasks_bp.route("", methods=["GET","POST"]) def handle_tasks(): @@ -157,4 +159,20 @@ def mark_incomplete(task_id): "description": task.description, "is_complete": False } - }, 200 \ No newline at end of file + }, 200 + +@goals_bp.route("", methods=["POST"]) +def handle_goals(): + if request.method == "POST": + request_body = request.get_json() + new_goal = Goal(title=request_body["title"]) + db.session.add(new_goal) + db.session.commit() + + return make_response({ + "goal": { + "id": new_goal.goal_id, + "title": new_goal.title + + } + }, 201) \ No newline at end of file From c878fa3f94e84ffbf2dbd4a85a204af3ee998170 Mon Sep 17 00:00:00 2001 From: trish Date: Wed, 9 Jun 2021 23:32:06 -0700 Subject: [PATCH 12/18] Use required string for slack task notifications --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 3fa9070b1..cf5e651f9 100644 --- a/app/routes.py +++ b/app/routes.py @@ -129,7 +129,7 @@ def mark_complete(task_id): slack_path = "https://slack.com/api/chat.postMessage" query_params = { "channel": "task-notifications", - "text": f"A human just completed the following Task: {task.title}", + "text": f"Someone just completed the {task.title}", } headers = {"Authorization": f"Bearer {slack_token}"} requests.post(slack_path, params = query_params, headers = headers) From 78ba05c3750e8f8f7651c5c9289b6e572d981ceb Mon Sep 17 00:00:00 2001 From: trish Date: Thu, 10 Jun 2021 10:42:33 -0700 Subject: [PATCH 13/18] complete wave 5, crud for goals --- app/routes.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index cf5e651f9..71303eaa3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -116,6 +116,7 @@ def handle_task(task_id): f"Task {task.task_id} \"{task.title}\" successfully deleted" } ) + @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_complete(task_id): task = Task.query.get(task_id) @@ -161,10 +162,14 @@ def mark_incomplete(task_id): } }, 200 -@goals_bp.route("", methods=["POST"]) +@goals_bp.route("", methods=["POST", "GET"]) def handle_goals(): if request.method == "POST": request_body = request.get_json() + if "title" not in request_body: + return { + "details": f"Invalid data" + },400 new_goal = Goal(title=request_body["title"]) db.session.add(new_goal) db.session.commit() @@ -175,4 +180,48 @@ def handle_goals(): "title": new_goal.title } - }, 201) \ No newline at end of file + }, 201) + if request.method == "GET": + goals = Goal.query.all() + goals_response = [] + for goal in goals: + goals_response.append({ + "id": goal.goal_id, + "title": goal.title + }) + return make_response(jsonify(goals_response)) + +@goals_bp.route("/", methods=["GET", "PUT", "DELETE"]) +def handle_goal(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return make_response(f"", 404) + + if request.method == "GET": + return make_response({ + "goal": { + "id": goal.goal_id, + "title": goal.title + } + }) + elif request.method == "PUT": + form_data = request.get_json() + goal.title = form_data["title"] + db.session.commit() + goal_response = { + "goal": { + "id": goal.goal_id, + "title": goal.title + } + } + return make_response(goal_response, 200) + + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + + return make_response( + { + "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" + } + ) \ No newline at end of file From c0051a53c2b87cda00ac16b317bef650551aa2c7 Mon Sep 17 00:00:00 2001 From: trish Date: Mon, 14 Jun 2021 13:19:11 -0700 Subject: [PATCH 14/18] create one to many relationship in models --- app/models/goal.py | 1 + app/models/task.py | 1 + migrations/versions/3fa3879e3bef_.py | 39 ---------------------------- migrations/versions/422c9d9ef6f1_.py | 28 -------------------- 4 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 migrations/versions/3fa3879e3bef_.py delete mode 100644 migrations/versions/422c9d9ef6f1_.py diff --git a/app/models/goal.py b/app/models/goal.py index 0bdc1731d..6abe60396 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,3 +5,4 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) + tasks = db.relationship("Task", backref="goal", lazy=True) diff --git a/app/models/task.py b/app/models/task.py index 8bf3e9734..5dee23fc1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,3 +7,4 @@ 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) \ No newline at end of file diff --git a/migrations/versions/3fa3879e3bef_.py b/migrations/versions/3fa3879e3bef_.py deleted file mode 100644 index dd8e45c55..000000000 --- a/migrations/versions/3fa3879e3bef_.py +++ /dev/null @@ -1,39 +0,0 @@ -"""empty message - -Revision ID: 3fa3879e3bef -Revises: -Create Date: 2021-06-09 14:08:06.995630 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '3fa3879e3bef' -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 ### diff --git a/migrations/versions/422c9d9ef6f1_.py b/migrations/versions/422c9d9ef6f1_.py deleted file mode 100644 index 7be7b867d..000000000 --- a/migrations/versions/422c9d9ef6f1_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: 422c9d9ef6f1 -Revises: 3fa3879e3bef -Create Date: 2021-06-09 23:09:36.907328 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '422c9d9ef6f1' -down_revision = '3fa3879e3bef' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('goal', 'title') - # ### end Alembic commands ### From 176e6696be37e633d77d17b5ed26823659b009ab Mon Sep 17 00:00:00 2001 From: trish Date: Mon, 14 Jun 2021 13:26:21 -0700 Subject: [PATCH 15/18] cleaning up whitespace --- app/routes.py | 88 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 11 deletions(-) diff --git a/app/routes.py b/app/routes.py index 71303eaa3..3b12966b2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -61,7 +61,7 @@ def handle_tasks(): "description": task.description, "is_complete": completed_at }) - return make_response(jsonify(tasks_response)) + return make_response(jsonify(tasks_response), 200) @tasks_bp.route("/", methods=["GET","PUT","DELETE"]) def handle_task(task_id): @@ -74,14 +74,27 @@ def handle_task(task_id): completed_at = False else: completed_at = True - return make_response({ - "task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": completed_at - } - }) + + if task.goal_id == None: + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } + }) + else: + # goal_id = task.goal_id + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "goal_id": task.goal_id, + "description": task.description, + "is_complete": completed_at + } + }) elif request.method == "PUT": form_data = request.get_json() @@ -122,7 +135,7 @@ def mark_complete(task_id): task = Task.query.get(task_id) if task == None: - return make_response("Task {task_id} not found", 404) + return make_response(f"Task {task_id} not found", 404) task.completed_at = datetime.utcnow() db.session.commit() @@ -132,6 +145,7 @@ def mark_complete(task_id): "channel": "task-notifications", "text": f"Someone just completed the {task.title}", } + headers = {"Authorization": f"Bearer {slack_token}"} requests.post(slack_path, params = query_params, headers = headers) @@ -153,6 +167,7 @@ def mark_incomplete(task_id): task.completed_at = None db.session.commit() + return { "task": { "id": task.task_id, @@ -224,4 +239,55 @@ def handle_goal(goal_id): { "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" } - ) \ No newline at end of file + ) + +@goals_bp.route("//tasks", methods=["GET", "POST"]) +def handle_goals_and_tasks(goal_id): + if request.method == "POST": + goal = Goal.query.get(goal_id) + if not goal: + return make_response({ + f"Goal # {goal_id} not found." + }, 404) + request_body = request.get_json() + for id in request_body["task_ids"]: + task = Task.query.get(id) + goal.tasks.append(task) + db.session.add(goal) + db.session.commit() + + return make_response({ + "id": goal.goal_id, + "task_ids": request_body["task_ids"] + }) + + elif request.method == "GET": + goal = Goal.query.get(goal_id) + + if not goal: + return make_response(f"Goal {goal_id} not FOUND", 404) + tasks = goal.tasks + + list_of_tasks = [] + + for task in tasks: + if task.completed_at == None: + completed_at = False + else: + completed_at = True + + individual_task = { + "task": { + "id": task.task_id, + "goal_id": goal.goal_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } + } + list_of_tasks.append(individual_task) + return make_response({ + "id": goal.goal_id, + "title": goal.title, + "tasks": list_of_tasks + }) From ff6aafb46676fbb5d71cadbb965897594f52b7b7 Mon Sep 17 00:00:00 2001 From: trish Date: Mon, 14 Jun 2021 13:40:00 -0700 Subject: [PATCH 16/18] edit returned body of response to not include task attribute --- app/routes.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3b12966b2..264ed7cc7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -277,13 +277,11 @@ def handle_goals_and_tasks(goal_id): completed_at = True individual_task = { - "task": { - "id": task.task_id, - "goal_id": goal.goal_id, - "title": task.title, - "description": task.description, - "is_complete": completed_at - } + "id": task.task_id, + "goal_id": goal.goal_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at } list_of_tasks.append(individual_task) return make_response({ From 965c401f2b3fab37a8e8ff80ff7fa22a4bf55aca Mon Sep 17 00:00:00 2001 From: trish Date: Mon, 14 Jun 2021 16:44:10 -0700 Subject: [PATCH 17/18] add Procfile for deploying to 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 3595981eef970a29ed5b12a3a383aa8d1d3b184e Mon Sep 17 00:00:00 2001 From: trish Date: Tue, 15 Jun 2021 14:43:06 -0700 Subject: [PATCH 18/18] add clean migrations --- migrations/versions/6ad5569e1e7c_.py | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 migrations/versions/6ad5569e1e7c_.py diff --git a/migrations/versions/6ad5569e1e7c_.py b/migrations/versions/6ad5569e1e7c_.py new file mode 100644 index 000000000..ce6090249 --- /dev/null +++ b/migrations/versions/6ad5569e1e7c_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 6ad5569e1e7c +Revises: +Create Date: 2021-06-15 14:41:28.492312 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6ad5569e1e7c' +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 ###