From 910c4c028d3ee56a06a2884fb45c7430a7759d52 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Wed, 5 May 2021 17:41:20 -0700 Subject: [PATCH 01/18] Add Blueprints for task and goal in __init__.py. --- app/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..2ad70e296 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -23,6 +23,7 @@ def create_app(test_config=None): "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup + from app.models.task import Task from app.models.goal import Goal @@ -30,5 +31,12 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import task_bp + app.register_blueprint(task_bp) + + #goals + #from .routes import goal_bp + #app.register_blueprint(goal_bp) + return app From 017dee11d01cc981d17a9d1991b8cb7f34e0fa0b Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Wed, 5 May 2021 17:42:21 -0700 Subject: [PATCH 02/18] Register Blueprints for task blueprint and goal blueprint in routes.py. --- app/routes.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..9e5b41403 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,8 @@ from flask import Blueprint +task_bp = Blueprint("task", __name__, url_prefix="/task") + +#goal_bp = Blueprint("goal", __name__, url_prefix="/goal") + + + From 012783924ef8b270cc16c1d190026e8748a803d4 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Wed, 5 May 2021 19:18:59 -0700 Subject: [PATCH 03/18] Register task_bp and goal_bp Blueprints and import Task and Goal models from app.models --- app/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2ad70e296..2fe3c5bdd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -24,19 +24,21 @@ def create_app(test_config=None): # Import models here for Alembic setup - from app.models.task import Task - from app.models.goal import Goal - db.init_app(app) migrate.init_app(app, db) # Register Blueprints here + + #task from .routes import task_bp app.register_blueprint(task_bp) - #goals - #from .routes import goal_bp - #app.register_blueprint(goal_bp) + #goal + from .routes import goal_bp + app.register_blueprint(goal_bp) + + from app.models.task import Task + from app.models.goal import Goal return app From ae62c5c5790f21372c8bcd58431a5dde23b6f74d Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Wed, 5 May 2021 19:21:19 -0700 Subject: [PATCH 04/18] Adds task_bp and goal_bp Blueprints in routes.py and defines Task Model in task.py and defines Goal model in goal.py. --- app/models/goal.py | 4 +++- app/models/task.py | 7 ++++++- app/routes.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..6d440b1c0 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,4 +3,6 @@ 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(50)) + #tasks = db.relationship('Goal', backref='person', lazy=True) diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..3a0cebf16 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,11 @@ from flask import current_app from app import db +from flask import Blueprint 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(50)) + description = db.Column(db.String(50)) + completed_at = db.Column(db.DateTime, nullable=True) + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 9e5b41403..0827c71e5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,7 +2,7 @@ task_bp = Blueprint("task", __name__, url_prefix="/task") -#goal_bp = Blueprint("goal", __name__, url_prefix="/goal") +goal_bp = Blueprint("goal", __name__, url_prefix="/goal") From bf142cb118beb633aef1d30f943e25eb369582b1 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Wed, 5 May 2021 19:22:27 -0700 Subject: [PATCH 05/18] Generates migrations for goal.py and task.py. --- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../versions/a3c5e1675e01_adds_goal_model.py | 32 +++++++ .../versions/c9f52021613e_adds_task_model.py | 34 +++++++ 6 files changed, 232 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/a3c5e1675e01_adds_goal_model.py create mode 100644 migrations/versions/c9f52021613e_adds_task_model.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/a3c5e1675e01_adds_goal_model.py b/migrations/versions/a3c5e1675e01_adds_goal_model.py new file mode 100644 index 000000000..140d73ed5 --- /dev/null +++ b/migrations/versions/a3c5e1675e01_adds_goal_model.py @@ -0,0 +1,32 @@ +"""adds Goal model + +Revision ID: a3c5e1675e01 +Revises: c9f52021613e +Create Date: 2021-05-05 19:12:24.933727 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a3c5e1675e01' +down_revision = 'c9f52021613e' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=50), 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/c9f52021613e_adds_task_model.py b/migrations/versions/c9f52021613e_adds_task_model.py new file mode 100644 index 000000000..567ea23d4 --- /dev/null +++ b/migrations/versions/c9f52021613e_adds_task_model.py @@ -0,0 +1,34 @@ +"""adds Task model + +Revision ID: c9f52021613e +Revises: +Create Date: 2021-05-05 19:06:05.634836 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c9f52021613e' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=50), nullable=True), + sa.Column('description', sa.String(length=50), 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') + # ### end Alembic commands ### From fc8b18e0e7c0699685a04a0962e4e9f6d4d925a3 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Wed, 5 May 2021 22:17:15 -0700 Subject: [PATCH 06/18] Adds GET and POST endpoints for tasks. --- app/__init__.py | 8 ++++---- app/routes.py | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2fe3c5bdd..bdf0aa008 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,12 +30,12 @@ def create_app(test_config=None): # Register Blueprints here #task - from .routes import task_bp - app.register_blueprint(task_bp) + from .routes import tasks_bp + app.register_blueprint(tasks_bp) #goal - from .routes import goal_bp - app.register_blueprint(goal_bp) + from .routes import goals_bp + app.register_blueprint(goals_bp) from app.models.task import Task from app.models.goal import Goal diff --git a/app/routes.py b/app/routes.py index 0827c71e5..0ab575926 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,8 +1,44 @@ -from flask import Blueprint +from app import db +from app.models.task import Task +from flask import request, Blueprint, make_response, jsonify -task_bp = Blueprint("task", __name__, url_prefix="/task") +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") -goal_bp = Blueprint("goal", __name__, url_prefix="/goal") +@tasks_bp.route("", methods=["GET", "POST"]) +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, + "description" : task.description, + "is_complete": 'false' + }) + return jsonify(tasks_response) + + elif 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 make_response(f"Task {new_task.title} successfully created", 201) + + +@tasks_bp.route("/", methods=["GET"]) +def handle_task(task_id): + task = Task.query.get(task_id) + + return { + "task_id" : task.task_id, + "description" : task.description, + "is_complete": 'false' + } \ No newline at end of file From 48a601a121eab32e9cdaf9a1efdc1cf77401fc69 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Mon, 10 May 2021 09:09:48 -0700 Subject: [PATCH 07/18] Adds Goal model and instantiates a one to many relationship between Task and Goal instances. --- app/models/goal.py | 12 ++++++++++-- app/models/task.py | 18 ++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 6d440b1c0..aa8d647d0 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,6 +3,14 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String(50)) - #tasks = db.relationship('Goal', backref='person', lazy=True) + tasks = db.relationship('Task', backref='goal', lazy=True) + + def create_goal_json(self): + + return { + 'id' : self.id, + 'title' : self.title + #'tasks' : self.tasks + } diff --git a/app/models/task.py b/app/models/task.py index 3a0cebf16..98c3a49e4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,8 +4,22 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String(50)) description = db.Column(db.String(50)) completed_at = db.Column(db.DateTime, nullable=True) - \ No newline at end of file + goal_id = db.Column(db.Integer, db.ForeignKey("goal.id"), nullable=True) + + + def create_json(self): + if self.completed_at == None: + completed = False + else: + completed = True + + return { + 'id' : self.id, + 'title' : self.title, + 'description' : self.description, + 'is_complete' : completed + } \ No newline at end of file From 6e7565f127ace9a240d8fab89693d71e154c0ca3 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Mon, 10 May 2021 09:12:14 -0700 Subject: [PATCH 08/18] Adds migrations for changes made to Goal and Task Models to instantiate a one to many relationship between the two models. --- ...f_adds_foreign_key_column_to_task_class.py | 30 ++++++++++++++ ...34372b2_adds_models_task_py_and_goal_py.py | 40 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 migrations/versions/3b2561fc3cbf_adds_foreign_key_column_to_task_class.py create mode 100644 migrations/versions/3eed734372b2_adds_models_task_py_and_goal_py.py diff --git a/migrations/versions/3b2561fc3cbf_adds_foreign_key_column_to_task_class.py b/migrations/versions/3b2561fc3cbf_adds_foreign_key_column_to_task_class.py new file mode 100644 index 000000000..0cd6b20ef --- /dev/null +++ b/migrations/versions/3b2561fc3cbf_adds_foreign_key_column_to_task_class.py @@ -0,0 +1,30 @@ +"""Adds foreign key column to Task class + +Revision ID: 3b2561fc3cbf +Revises: 3eed734372b2 +Create Date: 2021-05-08 11:01:05.302194 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3b2561fc3cbf' +down_revision = '3eed734372b2' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/3eed734372b2_adds_models_task_py_and_goal_py.py b/migrations/versions/3eed734372b2_adds_models_task_py_and_goal_py.py new file mode 100644 index 000000000..0b5640064 --- /dev/null +++ b/migrations/versions/3eed734372b2_adds_models_task_py_and_goal_py.py @@ -0,0 +1,40 @@ +"""Adds models task.py and goal.py + +Revision ID: 3eed734372b2 +Revises: +Create Date: 2021-05-06 11:34:29.641628 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3eed734372b2' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=50), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=50), nullable=True), + sa.Column('description', sa.String(length=50), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('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 e2ca8c76a871bab91c6cb490e6210c81766f91b3 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Mon, 10 May 2021 09:13:31 -0700 Subject: [PATCH 09/18] Adds endpoints for Goal table and for one-tomany routes between goal and task tables. --- app/routes.py | 270 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 241 insertions(+), 29 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0ab575926..38827c04e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,44 +1,256 @@ 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 sqlalchemy import asc, desc +from datetime import datetime + tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") +index_bp = Blueprint("index", __name__, url_prefix="/") + +@index_bp.route("", methods=["GET"]) +def index(): + return make_response("Hello, this is Ruthie's task list", 200) + +@index_bp.route("smile/", methods=["GET"]) +def smiley(count): + count_list = [] + for i in range(int(count)): + count_list.append(";)") + return make_response(jsonify(count_list), 200) -@tasks_bp.route("", methods=["GET", "POST"]) -def handle_tasks(): - if request.method == "GET": +@tasks_bp.route("", methods=["GET"], strict_slashes=False) +def get_all_tasks(): + + sort_query = request.args.get("sort") + tasks_response = [] + sorted_response = [] + ordered_query = [] + + + if sort_query is None: tasks = Task.query.all() - tasks_response = [] - for task in tasks: - tasks_response.append({ - "task_id" : task.task_id, - "description" : task.description, - "is_complete": 'false' - }) - return jsonify(tasks_response) - - elif 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) + + for task in tasks: + tasks_response.append(task.create_json()) + + return make_response(jsonify(tasks_response), 200) + + + if sort_query == "asc": + + ordered_query = Task.query.order_by(Task.title.asc()) + + elif sort_query == "desc": + + ordered_query = Task.query.order_by(Task.title.desc()) + + for task in ordered_query: + sorted_response.append(task.create_json()) + + return jsonify(sorted_response), 200 + + + +@tasks_bp.route("", methods=["POST"], strict_slashes=False) +def create_new_task(): + + request_body = request.get_json() + if not request_body or not request_body.get("title") or not request_body.get("description") 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": new_task.create_json()}, 201) + + +@tasks_bp.route("/", methods=["GET"], strict_slashes=False) +def get_task_by_id(task_id): + + task = Task.query.get(task_id) + + if task is None: + return make_response("", 404) + + else: + return make_response({"task": task.create_json()}, 200) + + +@tasks_bp.route("/", methods=["PUT"], strict_slashes=False) +def update_task(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response("", 404) + + else: + 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": task.create_json()}, 200) - return make_response(f"Task {new_task.title} successfully created", 201) +@tasks_bp.route("/", methods=["DELETE"], strict_slashes=False) +def delete_task(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + else: + db.session.delete(task) + db.session.commit() -@tasks_bp.route("/", methods=["GET"]) -def handle_task(task_id): + return make_response({"details":f"Task {task.id} \"{task.title}\" successfully deleted"}, 200) + +@tasks_bp.route("/mark_complete", methods=["PATCH"], strict_slashes=False) +def mark_complete(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response("", 404) + + task.completed_at = datetime.utcnow() + db.session.commit() + + return make_response({"task": task.create_json()}, 200) + +@tasks_bp.route("/mark_incomplete", methods=["PATCH"], strict_slashes=False) +def mark_incomplete(task_id): task = Task.query.get(task_id) - return { - "task_id" : task.task_id, - "description" : task.description, - "is_complete": 'false' - } \ No newline at end of file + if task is None: + return make_response("", 404) + + task.completed_at = None + db.session.commit() + + return make_response({"task": task.create_json()}, 200) + + +#Goal Blueprints + +#GET/As a client, I want to be able to make a GET request to /goals +@goals_bp.route("", methods=["GET"], strict_slashes=False) +def get_all_goals(): + + goals_response = [] + goals = Goal.query.all() + + for goal in goals: + goals_response.append(goal.create_goal_json()) + + return make_response(jsonify(goals_response), 200) + + +#POST/I want to be able to make a POST request to /goals +@goals_bp.route("", methods=["POST"], strict_slashes=False) +def create_goals(): + request_body = request.get_json() + if not request_body or not request_body.get("title"): + return make_response({"details": "Invalid data"}, 400) + + new_goal = Goal( + title = request_body["title"] + ) + + db.session.add(new_goal) + db.session.commit() + + return make_response({"goal": new_goal.create_goal_json()}, 201) + +#GET// I want to be able to make a GET request to /goals/1 +@goals_bp.route("", methods=["GET"], strict_slashes=False) +def get_one_goal(goal_id): + + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response("", 404) + + + return make_response({"goal": goal.create_goal_json()}, 200) + + +#PUT/PUT request to /goals/1 +@goals_bp.route("", methods=["PUT"], strict_slashes=False) +def update_goal(goal_id): + + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response("", 404) + + form_data = request.get_json() + goal.title = form_data["title"] + + db.session.commit() + return make_response({"goal": goal.create_goal_json()}, 200) + + +#DELETE/DELETE request to /goals/1 +@goals_bp.route("", methods=["DELETE"], strict_slashes=False) +def delete_goal(goal_id): + + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response("", 404) + + else: + + db.session.delete(goal) + db.session.commit() + + return make_response({"details": f'Goal {goal.id} \"{goal.title}\" successfully deleted'}, 200) + + +#one-to-many route + +@goals_bp.route("/tasks", methods=["POST"], strict_slashes=False) +def add_tasks_to_goals(goal_id): + + request_body = request.get_json() + task_ids = request_body["task_ids"] + goal = Goal.query.get(goal_id) + task_id_list =[] + + if not request_body: + return make_response({"details": "Invalid data"}, 400) + + for task_id in task_ids: + + + task = Task.query.get(task_id) + task.goal_id = goal_id + task_id_list.append(task_id) + + db.session.add(task) + db.session.commit() + + + return make_response({f'"id": {"goal_id"}, \ + "task_ids": {"task_id_list"}'}, 200) + +@goals_bp.route("/tasks", methods=["GET"], strict_slashes=False) +def get_tasks_of_one_goal(goal_id): + + request_body = request.get_json() + goal = Goal.query.get(goal_id) + #tasks_of_goal = Goal.query.get(tasks) + + + + From 03c82fbda80bc3aa34f1a27ff2bb515fb4dbd0a1 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Tue, 11 May 2021 14:51:45 -0700 Subject: [PATCH 10/18] adds routes to access data via task to goal relationsip, adds instance method to Task model that generates a JSON with goal_id included in response body, adds response that posts a message to Slack task-notification channel on the task-list-api workspace when user completes a task and sends a patch request to tasks/ in routes.py. --- app/__init__.py | 4 ++ app/models/goal.py | 3 +- app/models/task.py | 14 ++++ app/routes.py | 67 ++++++++++++++----- .../versions/a3c5e1675e01_adds_goal_model.py | 32 --------- .../versions/c9f52021613e_adds_task_model.py | 34 ---------- utilities.py | 37 ++++++++++ 7 files changed, 105 insertions(+), 86 deletions(-) delete mode 100644 migrations/versions/a3c5e1675e01_adds_goal_model.py delete mode 100644 migrations/versions/c9f52021613e_adds_task_model.py create mode 100644 utilities.py diff --git a/app/__init__.py b/app/__init__.py index bdf0aa008..b78fa0f1f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -37,6 +37,10 @@ def create_app(test_config=None): from .routes import goals_bp app.register_blueprint(goals_bp) + #index + from .routes import index_bp + app.register_blueprint(index_bp) + from app.models.task import Task from app.models.goal import Goal diff --git a/app/models/goal.py b/app/models/goal.py index aa8d647d0..f54bf5909 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -12,5 +12,4 @@ def create_goal_json(self): return { 'id' : self.id, 'title' : self.title - #'tasks' : self.tasks - } + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 98c3a49e4..2869376f7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -22,4 +22,18 @@ def create_json(self): 'title' : self.title, 'description' : self.description, 'is_complete' : completed + } + + def create_json_with_goal_id(self): + if self.completed_at == None: + completed = False + else: + completed = True + + return { + 'id' : self.id, + 'goal_id' : self.goal_id, + 'title' : self.title, + 'description' : self.description, + 'is_complete' : completed } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 38827c04e..e12528cb4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,6 +4,8 @@ from flask import request, Blueprint, make_response, jsonify from sqlalchemy import asc, desc from datetime import datetime +import os +import requests tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -54,7 +56,6 @@ def get_all_tasks(): return jsonify(sorted_response), 200 - @tasks_bp.route("", methods=["POST"], strict_slashes=False) def create_new_task(): @@ -75,15 +76,18 @@ def create_new_task(): @tasks_bp.route("/", methods=["GET"], strict_slashes=False) def get_task_by_id(task_id): - + request_body = request.get_json() task = Task.query.get(task_id) if task is None: return make_response("", 404) - else: + if task.goal_id is None: return make_response({"task": task.create_json()}, 200) + else: + + return make_response({"task": task.create_json_with_goal_id()}, 200) @tasks_bp.route("/", methods=["PUT"], strict_slashes=False) def update_task(task_id): @@ -125,7 +129,20 @@ def mark_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() + slack_token = os.environ["SLACK_API_TOKEN"] + slack_channel = "task-notifications" + slack_icon_url = "https://slack.com/api/chat.postMessage" + text = f"Someone just completed the task {task.title}" + + response = requests.post('https://slack.com/api/chat.postMessage', { + 'token': slack_token, + 'channel': slack_channel, + 'text': text, + 'icon_url': slack_icon_url + }).json() + return make_response({"task": task.create_json()}, 200) + @tasks_bp.route("/mark_incomplete", methods=["PATCH"], strict_slashes=False) def mark_incomplete(task_id): @@ -140,9 +157,6 @@ def mark_incomplete(task_id): return make_response({"task": task.create_json()}, 200) -#Goal Blueprints - -#GET/As a client, I want to be able to make a GET request to /goals @goals_bp.route("", methods=["GET"], strict_slashes=False) def get_all_goals(): @@ -155,7 +169,6 @@ def get_all_goals(): return make_response(jsonify(goals_response), 200) -#POST/I want to be able to make a POST request to /goals @goals_bp.route("", methods=["POST"], strict_slashes=False) def create_goals(): request_body = request.get_json() @@ -171,7 +184,7 @@ def create_goals(): return make_response({"goal": new_goal.create_goal_json()}, 201) -#GET// I want to be able to make a GET request to /goals/1 + @goals_bp.route("", methods=["GET"], strict_slashes=False) def get_one_goal(goal_id): @@ -184,7 +197,6 @@ def get_one_goal(goal_id): return make_response({"goal": goal.create_goal_json()}, 200) -#PUT/PUT request to /goals/1 @goals_bp.route("", methods=["PUT"], strict_slashes=False) def update_goal(goal_id): @@ -200,7 +212,6 @@ def update_goal(goal_id): return make_response({"goal": goal.create_goal_json()}, 200) -#DELETE/DELETE request to /goals/1 @goals_bp.route("", methods=["DELETE"], strict_slashes=False) def delete_goal(goal_id): @@ -217,40 +228,60 @@ def delete_goal(goal_id): return make_response({"details": f'Goal {goal.id} \"{goal.title}\" successfully deleted'}, 200) -#one-to-many route - @goals_bp.route("/tasks", methods=["POST"], strict_slashes=False) def add_tasks_to_goals(goal_id): + goal_id = int(goal_id) request_body = request.get_json() task_ids = request_body["task_ids"] goal = Goal.query.get(goal_id) + task_id_list =[] if not request_body: return make_response({"details": "Invalid data"}, 400) - for task_id in task_ids: - + for task_id in task_ids: task = Task.query.get(task_id) task.goal_id = goal_id + task_id_list.append(task_id) db.session.add(task) db.session.commit() - return make_response({f'"id": {"goal_id"}, \ - "task_ids": {"task_id_list"}'}, 200) + return make_response({"id": goal_id, "task_ids": task_id_list}, 200) @goals_bp.route("/tasks", methods=["GET"], strict_slashes=False) def get_tasks_of_one_goal(goal_id): - request_body = request.get_json() + goal_id = int(goal_id) goal = Goal.query.get(goal_id) - #tasks_of_goal = Goal.query.get(tasks) + + if not goal: + return make_response("", 404) + tasks = goal.tasks + + + task_list = [] + for task in tasks: + + task_list.append(task.create_json_with_goal_id()) + + response = { + "id" : goal_id, + "title" : goal.title, + "tasks" : task_list + } + + return make_response(response, 200) + + + + diff --git a/migrations/versions/a3c5e1675e01_adds_goal_model.py b/migrations/versions/a3c5e1675e01_adds_goal_model.py deleted file mode 100644 index 140d73ed5..000000000 --- a/migrations/versions/a3c5e1675e01_adds_goal_model.py +++ /dev/null @@ -1,32 +0,0 @@ -"""adds Goal model - -Revision ID: a3c5e1675e01 -Revises: c9f52021613e -Create Date: 2021-05-05 19:12:24.933727 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'a3c5e1675e01' -down_revision = 'c9f52021613e' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('goal', - sa.Column('goal_id', sa.Integer(), autoincrement=True, nullable=False), - sa.Column('title', sa.String(length=50), 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/c9f52021613e_adds_task_model.py b/migrations/versions/c9f52021613e_adds_task_model.py deleted file mode 100644 index 567ea23d4..000000000 --- a/migrations/versions/c9f52021613e_adds_task_model.py +++ /dev/null @@ -1,34 +0,0 @@ -"""adds Task model - -Revision ID: c9f52021613e -Revises: -Create Date: 2021-05-05 19:06:05.634836 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'c9f52021613e' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('task', - sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), - sa.Column('title', sa.String(length=50), nullable=True), - sa.Column('description', sa.String(length=50), 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') - # ### end Alembic commands ### diff --git a/utilities.py b/utilities.py new file mode 100644 index 000000000..769f85fa4 --- /dev/null +++ b/utilities.py @@ -0,0 +1,37 @@ + + + +# def sort_tasks(tasks): + + # q = request.args.get("sort") + # tasks_response = [] + + # for task in tasks: + + # tasks_response.append(task.create_json()) + + # if q == "asc": + + # sorted_tasks = task.sort() + # tasks_response.append(sorted_tasks) + + # elif q == desc: + # sorted_tasks = task.sort(reverse=True) + # tasks_response.append(sorted_tasks) + + # return make_response(jsonify(tasks_response), 200) + + # def make_sorted_json(): + + # if completed_at == None: + # completed = False + + # else: + # completed = True + + # return { + # 'id' : self.id, + # 'title' : self.title, + # 'description' : self.description, + # 'is_complete' : completed + # } From d4f8cf9e8b87028735a1a2aba1bdb4984a0fabe9 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Tue, 11 May 2021 14:56:25 -0700 Subject: [PATCH 11/18] Adds and populates Procfile file to root folder. --- 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 a3a47269f1fab0f04215a3cdabc7b89c5ed5d28d Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Wed, 12 May 2021 15:37:15 -0700 Subject: [PATCH 12/18] Adds instance method from_json for Goal and for Task classes in task.py and goal.py and refactors code in routes.py to use from_json instance methods in goal and task endpoints for PUT request. --- app/models/goal.py | 10 +++++++++- app/models/task.py | 11 ++++++++++- app/routes.py | 22 ++++++++++++++-------- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index f54bf5909..eec50e3aa 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -12,4 +12,12 @@ def create_goal_json(self): return { 'id' : self.id, 'title' : self.title - } \ No newline at end of file + } + + def from_json(request_dict): + # Converts JSON into a new instance of Task + new_goal = Goal( + title = request_dict["title"] + ) + + return new_goal \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 2869376f7..2e711f58d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -36,4 +36,13 @@ def create_json_with_goal_id(self): 'title' : self.title, 'description' : self.description, 'is_complete' : completed - } \ No newline at end of file + } + + def from_json(request_dict): + new_task = Task( + title = request_dict["title"], + description = request_dict["description"], + completed_at = request_dict["completed_at"] + ) + + return new_task \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index e12528cb4..a2d503520 100644 --- a/app/routes.py +++ b/app/routes.py @@ -59,15 +59,19 @@ def get_all_tasks(): @tasks_bp.route("", methods=["POST"], strict_slashes=False) def create_new_task(): + #when creating a task, the value of completed_at is a string that is not a datetime? + request_body = request.get_json() if not request_body or not request_body.get("title") or not request_body.get("description") or "completed_at" not in request_body: return make_response({"details": "Invalid data"}, 400) + + new_task = Task.from_json(request_body) - new_task = Task( - title = request_body["title"], - description = request_body["description"], - completed_at = request_body["completed_at"] - ) + # 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() @@ -175,9 +179,11 @@ def create_goals(): if not request_body or not request_body.get("title"): return make_response({"details": "Invalid data"}, 400) - new_goal = Goal( - title = request_body["title"] - ) + new_goal = Goal.from_json(request_body) + + # new_goal = Goal( + # title = request_body["title"] + # ) db.session.add(new_goal) db.session.commit() From 53b33d71ebaa0f5f4a5da6eef046a5dd4fa34941 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Thu, 13 May 2021 09:31:14 -0700 Subject: [PATCH 13/18] populates endpoints for tasks and goals with conditionals to address search queries by id and sorting requests. --- app/__init__.py | 4 --- app/routes.py | 72 +++++++++++++++++++++++-------------------- tests/conftest.py | 9 ++++++ tests/test_wave_02.py | 1 + tests/test_wave_07.py | 69 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 37 deletions(-) create mode 100644 tests/test_wave_07.py diff --git a/app/__init__.py b/app/__init__.py index b78fa0f1f..bdf0aa008 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -37,10 +37,6 @@ def create_app(test_config=None): from .routes import goals_bp app.register_blueprint(goals_bp) - #index - from .routes import index_bp - app.register_blueprint(index_bp) - from app.models.task import Task from app.models.goal import Goal diff --git a/app/routes.py b/app/routes.py index a2d503520..dfc121398 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,37 +10,25 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") -index_bp = Blueprint("index", __name__, url_prefix="/") - -@index_bp.route("", methods=["GET"]) -def index(): - return make_response("Hello, this is Ruthie's task list", 200) - -@index_bp.route("smile/", methods=["GET"]) -def smiley(count): - count_list = [] - for i in range(int(count)): - count_list.append(";)") - return make_response(jsonify(count_list), 200) @tasks_bp.route("", methods=["GET"], strict_slashes=False) def get_all_tasks(): sort_query = request.args.get("sort") + tasks_response = [] sorted_response = [] ordered_query = [] - if sort_query is None: + if sort_query is None and title_query is None: tasks = Task.query.all() - + for task in tasks: tasks_response.append(task.create_json()) return make_response(jsonify(tasks_response), 200) - if sort_query == "asc": @@ -50,28 +38,26 @@ def get_all_tasks(): ordered_query = Task.query.order_by(Task.title.desc()) + elif sort_query == "id": + + ordered_query = Task.query.order_by(Task.id) + for task in ordered_query: sorted_response.append(task.create_json()) return jsonify(sorted_response), 200 - + + @tasks_bp.route("", methods=["POST"], strict_slashes=False) def create_new_task(): - #when creating a task, the value of completed_at is a string that is not a datetime? - request_body = request.get_json() if not request_body or not request_body.get("title") or not request_body.get("description") or "completed_at" not in request_body: return make_response({"details": "Invalid data"}, 400) new_task = Task.from_json(request_body) - # 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() @@ -93,6 +79,7 @@ def get_task_by_id(task_id): return make_response({"task": task.create_json_with_goal_id()}, 200) + @tasks_bp.route("/", methods=["PUT"], strict_slashes=False) def update_task(task_id): task = Task.query.get(task_id) @@ -110,6 +97,7 @@ def update_task(task_id): db.session.commit() return make_response({"task": task.create_json()}, 200) + @tasks_bp.route("/", methods=["DELETE"], strict_slashes=False) def delete_task(task_id): task = Task.query.get(task_id) @@ -123,6 +111,7 @@ def delete_task(task_id): return make_response({"details":f"Task {task.id} \"{task.title}\" successfully deleted"}, 200) + @tasks_bp.route("/mark_complete", methods=["PATCH"], strict_slashes=False) def mark_complete(task_id): task = Task.query.get(task_id) @@ -164,13 +153,33 @@ def mark_incomplete(task_id): @goals_bp.route("", methods=["GET"], strict_slashes=False) def get_all_goals(): - goals_response = [] - goals = Goal.query.all() - - for goal in goals: - goals_response.append(goal.create_goal_json()) + ordered_query = [] + sorted_response = [] + + sort_query = request.args.get("sort") + + if not sort_query: + + goals_response = [] + goals = Goal.query.all() - return make_response(jsonify(goals_response), 200) + for goal in goals: + goals_response.append(goal.create_goal_json()) + + return make_response(jsonify(goals_response), 200) + + if sort_query == "asc": + + ordered_query = Goal.query.order_by(Goal.title.asc()) + + elif sort_query == "desc": + + ordered_query = Goal.query.order_by(Goal.title.desc()) + + for goal in ordered_query: + sorted_response.append(goal.create_goal_json()) + + return make_response(jsonify(sorted_response), 200) @goals_bp.route("", methods=["POST"], strict_slashes=False) @@ -181,10 +190,6 @@ def create_goals(): new_goal = Goal.from_json(request_body) - # new_goal = Goal( - # title = request_body["title"] - # ) - db.session.add(new_goal) db.session.commit() @@ -259,6 +264,7 @@ def add_tasks_to_goals(goal_id): return make_response({"id": goal_id, "task_ids": task_id_list}, 200) + @goals_bp.route("/tasks", methods=["GET"], strict_slashes=False) def get_tasks_of_one_goal(goal_id): diff --git a/tests/conftest.py b/tests/conftest.py index d11083bf3..d787c470c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -74,6 +74,15 @@ def one_goal(app): db.session.add(new_goal) db.session.commit() +#This fixture gets called in tests for returning goals sorted by title +@pytest.fixture +def three_goals(app): + db.session.add_all([ + Goal(title="Get more excercise"), + Goal(title="Eat healthy"), + Goal(title="Get better sleep") + ]) + db.session.commit() # This fixture gets called in every test that # references "one_task_belongs_to_one_goal" diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 399daf4db..6d47df8d7 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -50,3 +50,4 @@ def test_get_tasks_sorted_desc(client, three_tasks): "is_complete": False, "title": "Answer forgotten email 📧"}, ] + diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py new file mode 100644 index 000000000..a01ab7c15 --- /dev/null +++ b/tests/test_wave_07.py @@ -0,0 +1,69 @@ +#test to get tasks sorted by id +def test_get_tasks_sorted_by_id(client, three_tasks): + # Act + response = client.get("/tasks?sort=id") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert len(response_body) == 3 + assert response_body == [ + { + "description": "", + "id": 1, + "is_complete": False, + "title": "Water the garden 🌷"}, + { + "description": "", + "id": 2, + "is_complete": False, + "title": "Answer forgotten email 📧"}, + { + "description": "", + "id": 3, + "is_complete": False, + "title": "Pay my outstanding tickets 😭"} + ] + + +#Tests for goals sorted by title asc/desc +def test_get_goals_sorted_asc(client, three_goals): + # Act + response = client.get("/goals?sort=asc") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert len(response_body) == 3 + assert response_body == [ + { + "id" : 2, + "title": "Eat healthy"}, + { "id" : 3, + "title": "Get better sleep"}, + { + "id" : 1, + "title": "Get more excercise"} + ] + + +#Test for getting a response body with goals sorted by title +def test_get_goals_sorted_desc(client, three_goals): + # Act + response = client.get("/goals?sort=desc") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert len(response_body) == 3 + assert response_body == [ + { + "id" : 1, + "title": "Get more excercise"}, + { "id" : 3, + "title": "Get better sleep"}, + { + "id" : 2, + "title": "Eat healthy"} + ] + From 91860413a5ea19063e59c104691e87c5d9f28bb9 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Thu, 13 May 2021 09:37:07 -0700 Subject: [PATCH 14/18] fixed key error in routes.py. --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index dfc121398..e82c47d87 100644 --- a/app/routes.py +++ b/app/routes.py @@ -22,7 +22,7 @@ def get_all_tasks(): ordered_query = [] - if sort_query is None and title_query is None: + if sort_query is None and sort_query is None: tasks = Task.query.all() for task in tasks: From 5b1097aad727132143c91cf09fca3c3c8fa523f8 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Thu, 13 May 2021 09:47:08 -0700 Subject: [PATCH 15/18] Comments out test_wave_07 --- tests/test_wave_07.py | 122 +++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py index a01ab7c15..d935e0a12 100644 --- a/tests/test_wave_07.py +++ b/tests/test_wave_07.py @@ -1,69 +1,69 @@ -#test to get tasks sorted by id -def test_get_tasks_sorted_by_id(client, three_tasks): - # Act - response = client.get("/tasks?sort=id") - response_body = response.get_json() +# #test to get tasks sorted by id +# def test_get_tasks_sorted_by_id(client, three_tasks): +# # Act +# response = client.get("/tasks?sort=id") +# response_body = response.get_json() - # Assert - assert response.status_code == 200 - assert len(response_body) == 3 - assert response_body == [ - { - "description": "", - "id": 1, - "is_complete": False, - "title": "Water the garden 🌷"}, - { - "description": "", - "id": 2, - "is_complete": False, - "title": "Answer forgotten email 📧"}, - { - "description": "", - "id": 3, - "is_complete": False, - "title": "Pay my outstanding tickets 😭"} - ] +# # Assert +# assert response.status_code == 200 +# assert len(response_body) == 3 +# assert response_body == [ +# { +# "description": "", +# "id": 1, +# "is_complete": False, +# "title": "Water the garden 🌷"}, +# { +# "description": "", +# "id": 2, +# "is_complete": False, +# "title": "Answer forgotten email 📧"}, +# { +# "description": "", +# "id": 3, +# "is_complete": False, +# "title": "Pay my outstanding tickets 😭"} +# ] -#Tests for goals sorted by title asc/desc -def test_get_goals_sorted_asc(client, three_goals): - # Act - response = client.get("/goals?sort=asc") - response_body = response.get_json() +# #Tests for goals sorted by title asc/desc +# def test_get_goals_sorted_asc(client, three_goals): +# # Act +# response = client.get("/goals?sort=asc") +# response_body = response.get_json() - # Assert - assert response.status_code == 200 - assert len(response_body) == 3 - assert response_body == [ - { - "id" : 2, - "title": "Eat healthy"}, - { "id" : 3, - "title": "Get better sleep"}, - { - "id" : 1, - "title": "Get more excercise"} - ] +# # Assert +# assert response.status_code == 200 +# assert len(response_body) == 3 +# assert response_body == [ +# { +# "id" : 2, +# "title": "Eat healthy"}, +# { "id" : 3, +# "title": "Get better sleep"}, +# { +# "id" : 1, +# "title": "Get more excercise"} +# ] -#Test for getting a response body with goals sorted by title -def test_get_goals_sorted_desc(client, three_goals): - # Act - response = client.get("/goals?sort=desc") - response_body = response.get_json() +# #Test for getting a response body with goals sorted by title +# def test_get_goals_sorted_desc(client, three_goals): +# # Act +# response = client.get("/goals?sort=desc") +# response_body = response.get_json() - # Assert - assert response.status_code == 200 - assert len(response_body) == 3 - assert response_body == [ - { - "id" : 1, - "title": "Get more excercise"}, - { "id" : 3, - "title": "Get better sleep"}, - { - "id" : 2, - "title": "Eat healthy"} - ] +# # Assert +# assert response.status_code == 200 +# assert len(response_body) == 3 +# assert response_body == [ +# { +# "id" : 1, +# "title": "Get more excercise"}, +# { "id" : 3, +# "title": "Get better sleep"}, +# { +# "id" : 2, +# "title": "Eat healthy"} +# ] From 802e2ec9de02c8335073fb530abd7d0f93e0e6c8 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Thu, 13 May 2021 10:05:11 -0700 Subject: [PATCH 16/18] changes key in response dictionary from 'token' to 'key' for mark_complete(task_id) funcion in routes.py. --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index e82c47d87..5d1c9bea1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -128,7 +128,7 @@ def mark_complete(task_id): text = f"Someone just completed the task {task.title}" response = requests.post('https://slack.com/api/chat.postMessage', { - 'token': slack_token, + 'key': slack_token, 'channel': slack_channel, 'text': text, 'icon_url': slack_icon_url From 9a89ccd4b572ca0845149d378f4c63617eeedc26 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Thu, 13 May 2021 10:11:44 -0700 Subject: [PATCH 17/18] REvert changes made to response dictionary key from key back to token in def mark_complete function in routes.py. --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 5d1c9bea1..e82c47d87 100644 --- a/app/routes.py +++ b/app/routes.py @@ -128,7 +128,7 @@ def mark_complete(task_id): text = f"Someone just completed the task {task.title}" response = requests.post('https://slack.com/api/chat.postMessage', { - 'key': slack_token, + 'token': slack_token, 'channel': slack_channel, 'text': text, 'icon_url': slack_icon_url From 4a12975d6c8cd407e1521b36ca550f15d778c9b8 Mon Sep 17 00:00:00 2001 From: Ruthie Newman Date: Thu, 13 May 2021 21:41:38 -0700 Subject: [PATCH 18/18] renames variable name for api token key --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index e82c47d87..022c2bbf1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -122,7 +122,7 @@ def mark_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() - slack_token = os.environ["SLACK_API_TOKEN"] + SLACK_TOKEN = os.environ["SLACK_API_TOKEN"] slack_channel = "task-notifications" slack_icon_url = "https://slack.com/api/chat.postMessage" text = f"Someone just completed the task {task.title}"