From f5a21517d1ff963ab36bd65518c89d2f6f41c3bf Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 8 May 2021 18:07:09 -0700 Subject: [PATCH 1/9] created route for post method --- app/__init__.py | 5 ++ app/models/task.py | 17 ++++- app/routes.py | 55 +++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/8feb736f0e82_.py | 36 +++++++++++ migrations/versions/9e7130b8d613_.py | 32 ++++++++++ 9 files changed, 309 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/8feb736f0e82_.py create mode 100644 migrations/versions/9e7130b8d613_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..7258220b7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,10 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import task_bp + app.register_blueprint(task_bp) return app + + # if __name__ == "__main__": +# app.run(port= 5000, debug=True) diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..f49831fe4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,19 @@ 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) + + def to_json(self): + if self.completed_at == None: + is_complete = False + else: + is_complete = True + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..1d82fac11 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,55 @@ -from flask import Blueprint +from app import db +from app.models.task import Task +from flask import Blueprint, request, make_response, jsonify + +task_bp = Blueprint("task", __name__, url_prefix='/tasks') + + +# @task_bp.route("", methods=["GET"]) +# def handle_tasks(): +# #return full list of tasks +# tasks = Task.query.all() +# task_response_body = [] +# for task in tasks: +# task_response_body.append({ +# 'id': task.id, +# 'title': task.title, +# 'description': task.description, +# 'is_complete': task.is_complete +# }) +# return jsonify(task_response_body), 200 + +# @task_bp.route('/', methods=['GET']) +# def handle_task(task_id): # same name as parameter route +# task = Task.query.get(task_id) +# if not task: +# return "", 404 +# return jsonify({ +# "task":{ +# "id": task.id, +# "title": task.title, +# "description": task.description, +# "is_complete": task.is_complete +# } +# }), 201 + + +@task_bp.route("", methods=["POST"]) +def post_task(): + request_body = request.get_json() + new_task = Task(title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"]) + + db.session.add(new_task) + db.session.commit() + + return jsonify({ + "task":{ + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": False + } + }), 201 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/8feb736f0e82_.py b/migrations/versions/8feb736f0e82_.py new file mode 100644 index 000000000..aa47d13d7 --- /dev/null +++ b/migrations/versions/8feb736f0e82_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: 8feb736f0e82 +Revises: +Create Date: 2021-05-06 11:23:49.852800 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8feb736f0e82' +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(), nullable=False), + 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/9e7130b8d613_.py b/migrations/versions/9e7130b8d613_.py new file mode 100644 index 000000000..f5aed48f9 --- /dev/null +++ b/migrations/versions/9e7130b8d613_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 9e7130b8d613 +Revises: 8feb736f0e82 +Create Date: 2021-05-08 16:54:56.023254 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9e7130b8d613' +down_revision = '8feb736f0e82' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True)) + op.add_column('task', sa.Column('description', sa.String(), nullable=True)) + op.add_column('task', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'title') + op.drop_column('task', 'description') + op.drop_column('task', 'completed_at') + # ### end Alembic commands ### From aa3f10645b80eadfd6fb052a4879ebde7f4981f1 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 8 May 2021 21:23:19 -0700 Subject: [PATCH 2/9] still in the works --- app/models/task.py | 1 + app/routes.py | 97 +++++++++++++++++++--------- migrations/versions/ffe73f860629_.py | 28 ++++++++ 3 files changed, 95 insertions(+), 31 deletions(-) create mode 100644 migrations/versions/ffe73f860629_.py diff --git a/app/models/task.py b/app/models/task.py index f49831fe4..201fbe53c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,6 +7,7 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) + is_complete = db.Column(db.Boolean, default = False) def to_json(self): if self.completed_at == None: diff --git a/app/routes.py b/app/routes.py index 1d82fac11..370bb96be 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,36 +4,6 @@ task_bp = Blueprint("task", __name__, url_prefix='/tasks') - -# @task_bp.route("", methods=["GET"]) -# def handle_tasks(): -# #return full list of tasks -# tasks = Task.query.all() -# task_response_body = [] -# for task in tasks: -# task_response_body.append({ -# 'id': task.id, -# 'title': task.title, -# 'description': task.description, -# 'is_complete': task.is_complete -# }) -# return jsonify(task_response_body), 200 - -# @task_bp.route('/', methods=['GET']) -# def handle_task(task_id): # same name as parameter route -# task = Task.query.get(task_id) -# if not task: -# return "", 404 -# return jsonify({ -# "task":{ -# "id": task.id, -# "title": task.title, -# "description": task.description, -# "is_complete": task.is_complete -# } -# }), 201 - - @task_bp.route("", methods=["POST"]) def post_task(): request_body = request.get_json() @@ -43,7 +13,6 @@ def post_task(): db.session.add(new_task) db.session.commit() - return jsonify({ "task":{ "id": new_task.task_id, @@ -52,4 +21,70 @@ def post_task(): "is_complete": False } }), 201 + if "title" or "desription" or "completed_at" not in request_body: + return jsonify({ + "details": "Invalid data" + }), 40 + + +@task_bp.route("", methods=["GET"]) +def handle_tasks(): + #return full list of tasks + tasks = Task.query.all() + task_response_body = [] + for task in tasks: + task_response_body.append({ + 'id': task.task_id, + 'title': task.title, + 'description': task.description, + 'is_complete': task.is_complete + }) + return jsonify(task_response_body), 200 + +@task_bp.route('/', methods=['GET']) +def handle_task(task_id): # same name as parameter route + task = Task.query.get(task_id) + if not task: + return "", 404 + return jsonify({ + "task":{ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete + } + }), 201 + +@task_bp.route("", methods=['DELETE', 'PUT']) +def delete_put_tasks(): + task = Task.query.get(task_id) + if not task: + return 404 + + if request.method == 'DELETE': + db.session.delete(task) + db.session.commit() + return ({ + "details": f"Task {task_id} \"Go on my daily walk 🏞\" successfully deleted" + }, 200) + + + elif request.method == 'PUT': + request_body = request.get_json() + if "title" or "description" not in request_body: + return 404 + if "title" in request_body: + task.title = request_body["title"] + if "description" in request_body: + task.description = request_body["description"] + db.session.commit() + return jsonify({ + "task": { + "id": 1, + "title": "Updated Task Title", + "description": "Updated Test Description", + "is_complete": false + } + }), 200 + diff --git a/migrations/versions/ffe73f860629_.py b/migrations/versions/ffe73f860629_.py new file mode 100644 index 000000000..dc4f8a6e9 --- /dev/null +++ b/migrations/versions/ffe73f860629_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: ffe73f860629 +Revises: 9e7130b8d613 +Create Date: 2021-05-08 19:50:42.236562 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ffe73f860629' +down_revision = '9e7130b8d613' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### From 7d985975a9f3d8cd17dc768ef3e4b6b6a2a96d8f Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 10 May 2021 12:07:09 -0700 Subject: [PATCH 3/9] wave 1 succesfully completed --- app/__init__.py | 7 ++- app/models/task.py | 1 + app/routes.py | 69 ++++++++++++---------------- migrations/versions/aa2589766ebf_.py | 31 +++++++++++++ 4 files changed, 66 insertions(+), 42 deletions(-) create mode 100644 migrations/versions/aa2589766ebf_.py diff --git a/app/__init__.py b/app/__init__.py index 7258220b7..d6d45b6e1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -24,14 +24,17 @@ def create_app(test_config=None): # Import models here for Alembic setup from app.models.task import Task - from app.models.goal import Goal + #from app.models.goal import Goal + from .routes import task_bp + #from .routes import goal_bp + db.init_app(app) migrate.init_app(app, db) # Register Blueprints here - from .routes import task_bp app.register_blueprint(task_bp) + #app.register_blueprint(goal_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 201fbe53c..1faf6d7ad 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,6 +10,7 @@ class Task(db.Model): is_complete = db.Column(db.Boolean, default = False) def to_json(self): + #is_complete = None if self.completed_at == None: is_complete = False else: diff --git a/app/routes.py b/app/routes.py index 370bb96be..0d6d43ade 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,30 +1,28 @@ from app import db -from app.models.task import Task +from .models.task import Task from flask import Blueprint, request, make_response, jsonify + task_bp = Blueprint("task", __name__, url_prefix='/tasks') @task_bp.route("", methods=["POST"]) def post_task(): request_body = request.get_json() - new_task = Task(title=request_body["title"], - description=request_body["description"], + if "title" in request_body and "description" in request_body and "completed_at" in request_body: + new_task = Task(title=request_body["title"],description=request_body["description"], completed_at=request_body["completed_at"]) - + else: + return make_response({ + "details": "Invalid data" + }), 400 + + db.session.add(new_task) db.session.commit() - return jsonify({ - "task":{ - "id": new_task.task_id, - "title": new_task.title, - "description": new_task.description, - "is_complete": False - } - }), 201 - if "title" or "desription" or "completed_at" not in request_body: - return jsonify({ - "details": "Invalid data" - }), 40 + + + return jsonify({"task": new_task.to_json()}), 201 + @task_bp.route("", methods=["GET"]) @@ -53,38 +51,29 @@ def handle_task(task_id): # same name as parameter route "description": task.description, "is_complete": task.is_complete } - }), 201 + }), 200 -@task_bp.route("", methods=['DELETE', 'PUT']) -def delete_put_tasks(): +@task_bp.route("/", methods=['DELETE', 'PUT']) +def delete_or_put_tasks(task_id): task = Task.query.get(task_id) if not task: - return 404 - - if request.method == 'DELETE': + return "", 404 + elif request.method == 'DELETE': db.session.delete(task) db.session.commit() - return ({ + return jsonify({ "details": f"Task {task_id} \"Go on my daily walk 🏞\" successfully deleted" - }, 200) - - + }), 200 + elif request.method == 'PUT': request_body = request.get_json() - if "title" or "description" not in request_body: - return 404 - if "title" in request_body: - task.title = request_body["title"] - if "description" in request_body: - task.description = request_body["description"] + + task.title = request_body["title"] + + task.description = request_body["description"] db.session.commit() - return jsonify({ - "task": { - "id": 1, - "title": "Updated Task Title", - "description": "Updated Test Description", - "is_complete": false - } - }), 200 + return jsonify({"task": task.to_json()}), 200 + + diff --git a/migrations/versions/aa2589766ebf_.py b/migrations/versions/aa2589766ebf_.py new file mode 100644 index 000000000..8857b6ee3 --- /dev/null +++ b/migrations/versions/aa2589766ebf_.py @@ -0,0 +1,31 @@ +"""empty message + +Revision ID: aa2589766ebf +Revises: ffe73f860629 +Create Date: 2021-05-09 11:05:35.222237 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'aa2589766ebf' +down_revision = 'ffe73f860629' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('goal') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('goal_id', name='goal_pkey') + ) + # ### end Alembic commands ### From 7a0c280fd3b59eb22e7295e8096d5c4e2bdfbb42 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 11 May 2021 09:45:19 -0700 Subject: [PATCH 4/9] wave 3 tests passed --- app/__init__.py | 2 +- app/models/task.py | 2 +- app/routes.py | 93 ++++++++++++++++------------ migrations/versions/45be87b8c530_.py | 28 +++++++++ 4 files changed, 85 insertions(+), 40 deletions(-) create mode 100644 migrations/versions/45be87b8c530_.py diff --git a/app/__init__.py b/app/__init__.py index d6d45b6e1..baef7fcd1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -25,7 +25,7 @@ def create_app(test_config=None): # Import models here for Alembic setup from app.models.task import Task #from app.models.goal import Goal - from .routes import task_bp + from app.routes import task_bp #from .routes import goal_bp diff --git a/app/models/task.py b/app/models/task.py index 1faf6d7ad..b8d8598c9 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,7 +10,7 @@ class Task(db.Model): is_complete = db.Column(db.Boolean, default = False) def to_json(self): - #is_complete = None + is_complete = None if self.completed_at == None: is_complete = False else: diff --git a/app/routes.py b/app/routes.py index 0d6d43ade..637e78590 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,9 @@ from app import db -from .models.task import Task +from app.models.task import Task from flask import Blueprint, request, make_response, jsonify +from datetime import datetime +import requests + task_bp = Blueprint("task", __name__, url_prefix='/tasks') @@ -8,50 +11,38 @@ @task_bp.route("", methods=["POST"]) def post_task(): request_body = request.get_json() + if "title" in request_body and "description" in request_body and "completed_at" in request_body: new_task = Task(title=request_body["title"],description=request_body["description"], completed_at=request_body["completed_at"]) - else: - return make_response({ - "details": "Invalid data" - }), 400 - - - db.session.add(new_task) - db.session.commit() - - - return jsonify({"task": new_task.to_json()}), 201 + db.session.add(new_task) + db.session.commit() + return jsonify({"task": new_task.to_json()}), 201 + else: + return make_response({"details": "Invalid data"}), 400 + - - @task_bp.route("", methods=["GET"]) -def handle_tasks(): - #return full list of tasks - tasks = Task.query.all() - task_response_body = [] +def get_all_tasks(): + sort_method = request.args.get("sort") + if sort_method == "asc": + tasks = Task.query.order_by(Task.title.asc()) + elif sort_method == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + task_response_body = [] for task in tasks: - task_response_body.append({ - 'id': task.task_id, - 'title': task.title, - 'description': task.description, - 'is_complete': task.is_complete - }) + task_response_body.append(task.to_json()) return jsonify(task_response_body), 200 @task_bp.route('/', methods=['GET']) -def handle_task(task_id): # same name as parameter route +def get_single_task(task_id): # same name as parameter route task = Task.query.get(task_id) if not task: return "", 404 - return jsonify({ - "task":{ - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": task.is_complete - } - }), 200 + return make_response({"task": task.to_json()}), 200 + @task_bp.route("/", methods=['DELETE', 'PUT']) def delete_or_put_tasks(task_id): @@ -62,18 +53,44 @@ def delete_or_put_tasks(task_id): db.session.delete(task) db.session.commit() return jsonify({ - "details": f"Task {task_id} \"Go on my daily walk 🏞\" successfully deleted" + "details": f'Task {task_id} "{task.title}" successfully deleted' }), 200 elif request.method == 'PUT': - request_body = request.get_json() - + request_body = request.get_json() task.title = request_body["title"] - + task.completed_at = request_body["completed_at"] task.description = request_body["description"] db.session.commit() return jsonify({"task": task.to_json()}), 200 - + +@task_bp.route('//mark_complete', methods=["PATCH"]) +def mark_complete(task_id): + task = Task.query.get(task_id) + if task == None: + return make_response(), 404 + + task.completed_at = datetime.utcnow() + db.session.add(task) + return jsonify({"task": task.to_json()}), 200 + +@task_bp.route('//mark_incomplete', methods=["PATCH"]) +def mark_incomplete(task_id): + task = Task.query.get(task_id) + if task == None: + return make_response(), 404 + + task.completed_at = None + db.session.commit() + return jsonify({"task": task.to_json()}), 200 + + + + + + + + diff --git a/migrations/versions/45be87b8c530_.py b/migrations/versions/45be87b8c530_.py new file mode 100644 index 000000000..509e89e22 --- /dev/null +++ b/migrations/versions/45be87b8c530_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 45be87b8c530 +Revises: aa2589766ebf +Create Date: 2021-05-10 18:48:46.651780 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '45be87b8c530' +down_revision = 'aa2589766ebf' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) + # ### end Alembic commands ### From b396d176dea59b6460dbeed933355c39e29fdc3c Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 11 May 2021 12:29:37 -0700 Subject: [PATCH 5/9] Passed tests in wave 4 --- app/models/task.py | 4 ++-- app/routes.py | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index b8d8598c9..a7a95337f 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,10 +7,10 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) - is_complete = db.Column(db.Boolean, default = False) + #is_complete = db.Column(db.Boolean, default = False) def to_json(self): - is_complete = None + #is_complete = None if self.completed_at == None: is_complete = False else: diff --git a/app/routes.py b/app/routes.py index 637e78590..363f5319a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,6 +3,8 @@ from flask import Blueprint, request, make_response, jsonify from datetime import datetime import requests +import flask_migrate +import os @@ -71,9 +73,21 @@ def mark_complete(task_id): if task == None: return make_response(), 404 - task.completed_at = datetime.utcnow() - db.session.add(task) - return jsonify({"task": task.to_json()}), 200 + if task: + task.completed_at = datetime.utcnow() + db.session.commit() + call_slack(task) + return make_response({"task": task.to_json()}, 200) + + + +def call_slack(task): + key = os.environ.get("API_KEY") + url = "https://slack.com/api/chat.postMessage" + slack_str = f"Someone just completed the task {task.title}" + requests.post(url, data={"token":key ,"channel":"general" , "text": slack_str}) + + @task_bp.route('//mark_incomplete', methods=["PATCH"]) def mark_incomplete(task_id): From dcb1519ca99cf802d29b90f533f54c5ede7613f1 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 11 May 2021 17:15:50 -0700 Subject: [PATCH 6/9] wave 5 passed tests --- app/__init__.py | 9 +++-- app/models/goal.py | 9 ++++- app/routes.py | 53 +++++++++++++++++++++++++++- migrations/versions/f2e107d95187_.py | 32 +++++++++++++++++ 4 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 migrations/versions/f2e107d95187_.py diff --git a/app/__init__.py b/app/__init__.py index baef7fcd1..9bbc5c0bf 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -24,9 +24,9 @@ def create_app(test_config=None): # Import models here for Alembic setup from app.models.task import Task - #from app.models.goal import Goal + from app.models.goal import Goal from app.routes import task_bp - #from .routes import goal_bp + from .routes import goal_bp db.init_app(app) @@ -34,9 +34,8 @@ def create_app(test_config=None): # Register Blueprints here app.register_blueprint(task_bp) - #app.register_blueprint(goal_bp) + app.register_blueprint(goal_bp) return app - # if __name__ == "__main__": -# app.run(port= 5000, debug=True) + diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..f203e8ad2 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,4 +3,11 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + + def now_json(self): + return { + "id": self.goal_id, + "title": self.title + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 363f5319a..e3ece9a62 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,10 +5,12 @@ import requests import flask_migrate import os +from app.models.goal import Goal task_bp = Blueprint("task", __name__, url_prefix='/tasks') +goal_bp = Blueprint("goal", __name__, url_prefix='/goals') @task_bp.route("", methods=["POST"]) def post_task(): @@ -101,9 +103,58 @@ def mark_incomplete(task_id): +@goal_bp.route("", methods=["POST"]) +def post_new_goal(): + request_body = request.get_json() + + if "title" in request_body: + new_goal = Goal(title=request_body["title"]) + db.session.add(new_goal) + db.session.commit() + return jsonify({"goal": new_goal.now_json()}), 201 + else: + return make_response({"details": "Invalid data"}), 400 + +@goal_bp.route("", methods=["GET"]) +def get_all_goals(): + sort_method = request.args.get("sort") + if sort_method == "asc": + goals = Goal.query.order_by(Goal.title.asc()) + elif sort_method == "desc": + goals = Goal.query.order_by(Goal.title.desc()) + else: + goals = Goal.query.all() + goal_response_body = [] + for goal in goals: + goal_response_body.append(goal.now_json()) + return jsonify(goal_response_body), 200 + - +@goal_bp.route('/', methods=['GET']) +def get_single_goal(goal_id): # same name as parameter route + goal = Goal.query.get(goal_id) + if not goal: + return "", 404 + return make_response({"goal": goal.now_json()}), 200 + +@goal_bp.route("/", methods=['DELETE', 'PUT']) +def delete_or_put_goals(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return "", 404 + elif request.method == 'DELETE': + db.session.delete(goal) + db.session.commit() + return jsonify({ + "details": f'Goal {goal_id} "{goal.title}" successfully deleted' + }), 200 + + elif request.method == 'PUT': + request_body = request.get_json() + goal.title = request_body["title"] + db.session.commit() + return jsonify({"goal": goal.now_json()}), 200 diff --git a/migrations/versions/f2e107d95187_.py b/migrations/versions/f2e107d95187_.py new file mode 100644 index 000000000..218100eb4 --- /dev/null +++ b/migrations/versions/f2e107d95187_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: f2e107d95187 +Revises: 45be87b8c530 +Create Date: 2021-05-11 14:17:25.218081 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f2e107d95187' +down_revision = '45be87b8c530' +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') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('goal') + # ### end Alembic commands ### From f7e0bbf4e1a49fabf57f8bb19c5007e49fdfc1e9 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 11 May 2021 22:40:19 -0700 Subject: [PATCH 7/9] created updated database --- app/models/goal.py | 4 ++- app/models/task.py | 1 + app/routes.py | 33 +++++++++++++------ migrations/versions/45be87b8c530_.py | 28 ---------------- .../{8feb736f0e82_.py => 69fba104e4eb_.py} | 16 ++++++--- migrations/versions/9e7130b8d613_.py | 32 ------------------ migrations/versions/aa2589766ebf_.py | 31 ----------------- migrations/versions/f2e107d95187_.py | 32 ------------------ migrations/versions/ffe73f860629_.py | 28 ---------------- 9 files changed, 38 insertions(+), 167 deletions(-) delete mode 100644 migrations/versions/45be87b8c530_.py rename migrations/versions/{8feb736f0e82_.py => 69fba104e4eb_.py} (51%) delete mode 100644 migrations/versions/9e7130b8d613_.py delete mode 100644 migrations/versions/aa2589766ebf_.py delete mode 100644 migrations/versions/f2e107d95187_.py delete mode 100644 migrations/versions/ffe73f860629_.py diff --git a/app/models/goal.py b/app/models/goal.py index f203e8ad2..e0ed886df 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,7 +4,9 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) - title = db.Column(db.String) + title = db.Column(db.String, nullable=False) + tasks = db.relationship('Task', backref= "goal", lazy=True) + def now_json(self): return { diff --git a/app/models/task.py b/app/models/task.py index a7a95337f..6271cb924 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,6 +7,7 @@ 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) #is_complete = db.Column(db.Boolean, default = False) def to_json(self): diff --git a/app/routes.py b/app/routes.py index e3ece9a62..b8e2b8b8b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -12,7 +12,7 @@ task_bp = Blueprint("task", __name__, url_prefix='/tasks') goal_bp = Blueprint("goal", __name__, url_prefix='/goals') -@task_bp.route("", methods=["POST"]) +@task_bp.route("", methods=["POST"], strict_slashes = False) def post_task(): request_body = request.get_json() @@ -26,7 +26,7 @@ def post_task(): return make_response({"details": "Invalid data"}), 400 -@task_bp.route("", methods=["GET"]) +@task_bp.route("", methods=["GET"], strict_slashes = False) def get_all_tasks(): sort_method = request.args.get("sort") if sort_method == "asc": @@ -40,7 +40,7 @@ def get_all_tasks(): task_response_body.append(task.to_json()) return jsonify(task_response_body), 200 -@task_bp.route('/', methods=['GET']) +@task_bp.route('/', methods=['GET'], strict_slashes = False) def get_single_task(task_id): # same name as parameter route task = Task.query.get(task_id) if not task: @@ -48,7 +48,7 @@ def get_single_task(task_id): # same name as parameter route return make_response({"task": task.to_json()}), 200 -@task_bp.route("/", methods=['DELETE', 'PUT']) +@task_bp.route("/", methods=['DELETE', 'PUT'], strict_slashes = False) def delete_or_put_tasks(task_id): task = Task.query.get(task_id) if not task: @@ -69,7 +69,7 @@ def delete_or_put_tasks(task_id): return jsonify({"task": task.to_json()}), 200 -@task_bp.route('//mark_complete', methods=["PATCH"]) +@task_bp.route('//mark_complete', methods=["PATCH"], strict_slashes = False) def mark_complete(task_id): task = Task.query.get(task_id) if task == None: @@ -91,7 +91,7 @@ def call_slack(task): -@task_bp.route('//mark_incomplete', methods=["PATCH"]) +@task_bp.route('//mark_incomplete', methods=["PATCH"], strict_slashes = False) def mark_incomplete(task_id): task = Task.query.get(task_id) if task == None: @@ -103,7 +103,7 @@ def mark_incomplete(task_id): -@goal_bp.route("", methods=["POST"]) +@goal_bp.route("", methods=["POST"], strict_slashes = False) def post_new_goal(): request_body = request.get_json() @@ -115,7 +115,7 @@ def post_new_goal(): else: return make_response({"details": "Invalid data"}), 400 -@goal_bp.route("", methods=["GET"]) +@goal_bp.route("", methods=["GET"], strict_slashes = False) def get_all_goals(): sort_method = request.args.get("sort") if sort_method == "asc": @@ -131,14 +131,14 @@ def get_all_goals(): -@goal_bp.route('/', methods=['GET']) +@goal_bp.route('/', methods=['GET'], strict_slashes = False) def get_single_goal(goal_id): # same name as parameter route goal = Goal.query.get(goal_id) if not goal: return "", 404 return make_response({"goal": goal.now_json()}), 200 -@goal_bp.route("/", methods=['DELETE', 'PUT']) +@goal_bp.route("/", methods=['DELETE', 'PUT'], strict_slashes = False) def delete_or_put_goals(goal_id): goal = Goal.query.get(goal_id) if not goal: @@ -157,5 +157,18 @@ def delete_or_put_goals(goal_id): return jsonify({"goal": goal.now_json()}), 200 +@goal_bp.route("/tasks", methods=["POST"], strict_slashes = False) +def post_new_task(): + request_body = request.get_json() + + if "title" in request_body: + new_goal = Goal(title=request_body["title"]) + db.session.add(new_goal) + db.session.commit() + return jsonify({"goal": new_goal.now_json()}), 201 + else: + return make_response({"details": "Invalid data"}), 400 + + diff --git a/migrations/versions/45be87b8c530_.py b/migrations/versions/45be87b8c530_.py deleted file mode 100644 index 509e89e22..000000000 --- a/migrations/versions/45be87b8c530_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: 45be87b8c530 -Revises: aa2589766ebf -Create Date: 2021-05-10 18:48:46.651780 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '45be87b8c530' -down_revision = 'aa2589766ebf' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'is_complete') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) - # ### end Alembic commands ### diff --git a/migrations/versions/8feb736f0e82_.py b/migrations/versions/69fba104e4eb_.py similarity index 51% rename from migrations/versions/8feb736f0e82_.py rename to migrations/versions/69fba104e4eb_.py index aa47d13d7..26fb39d83 100644 --- a/migrations/versions/8feb736f0e82_.py +++ b/migrations/versions/69fba104e4eb_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 8feb736f0e82 +Revision ID: 69fba104e4eb Revises: -Create Date: 2021-05-06 11:23:49.852800 +Create Date: 2021-05-11 22:36:08.219522 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '8feb736f0e82' +revision = '69fba104e4eb' down_revision = None branch_labels = None depends_on = None @@ -19,11 +19,17 @@ 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.String(), nullable=False), sa.PrimaryKeyConstraint('goal_id') ) op.create_table('task', - sa.Column('task_id', sa.Integer(), nullable=False), + 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 ### diff --git a/migrations/versions/9e7130b8d613_.py b/migrations/versions/9e7130b8d613_.py deleted file mode 100644 index f5aed48f9..000000000 --- a/migrations/versions/9e7130b8d613_.py +++ /dev/null @@ -1,32 +0,0 @@ -"""empty message - -Revision ID: 9e7130b8d613 -Revises: 8feb736f0e82 -Create Date: 2021-05-08 16:54:56.023254 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '9e7130b8d613' -down_revision = '8feb736f0e82' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True)) - op.add_column('task', sa.Column('description', sa.String(), nullable=True)) - op.add_column('task', sa.Column('title', sa.String(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'title') - op.drop_column('task', 'description') - op.drop_column('task', 'completed_at') - # ### end Alembic commands ### diff --git a/migrations/versions/aa2589766ebf_.py b/migrations/versions/aa2589766ebf_.py deleted file mode 100644 index 8857b6ee3..000000000 --- a/migrations/versions/aa2589766ebf_.py +++ /dev/null @@ -1,31 +0,0 @@ -"""empty message - -Revision ID: aa2589766ebf -Revises: ffe73f860629 -Create Date: 2021-05-09 11:05:35.222237 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'aa2589766ebf' -down_revision = 'ffe73f860629' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('goal') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('goal', - sa.Column('goal_id', sa.INTEGER(), autoincrement=True, nullable=False), - sa.PrimaryKeyConstraint('goal_id', name='goal_pkey') - ) - # ### end Alembic commands ### diff --git a/migrations/versions/f2e107d95187_.py b/migrations/versions/f2e107d95187_.py deleted file mode 100644 index 218100eb4..000000000 --- a/migrations/versions/f2e107d95187_.py +++ /dev/null @@ -1,32 +0,0 @@ -"""empty message - -Revision ID: f2e107d95187 -Revises: 45be87b8c530 -Create Date: 2021-05-11 14:17:25.218081 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'f2e107d95187' -down_revision = '45be87b8c530' -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') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('goal') - # ### end Alembic commands ### diff --git a/migrations/versions/ffe73f860629_.py b/migrations/versions/ffe73f860629_.py deleted file mode 100644 index dc4f8a6e9..000000000 --- a/migrations/versions/ffe73f860629_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: ffe73f860629 -Revises: 9e7130b8d613 -Create Date: 2021-05-08 19:50:42.236562 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'ffe73f860629' -down_revision = '9e7130b8d613' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'is_complete') - # ### end Alembic commands ### From 31900b3936d0a79f73c51673fd8d95a06c579fc0 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 12 May 2021 18:04:03 -0700 Subject: [PATCH 8/9] finished wave 6! All tests passing --- app/models/goal.py | 21 +++++++++++++++++++-- app/models/task.py | 11 ++++++++++- app/routes.py | 32 +++++++++++++++++++++++--------- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index e0ed886df..5b57b3aa1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,11 +5,28 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String, nullable=False) - tasks = db.relationship('Task', backref= "goal", lazy=True) + tasks = db.relationship('Task', backref= 'goal', lazy=True) def now_json(self): return { "id": self.goal_id, "title": self.title - } \ No newline at end of file + } + + def tasks_json(self): + result = [] + for task in self.tasks: + task = task.to_json() + task["goal_id"] = self.goal_id + result.append(task) + return result + + + def full_json(self): + return { + "id": self.goal_id, + "title": self.title, + "tasks": self.tasks_json() + } + \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 6271cb924..1b09d4d7b 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -16,9 +16,18 @@ def to_json(self): is_complete = False else: is_complete = True + if self.goal_id: + return { + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } return { "id": self.task_id, "title": self.title, "description": self.description, "is_complete": is_complete - } + } + diff --git a/app/routes.py b/app/routes.py index b8e2b8b8b..9adec952d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -157,17 +157,31 @@ def delete_or_put_goals(goal_id): return jsonify({"goal": goal.now_json()}), 200 -@goal_bp.route("/tasks", methods=["POST"], strict_slashes = False) -def post_new_task(): +@goal_bp.route("//tasks", methods=["POST"], strict_slashes = False) +def post_new_task(goal_id): request_body = request.get_json() + task_ids = request_body["task_ids"] + goal = Goal.query.get(goal_id) + for task_id in task_ids: + task = Task.query.get(task_id) + if task.goal_id != goal_id: + goal.tasks.append(task) + response_body = { + "id": goal_id, + "task_ids": task_ids + } + return jsonify(response_body), 200 + + +@goal_bp.route('//tasks', methods=['GET']) +def get_tasks_goals(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return '', 404 + return jsonify(goal.full_json()), 200 - if "title" in request_body: - new_goal = Goal(title=request_body["title"]) - db.session.add(new_goal) - db.session.commit() - return jsonify({"goal": new_goal.now_json()}), 201 - else: - return make_response({"details": "Invalid data"}), 400 + + From b87cf7f7939632cf4230b089485caf1af7fd724e Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 13 May 2021 07:46:29 -0700 Subject: [PATCH 9/9] final add and commit for project --- app/models/task.py | 4 ++-- app/routes.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 1b09d4d7b..1751cf572 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,10 +8,10 @@ class Task(db.Model): 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) - #is_complete = db.Column(db.Boolean, default = False) + def to_json(self): - #is_complete = None + if self.completed_at == None: is_complete = False else: diff --git a/app/routes.py b/app/routes.py index 9adec952d..8aa391f2c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -132,7 +132,7 @@ def get_all_goals(): @goal_bp.route('/', methods=['GET'], strict_slashes = False) -def get_single_goal(goal_id): # same name as parameter route +def get_single_goal(goal_id): goal = Goal.query.get(goal_id) if not goal: return "", 404