From 6e39426059198e76ebcdde861a32ff18f7f57dfd Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Thu, 6 May 2021 18:30:51 -0700 Subject: [PATCH 01/11] Wave 1 all tests passing with new routes delete_task, update_task, create_task, get_one_task, tasks_index.Adds to_json() method to Task. --- app/__init__.py | 5 +- app/models/task.py | 18 +++++- app/routes.py | 86 +++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++++++++ migrations/env.py | 90 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++ migrations/versions/26ed51c311ee_.py | 39 ++++++++++++ 8 files changed, 309 insertions(+), 4 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/26ed51c311ee_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..994c63695 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,8 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - + from app.models.task import Task + from .routes import tasks_bp + app.register_blueprint(tasks_bp) + return app diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..a12dcd8f1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,20 @@ -from flask import current_app from app import db - +from flask import current_app, jsonify class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True) + __tablename__ = "tasks" + + def to_json(self): + if self.completed_at is None: + self.completed_at = False + + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.completed_at + } diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..df405aa0b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,86 @@ -from flask import Blueprint +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, request, make_response + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["GET"], strict_slashes=False) +def tasks_index(): + tasks = Task.query.all() + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_json()) + return jsonify(tasks_response), 200 + +@tasks_bp.route("/", methods=["GET"], strict_slashes=False) +def get_one_task(task_id): + task = Task.query.get(task_id) + + if task == None: + return make_response("", 404) + + return { + "task": task.to_json()}, 200 + + +@tasks_bp.route("", methods=["POST"], strict_slashes=False) +def create_task(): + request_body = request.get_json() + try: + new_task = Task(title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"]) + except KeyError: + return make_response({ + "details": "Invalid data" + }, 400) + + db.session.add(new_task) + db.session.commit() + + return { + "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": False + + } + }, 201 + +@tasks_bp.route("/", methods=["PUT"], strict_slashes=False) +def update_task(task_id): + task = Task.query.get(task_id) + form_data = request.get_json() + + if task == None: + return make_response("", 404) + + task.title = form_data["title"] + task.description = form_data["description"] + task.is_complete = form_data["completed_at"] + + db.session.commit() + + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + }, 200) + +@tasks_bp.route("/", methods=["DELETE"], strict_slashes=False) +def delete_task(task_id): + task = Task.query.get(task_id) + if not task: + return make_response("", 404) + + db.session.delete(task) + db.session.commit() + + return make_response({ + "details": f'Task {task.task_id} "{task.title}" successfully deleted' + }) \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# 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,flask_migrate + +[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 + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[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..42438a5a2 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,90 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +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 = current_app.extensions['migrate'].db.engine + + 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/26ed51c311ee_.py b/migrations/versions/26ed51c311ee_.py new file mode 100644 index 000000000..2e542db9c --- /dev/null +++ b/migrations/versions/26ed51c311ee_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 26ed51c311ee +Revises: +Create Date: 2021-05-06 11:05:24.228964 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '26ed51c311ee' +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('tasks', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('tasks') + op.drop_table('goal') + # ### end Alembic commands ### From c6860314a405ae9b5717260f91214ff345e3d2a0 Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Fri, 7 May 2021 10:16:38 -0700 Subject: [PATCH 02/11] modifies to_json() in task.py with local variable completed_at = False. Wave 1 responses dried up with implementation of to_json(). --- app/models/task.py | 7 ++++--- app/routes.py | 20 +++++--------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index a12dcd8f1..810906061 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,12 +9,13 @@ class Task(db.Model): __tablename__ = "tasks" def to_json(self): - if self.completed_at is None: - self.completed_at = False + if self.completed_at == None: + completed_at = self.completed_at + completed_at = False return { "id": self.task_id, "title": self.title, "description": self.description, - "is_complete": self.completed_at + "is_complete": completed_at } diff --git a/app/routes.py b/app/routes.py index df405aa0b..217c25558 100644 --- a/app/routes.py +++ b/app/routes.py @@ -31,6 +31,7 @@ def create_task(): new_task = Task(title=request_body["title"], description=request_body["description"], completed_at=request_body["completed_at"]) + except KeyError: return make_response({ "details": "Invalid data" @@ -40,13 +41,7 @@ def create_task(): db.session.commit() return { - "task": { - "id": new_task.task_id, - "title": new_task.title, - "description": new_task.description, - "is_complete": False - - } + "task": new_task.to_json() }, 201 @tasks_bp.route("/", methods=["PUT"], strict_slashes=False) @@ -63,14 +58,9 @@ def update_task(task_id): db.session.commit() - return make_response({ - "task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False - } - }, 200) + return { + "task": task.to_json() + }, 200 @tasks_bp.route("/", methods=["DELETE"], strict_slashes=False) def delete_task(task_id): From e29713717ebf5f3c0c5a1a38fd7efe9f56a40910 Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Fri, 7 May 2021 16:19:05 -0700 Subject: [PATCH 03/11] Updates tasks_index to allow asc + desc sorting by title. Wave 2 passes all tests. --- app/routes.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 217c25558..3c038167f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,16 +1,26 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, request, make_response +from sqlalchemy import desc, asc tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @tasks_bp.route("", methods=["GET"], strict_slashes=False) def tasks_index(): - tasks = Task.query.all() + sort_type = request.args.get("sort") + + if sort_type == "desc": + tasks = Task.query.order_by(Task.title.desc()) + elif sort_type == "asc": + tasks = Task.query.order_by(Task.title.asc()) + else: + tasks = Task.query.all() + tasks_response = [] for task in tasks: tasks_response.append(task.to_json()) + return jsonify(tasks_response), 200 @tasks_bp.route("/", methods=["GET"], strict_slashes=False) From 4a772b98ef2fc1e4cd4c9a62de37810276bc3435 Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Sat, 8 May 2021 15:59:40 -0700 Subject: [PATCH 04/11] Adds task_mark_complete and task_mark_incomplete to routes.py. Wave - All tests passing. --- app/models/task.py | 3 +++ app/routes.py | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 810906061..5fa6f7245 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -12,6 +12,9 @@ def to_json(self): if self.completed_at == None: completed_at = self.completed_at completed_at = False + elif self.completed_at != None: + completed_at = self.completed_at + completed_at = True return { "id": self.task_id, diff --git a/app/routes.py b/app/routes.py index 3c038167f..3465da4fb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app.models.task import Task from flask import Blueprint, jsonify, request, make_response from sqlalchemy import desc, asc +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -83,4 +84,35 @@ def delete_task(task_id): return make_response({ "details": f'Task {task.task_id} "{task.title}" successfully deleted' - }) \ No newline at end of file + }) + +@tasks_bp.route("//mark_complete", methods=["PATCH"], strict_slashes=False) +def task_mark_complete(task_id): + task = Task.query.get(task_id) + current_datetime = datetime.utcnow() + + if not task: + return make_response("", 404) + + task.completed_at = current_datetime + + db.session.commit() + + return { + "task": task.to_json() + }, 200 + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"], strict_slashes=False) +def task_mark_incomplete(task_id): + task = Task.query.get(task_id) + + if not task: + return make_response("", 404) + elif task.completed_at != None: + task.completed_at = None + + db.session.commit() + + return { + "task": task.to_json() + }, 200 \ No newline at end of file From 67e39c32f7a3ccc97a286ba78ce885dbb3a72395 Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Mon, 10 May 2021 18:38:55 -0700 Subject: [PATCH 05/11] Adds slack bot message when task is completed; mark_task_complete in routes.py --- app/__init__.py | 6 +++++- app/models/task.py | 11 +++++------ app/routes.py | 18 +++++++++++++++--- requirements.txt | 6 ++++++ 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 994c63695..19d0fbd2c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,7 +3,7 @@ from flask_migrate import Migrate import os from dotenv import load_dotenv - +import slack db = SQLAlchemy() migrate = Migrate() @@ -21,6 +21,10 @@ def create_app(test_config=None): app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") + + SLACK_TOKEN = os.environ.get('SLACK_TOKEN') + + slack_client = slack.RTMClient(token=SLACK_TOKEN) # Import models here for Alembic setup from app.models.task import Task diff --git a/app/models/task.py b/app/models/task.py index 5fa6f7245..15a75c76f 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,16 +9,15 @@ class Task(db.Model): __tablename__ = "tasks" def to_json(self): + is_complete = self.completed_at if self.completed_at == None: - completed_at = self.completed_at - completed_at = False - elif self.completed_at != None: - completed_at = self.completed_at - completed_at = True + is_complete = False + else: + is_complete = True return { "id": self.task_id, "title": self.title, "description": self.description, - "is_complete": completed_at + "is_complete": is_complete } diff --git a/app/routes.py b/app/routes.py index 3465da4fb..43f59fad3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,7 +3,8 @@ from flask import Blueprint, jsonify, request, make_response from sqlalchemy import desc, asc from datetime import datetime - +import os +import slack tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -19,6 +20,7 @@ def tasks_index(): tasks = Task.query.all() tasks_response = [] + for task in tasks: tasks_response.append(task.to_json()) @@ -38,6 +40,7 @@ def get_one_task(task_id): @tasks_bp.route("", methods=["POST"], strict_slashes=False) def create_task(): request_body = request.get_json() + try: new_task = Task(title=request_body["title"], description=request_body["description"], @@ -76,6 +79,7 @@ def update_task(task_id): @tasks_bp.route("/", methods=["DELETE"], strict_slashes=False) def delete_task(task_id): task = Task.query.get(task_id) + if not task: return make_response("", 404) @@ -93,14 +97,22 @@ def task_mark_complete(task_id): if not task: return make_response("", 404) - - task.completed_at = current_datetime + else: + task.completed_at = current_datetime db.session.commit() + + client = slack.WebClient(os.environ["SLACK_TOKEN"], timeout=30) + client.chat_postMessage( + channel="task-notifications", + text=f"Someone just completed the task {task.title}") + return { "task": task.to_json() }, 200 + + @tasks_bp.route("//mark_incomplete", methods=["PATCH"], strict_slashes=False) def task_mark_incomplete(task_id): diff --git a/requirements.txt b/requirements.txt index cfdf74050..e5315b483 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,6 @@ +aiohttp==3.7.4.post0 alembic==1.5.4 +async-timeout==3.0.1 attrs==20.3.0 autopep8==1.5.5 certifi==2020.12.5 @@ -14,6 +16,7 @@ itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +multidict==5.1.0 packaging==20.9 pluggy==0.13.1 psycopg2-binary==2.8.6 @@ -26,7 +29,10 @@ python-dotenv==0.15.0 python-editor==1.0.4 requests==2.25.1 six==1.15.0 +slackclient==2.9.3 SQLAlchemy==1.3.23 toml==0.10.2 +typing-extensions==3.10.0.0 urllib3==1.26.4 Werkzeug==1.0.1 +yarl==1.6.3 From 6234a5524742591a8a5aa3a3733804fd0f2cef31 Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Tue, 11 May 2021 16:26:17 -0700 Subject: [PATCH 06/11] Adds goal.py, Goal model, and functions get_one_goal, goals_index, delete_goal, update_goal, and create_goal. All tests for wave 5 pass. --- app/__init__.py | 9 +-- app/models/goal.py | 8 ++ app/routes.py | 74 ++++++++++++++++++- ...3_adds_goal_model_with_table_name_goals.py | 37 ++++++++++ 4 files changed, 120 insertions(+), 8 deletions(-) create mode 100644 migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py diff --git a/app/__init__.py b/app/__init__.py index 19d0fbd2c..cfa96cf3f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,7 +3,6 @@ from flask_migrate import Migrate import os from dotenv import load_dotenv -import slack db = SQLAlchemy() migrate = Migrate() @@ -21,10 +20,6 @@ def create_app(test_config=None): app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") - - SLACK_TOKEN = os.environ.get('SLACK_TOKEN') - - slack_client = slack.RTMClient(token=SLACK_TOKEN) # Import models here for Alembic setup from app.models.task import Task @@ -35,7 +30,9 @@ def create_app(test_config=None): # Register Blueprints here from app.models.task import Task - from .routes import tasks_bp + from app.models.goal import Goal + from .routes import tasks_bp, goals_bp app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..9ae56fb8d 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,11 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + __tablename__ = "goals" + + def to_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 43f59fad3..97be3dc08 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,5 +1,6 @@ from app import db from app.models.task import Task +from app.models.goal import Goal from flask import Blueprint, jsonify, request, make_response from sqlalchemy import desc, asc from datetime import datetime @@ -7,6 +8,76 @@ import slack tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +@goals_bp.route("", methods=["POST"], strict_slashes=False) +def create_goal(): + request_body = request.get_json() + + try: + new_goal = Goal(title=request_body["title"]) + + except KeyError: + return make_response({ + "details": "Invalid data" + }, 400) + + db.session.add(new_goal) + db.session.commit() + + return { + "goal": new_goal.to_json() + }, 201 + +@goals_bp.route("/", methods=["GET"], strict_slashes=False) +def get_one_goal(goal_id): + goal = Goal.query.get(goal_id) + + if goal == None: + return make_response("", 404) + + return { + "goal": goal.to_json()}, 200 + +@goals_bp.route("", methods=["GET"], strict_slashes=False) +def goals_index(): + goals = Goal.query.all() + goals_response = [] + for goal in goals: + goals_response.append(goal.to_json()) + + return jsonify(goals_response), 200 + +@goals_bp.route("/", methods=["PUT"], strict_slashes=False) +def update_goal(goal_id): + goal = Goal.query.get(goal_id) + form_data = request.get_json() + + if goal == None: + return make_response("", 404) + + goal.title = form_data["title"] + + db.session.commit() + + return { + "goal": goal.to_json() + }, 200 + +@goals_bp.route("/", methods=["DELETE"], strict_slashes=False) +def delete_goal(goal_id): + goal = Goal.query.get(goal_id) + + if not goal: + return make_response("", 404) + + db.session.delete(goal) + db.session.commit() + + return make_response({ + "details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted' + }) + @tasks_bp.route("", methods=["GET"], strict_slashes=False) def tasks_index(): @@ -102,8 +173,7 @@ def task_mark_complete(task_id): db.session.commit() - client = slack.WebClient(os.environ["SLACK_TOKEN"], timeout=30) - + client = slack.WebClient(os.environ["SLACK_TOKEN"]) client.chat_postMessage( channel="task-notifications", text=f"Someone just completed the task {task.title}") diff --git a/migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py b/migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py new file mode 100644 index 000000000..d794eed0a --- /dev/null +++ b/migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py @@ -0,0 +1,37 @@ +"""Adds goal model with table name 'goals' + +Revision ID: cb1c207b48c3 +Revises: 26ed51c311ee +Create Date: 2021-05-11 10:19:48.413877 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cb1c207b48c3' +down_revision = '26ed51c311ee' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goals', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('goal_id') + ) + 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') + ) + op.drop_table('goals') + # ### end Alembic commands ### From 74049e19ebf04f773d2ff6fc649b88d97add7f28 Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Tue, 11 May 2021 18:07:06 -0700 Subject: [PATCH 07/11] Creates one-to-many relationship between parent class Goal and child class Task. Two routes added to routes.py for wave 6. --- app/models/goal.py | 1 + app/models/task.py | 1 + app/routes.py | 8 ++++++++ migrations/versions/9c820731b44a_.py | 30 ++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 migrations/versions/9c820731b44a_.py diff --git a/app/models/goal.py b/app/models/goal.py index 9ae56fb8d..b129c080a 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -6,6 +6,7 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) __tablename__ = "goals" + child = db.relationship("Task", lazy=True) def to_json(self): return { diff --git a/app/models/task.py b/app/models/task.py index 15a75c76f..2fc25073c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,6 +7,7 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) __tablename__ = "tasks" + goal_id = db.Column(db.Integer, db.ForeignKey("goals.goal_id"), nullable=True) def to_json(self): is_complete = self.completed_at diff --git a/app/routes.py b/app/routes.py index 97be3dc08..8bd8e919a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,6 +10,14 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") +@goals_bp.route("/goals//tasks", methods=["POST"], strict_slashes=False) +def assign_tasks_to_one_goal(goal_id, task_ids): + pass + +@goals_bp.route("/goals//tasks", methods=["GET"], strict_slashes=False) +def get_tasks_from_goal_id(goal_id): + pass + @goals_bp.route("", methods=["POST"], strict_slashes=False) def create_goal(): request_body = request.get_json() diff --git a/migrations/versions/9c820731b44a_.py b/migrations/versions/9c820731b44a_.py new file mode 100644 index 000000000..6ec96bad0 --- /dev/null +++ b/migrations/versions/9c820731b44a_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 9c820731b44a +Revises: cb1c207b48c3 +Create Date: 2021-05-11 18:05:42.697590 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9c820731b44a' +down_revision = 'cb1c207b48c3' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('tasks', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'tasks', 'goals', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'tasks', type_='foreignkey') + op.drop_column('tasks', 'goal_id') + # ### end Alembic commands ### From 44aeaf0c426e08e3bb3e4e75e59421ca97568cbe Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Wed, 12 May 2021 18:24:33 -0700 Subject: [PATCH 08/11] Wave 6 passes. Modifies task and goal to one-to-many relationship. Adds two routes --- app/models/goal.py | 17 ++++--- app/models/task.py | 21 ++++++--- app/routes.py | 44 +++++++++++++++---- migrations/alembic.ini | 7 +-- migrations/env.py | 8 +++- migrations/versions/9c820731b44a_.py | 30 ------------- .../{26ed51c311ee_.py => 9e580fca5438_.py} | 13 +++--- ...3_adds_goal_model_with_table_name_goals.py | 37 ---------------- 8 files changed, 77 insertions(+), 100 deletions(-) delete mode 100644 migrations/versions/9c820731b44a_.py rename migrations/versions/{26ed51c311ee_.py => 9e580fca5438_.py} (72%) delete mode 100644 migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py diff --git a/app/models/goal.py b/app/models/goal.py index b129c080a..dd026e2df 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,12 +4,19 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) - title = db.Column(db.String) + title = db.Column(db.Text) + tasks = db.relationship("Task", backref="goals", lazy=True) __tablename__ = "goals" - child = db.relationship("Task", lazy=True) - + def to_json(self): - return { + if self.tasks != []: + return { "id": self.goal_id, "title": self.title, - } \ No newline at end of file + "tasks": self.tasks + } + else: + return { + "id": self.goal_id, + "title": self.title, + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 2fc25073c..68b8fedf4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,8 +6,8 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) - __tablename__ = "tasks" goal_id = db.Column(db.Integer, db.ForeignKey("goals.goal_id"), nullable=True) + __tablename__ = "tasks" def to_json(self): is_complete = self.completed_at @@ -15,10 +15,17 @@ def to_json(self): is_complete = False else: is_complete = True - + if self.goal_id != None: + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete, + "goal_id": self.goal_id + } return { - "id": self.task_id, - "title": self.title, - "description": self.description, - "is_complete": is_complete - } + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8bd8e919a..86205c5b3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,14 +10,41 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") -@goals_bp.route("/goals//tasks", methods=["POST"], strict_slashes=False) -def assign_tasks_to_one_goal(goal_id, task_ids): - pass +@goals_bp.route("//tasks", methods=["POST"], strict_slashes=False) +def assign_tasks_to_one_goal(goal_id): + request_body = request.get_json() + + goal = Goal.query.get(goal_id) + + task_ids = request_body["task_ids"] + + for task_id in task_ids: + task = Task.query.get(task_id) + goal.tasks.append(task) + + db.session.commit() + + return make_response({ + "id": goal.goal_id, + "task_ids": task_ids + }, 200) + -@goals_bp.route("/goals//tasks", methods=["GET"], strict_slashes=False) +@goals_bp.route("//tasks", methods=["GET"], strict_slashes=False) def get_tasks_from_goal_id(goal_id): - pass + goal = Goal.query.get_or_404(goal_id) + tasks = goal.tasks + tasks_response = [] + + for task in tasks: + tasks_response.append(task.to_json()) + + goal_response = goal.to_json() + goal_response["tasks"] = tasks_response + + return goal_response, 200 +0 @goals_bp.route("", methods=["POST"], strict_slashes=False) def create_goal(): request_body = request.get_json() @@ -39,6 +66,7 @@ def create_goal(): @goals_bp.route("/", methods=["GET"], strict_slashes=False) def get_one_goal(goal_id): + # get or 404 method??? goal = Goal.query.get(goal_id) if goal == None: @@ -194,11 +222,9 @@ def task_mark_complete(task_id): @tasks_bp.route("//mark_incomplete", methods=["PATCH"], strict_slashes=False) def task_mark_incomplete(task_id): - task = Task.query.get(task_id) + task = Task.query.get_or_404(task_id) - if not task: - return make_response("", 404) - elif task.completed_at != None: + if task.completed_at != None: task.completed_at = None db.session.commit() diff --git a/migrations/alembic.ini b/migrations/alembic.ini index ec9d45c26..f8ed4801f 100644 --- a/migrations/alembic.ini +++ b/migrations/alembic.ini @@ -11,7 +11,7 @@ # Logging configuration [loggers] -keys = root,sqlalchemy,alembic,flask_migrate +keys = root,sqlalchemy,alembic [handlers] keys = console @@ -34,11 +34,6 @@ level = INFO handlers = qualname = alembic -[logger_flask_migrate] -level = INFO -handlers = -qualname = flask_migrate - [handler_console] class = StreamHandler args = (sys.stderr,) diff --git a/migrations/env.py b/migrations/env.py index 42438a5a2..8b3fb3353 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -3,6 +3,8 @@ 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 @@ -70,7 +72,11 @@ def process_revision_directives(context, revision, directives): directives[:] = [] logger.info('No changes in schema detected.') - connectable = current_app.extensions['migrate'].db.engine + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) with connectable.connect() as connection: context.configure( diff --git a/migrations/versions/9c820731b44a_.py b/migrations/versions/9c820731b44a_.py deleted file mode 100644 index 6ec96bad0..000000000 --- a/migrations/versions/9c820731b44a_.py +++ /dev/null @@ -1,30 +0,0 @@ -"""empty message - -Revision ID: 9c820731b44a -Revises: cb1c207b48c3 -Create Date: 2021-05-11 18:05:42.697590 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '9c820731b44a' -down_revision = 'cb1c207b48c3' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('tasks', sa.Column('goal_id', sa.Integer(), nullable=True)) - op.create_foreign_key(None, 'tasks', 'goals', ['goal_id'], ['goal_id']) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'tasks', type_='foreignkey') - op.drop_column('tasks', 'goal_id') - # ### end Alembic commands ### diff --git a/migrations/versions/26ed51c311ee_.py b/migrations/versions/9e580fca5438_.py similarity index 72% rename from migrations/versions/26ed51c311ee_.py rename to migrations/versions/9e580fca5438_.py index 2e542db9c..9b79c5758 100644 --- a/migrations/versions/26ed51c311ee_.py +++ b/migrations/versions/9e580fca5438_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 26ed51c311ee +Revision ID: 9e580fca5438 Revises: -Create Date: 2021-05-06 11:05:24.228964 +Create Date: 2021-05-12 00:12:28.983412 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '26ed51c311ee' +revision = '9e580fca5438' down_revision = None branch_labels = None depends_on = None @@ -18,8 +18,9 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.create_table('goal', + op.create_table('goals', sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('title', sa.Text(), nullable=True), sa.PrimaryKeyConstraint('goal_id') ) op.create_table('tasks', @@ -27,6 +28,8 @@ def upgrade(): sa.Column('title', sa.String(), nullable=True), sa.Column('description', sa.String(), nullable=True), sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goals.goal_id'], ), sa.PrimaryKeyConstraint('task_id') ) # ### end Alembic commands ### @@ -35,5 +38,5 @@ def upgrade(): def downgrade(): # ### commands auto generated by Alembic - please adjust! ### op.drop_table('tasks') - op.drop_table('goal') + op.drop_table('goals') # ### end Alembic commands ### diff --git a/migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py b/migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py deleted file mode 100644 index d794eed0a..000000000 --- a/migrations/versions/cb1c207b48c3_adds_goal_model_with_table_name_goals.py +++ /dev/null @@ -1,37 +0,0 @@ -"""Adds goal model with table name 'goals' - -Revision ID: cb1c207b48c3 -Revises: 26ed51c311ee -Create Date: 2021-05-11 10:19:48.413877 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'cb1c207b48c3' -down_revision = '26ed51c311ee' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('goals', - sa.Column('goal_id', sa.Integer(), nullable=False), - sa.Column('title', sa.String(), nullable=True), - sa.PrimaryKeyConstraint('goal_id') - ) - 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') - ) - op.drop_table('goals') - # ### end Alembic commands ### From 136cb41a818c6fd677ff37e9e6f8b56e66b27afb Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Thu, 13 May 2021 00:02:14 -0700 Subject: [PATCH 09/11] Refactors final project submission. --- app/models/goal.py | 1 - app/models/task.py | 1 - app/routes.py | 41 ++++++++++------------------------------- tests/test_wave_06.py | 2 +- 4 files changed, 11 insertions(+), 34 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index dd026e2df..e39961632 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,7 +1,6 @@ from flask import current_app from app import db - class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.Text) diff --git a/app/models/task.py b/app/models/task.py index 68b8fedf4..0fc3274cb 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,4 @@ from app import db -from flask import current_app, jsonify class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) diff --git a/app/routes.py b/app/routes.py index 86205c5b3..111cfc920 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,7 +2,6 @@ from app.models.task import Task from app.models.goal import Goal from flask import Blueprint, jsonify, request, make_response -from sqlalchemy import desc, asc from datetime import datetime import os import slack @@ -66,8 +65,7 @@ def create_goal(): @goals_bp.route("/", methods=["GET"], strict_slashes=False) def get_one_goal(goal_id): - # get or 404 method??? - goal = Goal.query.get(goal_id) + goal = Goal.query.get_or_404(goal_id) if goal == None: return make_response("", 404) @@ -86,11 +84,8 @@ def goals_index(): @goals_bp.route("/", methods=["PUT"], strict_slashes=False) def update_goal(goal_id): - goal = Goal.query.get(goal_id) + goal = Goal.query.get_or_404(goal_id) form_data = request.get_json() - - if goal == None: - return make_response("", 404) goal.title = form_data["title"] @@ -102,10 +97,7 @@ def update_goal(goal_id): @goals_bp.route("/", methods=["DELETE"], strict_slashes=False) def delete_goal(goal_id): - goal = Goal.query.get(goal_id) - - if not goal: - return make_response("", 404) + goal = Goal.query.get_or_404(goal_id) db.session.delete(goal) db.session.commit() @@ -115,7 +107,7 @@ def delete_goal(goal_id): }) -@tasks_bp.route("", methods=["GET"], strict_slashes=False) +@tasks_bp.route("", methods=["GET"], strict_slashes=False) def tasks_index(): sort_type = request.args.get("sort") @@ -135,10 +127,7 @@ def tasks_index(): @tasks_bp.route("/", methods=["GET"], strict_slashes=False) def get_one_task(task_id): - task = Task.query.get(task_id) - - if task == None: - return make_response("", 404) + task = Task.query.get_or_404(task_id) return { "task": task.to_json()}, 200 @@ -167,11 +156,8 @@ def create_task(): @tasks_bp.route("/", methods=["PUT"], strict_slashes=False) def update_task(task_id): - task = Task.query.get(task_id) + task = Task.query.get_or_404(task_id) form_data = request.get_json() - - if task == None: - return make_response("", 404) task.title = form_data["title"] task.description = form_data["description"] @@ -185,10 +171,7 @@ def update_task(task_id): @tasks_bp.route("/", methods=["DELETE"], strict_slashes=False) def delete_task(task_id): - task = Task.query.get(task_id) - - if not task: - return make_response("", 404) + task = Task.query.get_or_404(task_id) db.session.delete(task) db.session.commit() @@ -199,16 +182,13 @@ def delete_task(task_id): @tasks_bp.route("//mark_complete", methods=["PATCH"], strict_slashes=False) def task_mark_complete(task_id): - task = Task.query.get(task_id) + task = Task.query.get_or_404(task_id) current_datetime = datetime.utcnow() - if not task: - return make_response("", 404) - else: - task.completed_at = current_datetime + task.completed_at = current_datetime db.session.commit() - + client = slack.WebClient(os.environ["SLACK_TOKEN"]) client.chat_postMessage( channel="task-notifications", @@ -219,7 +199,6 @@ def task_mark_complete(task_id): }, 200 - @tasks_bp.route("//mark_incomplete", methods=["PATCH"], strict_slashes=False) def task_mark_incomplete(task_id): task = Task.query.get_or_404(task_id) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 48ecd0523..a0dcdcf7c 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -90,7 +90,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): - response = client.get("/tasks/1") + response = client.get("/tasks/1") response_body = response.get_json() assert response.status_code == 200 From 3486352063722e03470d130bfa9990f5958734fc Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Thu, 13 May 2021 07:40:41 -0700 Subject: [PATCH 10/11] Updates wave 4/mark_complete to use requests, as opposed to slack.WebClient() with slack package. --- app/models/task.py | 2 +- app/routes.py | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 0fc3274cb..040f29eb9 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -27,4 +27,4 @@ def to_json(self): "title": self.title, "description": self.description, "is_complete": is_complete - } \ No newline at end of file + } diff --git a/app/routes.py b/app/routes.py index 111cfc920..ae910a754 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,7 +4,7 @@ from flask import Blueprint, jsonify, request, make_response from datetime import datetime import os -import slack +import requests tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") @@ -66,9 +66,6 @@ def create_goal(): @goals_bp.route("/", methods=["GET"], strict_slashes=False) def get_one_goal(goal_id): goal = Goal.query.get_or_404(goal_id) - - if goal == None: - return make_response("", 404) return { "goal": goal.to_json()}, 200 @@ -132,11 +129,10 @@ def get_one_task(task_id): return { "task": task.to_json()}, 200 - @tasks_bp.route("", methods=["POST"], strict_slashes=False) def create_task(): request_body = request.get_json() - + try: new_task = Task(title=request_body["title"], description=request_body["description"], @@ -158,7 +154,7 @@ def create_task(): def update_task(task_id): task = Task.query.get_or_404(task_id) form_data = request.get_json() - + task.title = form_data["title"] task.description = form_data["description"] task.is_complete = form_data["completed_at"] @@ -189,10 +185,11 @@ def task_mark_complete(task_id): db.session.commit() - client = slack.WebClient(os.environ["SLACK_TOKEN"]) - client.chat_postMessage( - channel="task-notifications", - text=f"Someone just completed the task {task.title}") + response = requests.get('https://slack.com/api/chat.postMessage',\ + params={ + "channel": "task-notifications", + "text": f"Someone just completed the task {task.title}"}, + headers={'Authorization': os.environ["SLACK_TOKEN"]}) return { "task": task.to_json() From 74e5b59965a8529f4de4a48d5838c969dc365239 Mon Sep 17 00:00:00 2001 From: Kaylyn Cardella Date: Thu, 13 May 2021 07:58:08 -0700 Subject: [PATCH 11/11] Small edits --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index ae910a754..6b96c5dda 100644 --- a/app/routes.py +++ b/app/routes.py @@ -189,7 +189,7 @@ def task_mark_complete(task_id): params={ "channel": "task-notifications", "text": f"Someone just completed the task {task.title}"}, - headers={'Authorization': os.environ["SLACK_TOKEN"]}) + headers={'Authorization': os.environ['SLACK_TOKEN']}) return { "task": task.to_json()