From 5668ec3d22affbfda73326c81ee60144f960de83 Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Wed, 9 Jun 2021 23:29:08 -0700 Subject: [PATCH 1/8] Add task model, GET tasks route --- app/__init__.py | 3 +++ app/models/task.py | 6 +++++- app/routes.py | 19 ++++++++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..46a882d58 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -31,4 +31,7 @@ def create_app(test_config=None): # Register Blueprints here + from .routes import tasks_bp + app.register_blueprint(tasks_bp) + return app diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..5735ca501 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,8 @@ 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) + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..4f5d502c0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,19 @@ -from flask import Blueprint +from flask import Blueprint, request, make_response, jsonify +from app.models.task import Task +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["GET"]) +def handle_tasks(): + if request.method == "GET": + 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 From f1290d696fab623fb66c99fb343aa1f1494cb6fe Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Thu, 10 Jun 2021 23:00:05 -0700 Subject: [PATCH 2/8] Make more wave 1 tests pass --- app/models/task.py | 2 +- app/routes.py | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 5735ca501..a82212792 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,5 +6,5 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True); title = db.Column(db.String) description = db.Column(db.String) - completed_at = db.Column(db.DateTime) + completed_at = db.Column(db.DateTime, nullable=True) diff --git a/app/routes.py b/app/routes.py index 4f5d502c0..a35d54c1e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,9 +1,10 @@ from flask import Blueprint, request, make_response, jsonify from app.models.task import Task +from app import db tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") -@tasks_bp.route("", methods=["GET"]) +@tasks_bp.route("", methods=["GET", "POST"]) def handle_tasks(): if request.method == "GET": tasks = Task.query.all() @@ -16,4 +17,32 @@ def handle_tasks(): "completed_at": task.completed_at }) return jsonify(tasks_response) - \ No newline at end of file + elif request.method == "POST": + # check for missing items + 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 make_response({"details": "Invalid data"},400) + + 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 make_response({ + "task":{ + "id":new_task.task_id, + "title":new_task.title, + "description":new_task.description, + "is_complete": False if not new_task.completed_at else True}}, 201) + + + # 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", 200) From a87f14ded89b0e36e87ab88aa60cad2803b1dcd6 Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Fri, 11 Jun 2021 00:56:52 -0700 Subject: [PATCH 3/8] Make all wave 1 pass --- app/routes.py | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/app/routes.py b/app/routes.py index a35d54c1e..d6216e940 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,6 +4,7 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +# Get all tasks and create a task @tasks_bp.route("", methods=["GET", "POST"]) def handle_tasks(): if request.method == "GET": @@ -11,16 +12,16 @@ def handle_tasks(): tasks_response = [] for task in tasks: 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": False if not task.completed_at else True, }) return jsonify(tasks_response) elif request.method == "POST": - # check for missing items request_body = request.get_json() + # check for missing items if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: return make_response({"details": "Invalid data"},400) @@ -37,12 +38,39 @@ def handle_tasks(): "description":new_task.description, "is_complete": False if not new_task.completed_at else True}}, 201) +# Get one task and +@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("Task not found", 404) + + if request.method == "GET": + return {"task":{ + "id":task.task_id, + "title":task.title, + "description":task.description, + "is_complete": False if not task.completed_at else True + }} + + elif request.method == "PUT": + form_data = request.get_json() + # check for missing items + if "title" not in form_data or "description" not in form_data or "completed_at" not in form_data: + return make_response({"details": "Invalid data"},400) - # 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({ + "task":{ + "id":task.task_id, + "title":task.title, + "description":task.description, + "is_complete": False if not task.completed_at else True}}, 200) - # 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", 200) + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + return make_response({"details": f'Task {task.task_id} "{task.title}" successfully deleted'}) From 964f6f99b5689bfd2d12da89ae9934291916b65b Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Fri, 11 Jun 2021 01:21:48 -0700 Subject: [PATCH 4/8] Make wave 2 pass --- app/routes.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index d6216e940..264f34f5b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,6 @@ from flask import Blueprint, request, make_response, jsonify +from sqlalchemy.orm import query +from sqlalchemy import desc from app.models.task import Task from app import db @@ -8,7 +10,14 @@ @tasks_bp.route("", methods=["GET", "POST"]) def handle_tasks(): if request.method == "GET": - tasks = Task.query.all() + sort_order = request.args.get("sort") + if sort_order == "asc": + tasks = Task.query.order_by(Task.title) + elif sort_order == "desc": + tasks = Task.query.order_by(desc(Task.title)) + else: + tasks = Task.query.all() + tasks_response = [] for task in tasks: tasks_response.append({ From fd5b2726de1cbef8545e5036dd776e468b7d05e8 Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Fri, 11 Jun 2021 07:49:53 -0700 Subject: [PATCH 5/8] Add migrations folder --- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/a7a4982d88d2_.py | 39 +++++++++++ 5 files changed, 205 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/a7a4982d88d2_.py 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/a7a4982d88d2_.py b/migrations/versions/a7a4982d88d2_.py new file mode 100644 index 000000000..db527bfc9 --- /dev/null +++ b/migrations/versions/a7a4982d88d2_.py @@ -0,0 +1,39 @@ +"""adds Task + +Revision ID: a7a4982d88d2 +Revises: +Create Date: 2021-06-09 23:07:16.073181 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a7a4982d88d2' +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 a3f8036985037cc6608458c69ca6bdfddbe01f3c Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Tue, 15 Jun 2021 00:50:18 -0700 Subject: [PATCH 6/8] Wave 3 passing, add column to goal model, replace migrations --- app/models/goal.py | 1 + app/routes.py | 48 +++++++++++++++++++ .../{a7a4982d88d2_.py => b48de3bc3d38_.py} | 9 ++-- 3 files changed, 54 insertions(+), 4 deletions(-) rename migrations/versions/{a7a4982d88d2_.py => b48de3bc3d38_.py} (85%) diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..07fce5fc2 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.Text) diff --git a/app/routes.py b/app/routes.py index 264f34f5b..9c9febfb7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,10 +1,13 @@ +from app.models.goal import Goal from flask import Blueprint, request, make_response, jsonify from sqlalchemy.orm import query from sqlalchemy import desc from app.models.task import Task from app import db +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") # Get all tasks and create a task @tasks_bp.route("", methods=["GET", "POST"]) @@ -83,3 +86,48 @@ def handle_task(task_id): db.session.delete(task) db.session.commit() return make_response({"details": f'Task {task.task_id} "{task.title}" successfully deleted'}) + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_task_incomplete(task_id): + if request.method == "PATCH": + task = Task.query.get(task_id) + if task is None: + return make_response("",404) + + task.completed_at = None + db.session.commit() + return make_response({ + "task":{ + "id":task.task_id, + "title":task.title, + "description":task.description, + "is_complete": False if not task.completed_at else True}}, 200) + +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_task_complete(task_id): + if request.method == "PATCH": + task = Task.query.get(task_id) + if task is None: + return make_response("",404) + + task.completed_at = datetime.now() + db.session.commit() + return make_response({ + "task":{ + "id":task.task_id, + "title":task.title, + "description":task.description, + "is_complete": False if not task.completed_at else True}}, 200) + +@goals_bp.route("/", methods=["GET","POST"]) +def handle_goals(): + 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 jsonify(goals_response) diff --git a/migrations/versions/a7a4982d88d2_.py b/migrations/versions/b48de3bc3d38_.py similarity index 85% rename from migrations/versions/a7a4982d88d2_.py rename to migrations/versions/b48de3bc3d38_.py index db527bfc9..b9b371907 100644 --- a/migrations/versions/a7a4982d88d2_.py +++ b/migrations/versions/b48de3bc3d38_.py @@ -1,8 +1,8 @@ -"""adds Task +"""empty message -Revision ID: a7a4982d88d2 +Revision ID: b48de3bc3d38 Revises: -Create Date: 2021-06-09 23:07:16.073181 +Create Date: 2021-06-15 00:46:06.288061 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'a7a4982d88d2' +revision = 'b48de3bc3d38' 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.Text(), nullable=True), sa.PrimaryKeyConstraint('goal_id') ) op.create_table('task', From d517c8c51f33d45c28d0b91530263a1eef441ec7 Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Wed, 16 Jun 2021 13:44:16 -0700 Subject: [PATCH 7/8] Wave 4 - posted to Slack! Some Wave 5 passing --- app/routes.py | 85 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 32 deletions(-) diff --git a/app/routes.py b/app/routes.py index 9c9febfb7..9435dfdb4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,11 +5,16 @@ from app.models.task import Task from app import db from datetime import datetime +# below for Slackbot +import requests +import os tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") # Get all tasks and create a task + + @tasks_bp.route("", methods=["GET", "POST"]) def handle_tasks(): if request.method == "GET": @@ -34,9 +39,9 @@ def handle_tasks(): request_body = request.get_json() # check for missing items - if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: - return make_response({"details": "Invalid data"},400) - + if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: + return make_response({"details": "Invalid data"}, 400) + new_task = Task(title=request_body["title"], description=request_body["description"], completed_at=request_body["completed_at"]) @@ -44,42 +49,44 @@ def handle_tasks(): db.session.commit() return make_response({ - "task":{ - "id":new_task.task_id, - "title":new_task.title, - "description":new_task.description, + "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, "is_complete": False if not new_task.completed_at else True}}, 201) -# Get one task and -@tasks_bp.route("/", methods=["GET","PUT","DELETE"]) +# Get one task and manipulate it + + +@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("Task not found", 404) - + if request.method == "GET": - return {"task":{ - "id":task.task_id, - "title":task.title, - "description":task.description, + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, "is_complete": False if not task.completed_at else True - }} + }} elif request.method == "PUT": form_data = request.get_json() # check for missing items - if "title" not in form_data or "description" not in form_data or "completed_at" not in form_data: - return make_response({"details": "Invalid data"},400) + if "title" not in form_data or "description" not in form_data or "completed_at" not in form_data: + return make_response({"details": "Invalid data"}, 400) task.title = form_data["title"] task.description = form_data["description"] task.completed_at = form_data["completed_at"] db.session.commit() return make_response({ - "task":{ - "id":task.task_id, - "title":task.title, - "description":task.description, + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, "is_complete": False if not task.completed_at else True}}, 200) elif request.method == "DELETE": @@ -87,39 +94,53 @@ def handle_task(task_id): db.session.commit() return make_response({"details": f'Task {task.task_id} "{task.title}" successfully deleted'}) + @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_task_incomplete(task_id): if request.method == "PATCH": task = Task.query.get(task_id) if task is None: - return make_response("",404) + return make_response("", 404) task.completed_at = None db.session.commit() return make_response({ - "task":{ - "id":task.task_id, - "title":task.title, - "description":task.description, + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, "is_complete": False if not task.completed_at else True}}, 200) + @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): if request.method == "PATCH": task = Task.query.get(task_id) if task is None: - return make_response("",404) + return make_response("", 404) task.completed_at = datetime.now() db.session.commit() + + slack_url = 'https://slack.com/api/chat.postMessage' + slack_tk = os.environ.get("SLACKBOT_TOKEN") + + r = requests.post(slack_url, + data=f"channel=task-notifications&text=Someone just completed the task {task.title}", + headers={ + "Content-type": "application/x-www-form-urlencoded","Authorization":f"{slack_tk}"} + ) + print(r.text) + return make_response({ - "task":{ - "id":task.task_id, - "title":task.title, - "description":task.description, + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, "is_complete": False if not task.completed_at else True}}, 200) -@goals_bp.route("/", methods=["GET","POST"]) + +@goals_bp.route("/", methods=["GET", "POST"]) def handle_goals(): if request.method == "GET": From 73ae669dd0ed4f2616709289d64ab7b518948a3f Mon Sep 17 00:00:00 2001 From: Naomi Quinones Date: Thu, 17 Jun 2021 11:31:27 -0700 Subject: [PATCH 8/8] Pass Wave 5, modify models, format code --- app/__init__.py | 2 + app/models/goal.py | 2 +- app/routes.py | 59 ++++++++++++++++--- .../{b48de3bc3d38_.py => 9ec33757d6ec_.py} | 8 +-- 4 files changed, 59 insertions(+), 12 deletions(-) rename migrations/versions/{b48de3bc3d38_.py => 9ec33757d6ec_.py} (84%) diff --git a/app/__init__.py b/app/__init__.py index 46a882d58..b18221db4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -32,6 +32,8 @@ def create_app(test_config=None): # Register Blueprints here from .routes import tasks_bp + from .routes import goals_bp app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 07fce5fc2..a3d2035b1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,5 +3,5 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True,autoincrement=True) title = db.Column(db.Text) diff --git a/app/routes.py b/app/routes.py index 9435dfdb4..885fcc268 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,8 +1,8 @@ -from app.models.goal import Goal from flask import Blueprint, request, make_response, jsonify from sqlalchemy.orm import query from sqlalchemy import desc from app.models.task import Task +from app.models.goal import Goal from app import db from datetime import datetime # below for Slackbot @@ -126,10 +126,10 @@ def mark_task_complete(task_id): slack_tk = os.environ.get("SLACKBOT_TOKEN") r = requests.post(slack_url, - data=f"channel=task-notifications&text=Someone just completed the task {task.title}", - headers={ - "Content-type": "application/x-www-form-urlencoded","Authorization":f"{slack_tk}"} - ) + data=f"channel=task-notifications&text=Someone just completed the task {task.title}", + headers={ + "Content-type": "application/x-www-form-urlencoded", "Authorization": f"{slack_tk}"} + ) print(r.text) return make_response({ @@ -139,11 +139,12 @@ def mark_task_complete(task_id): "description": task.description, "is_complete": False if not task.completed_at else True}}, 200) +# Add a goal and get all goals + -@goals_bp.route("/", methods=["GET", "POST"]) +@goals_bp.route("", methods=["GET", "POST"]) def handle_goals(): if request.method == "GET": - goals = Goal.query.all() goals_response = [] for goal in goals: @@ -152,3 +153,47 @@ def handle_goals(): "title": goal.title, }) return jsonify(goals_response) + elif request.method == "POST": + req_body = request.get_json() + + # check for missing data + if "title" not in req_body: + return make_response({"details": "Invalid data"}, 400) + new_goal = Goal(title=req_body["title"]) + db.session.add(new_goal) + db.session.commit() + + return make_response({"goal": { + "id": new_goal.goal_id, + "title": new_goal.title + }}, 201) + + +@goals_bp.route("/", methods=["GET", "PUT", "DELETE"]) +def handle_goal(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return make_response("Item not found", 404) + + if request.method == "GET": + return {"goal": { + "id": goal.goal_id, + "title": f"{goal.title}" + }} + elif request.method == "PUT": + form_data = request.get_json() + if "title" not in form_data: + return make_response({"details": "Invalid data"}, 400) + goal.title = form_data["title"] + db.session.commit() + + return make_response({"goal": { + "id": goal.goal_id, + "title": f"{goal.title}" + }}) + + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + + return make_response({"details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}) diff --git a/migrations/versions/b48de3bc3d38_.py b/migrations/versions/9ec33757d6ec_.py similarity index 84% rename from migrations/versions/b48de3bc3d38_.py rename to migrations/versions/9ec33757d6ec_.py index b9b371907..38b0783f3 100644 --- a/migrations/versions/b48de3bc3d38_.py +++ b/migrations/versions/9ec33757d6ec_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: b48de3bc3d38 +Revision ID: 9ec33757d6ec Revises: -Create Date: 2021-06-15 00:46:06.288061 +Create Date: 2021-06-16 14:22:49.834966 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'b48de3bc3d38' +revision = '9ec33757d6ec' down_revision = None branch_labels = None depends_on = None @@ -19,7 +19,7 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.create_table('goal', - sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('goal_id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('title', sa.Text(), nullable=True), sa.PrimaryKeyConstraint('goal_id') )