From cc9a62a5b19b96c34a9bca268ae0e54e0901d4c4 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Wed, 27 Oct 2021 20:04:18 -0500 Subject: [PATCH 01/14] Created Menv file and migration folder --- app/__init__.py | 6 +-- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++ migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++++ 5 files changed, 168 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 diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..7a2c84490 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,12 +15,10 @@ def create_app(test_config=None): app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI") else: app.config["TESTING"] = True - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task 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"} From ea55ed55824ee63a4cf66cf648c75d98d016e52a Mon Sep 17 00:00:00 2001 From: sjolivas Date: Wed, 3 Nov 2021 17:04:53 -0500 Subject: [PATCH 02/14] Created Task model and registered tasks_bp --- app/__init__.py | 2 ++ app/models/task.py | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 7a2c84490..ae1caa94a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -28,5 +28,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..96504b760 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,15 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True) + + def task_dict(self): + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": False if self.completed_at is None else True, + } From e61777da08d0c70fbb64a3e61f6882d47d6885c8 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Wed, 3 Nov 2021 17:06:56 -0500 Subject: [PATCH 03/14] Built task routes at /tasks & / endpoints --- app/routes.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..69d4c9805 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,57 @@ -from flask import Blueprint +from io import DEFAULT_BUFFER_SIZE +from app import db +from flask import Blueprint, request, jsonify +from app.models.task import Task +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST", "GET"]) +def handle_tasks(): + if request.method == "POST": + request_body = request.get_json() + if ( + "title" not in request_body or + "description" not in request_body or + "completed_at" not in request_body + ): + return jsonify({"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 jsonify({"task": new_task.task_dict()}), 201 + + elif request.method == "GET": + tasks = Task.query.all() + task_response = [task.task_dict() for task in tasks] + return jsonify(task_response), 200 + + +@tasks_bp.route("/", methods={"GET", "PUT", "DELETE"}) +def handle_one_task(task_id): + task = Task.query.get(task_id) + if task is None: + return jsonify(task), 404 + + if request.method == "GET": + return ({"task": task.task_dict()}), 200 + + elif request.method == "PUT": + request_body = request.get_json() + task.title=request_body["title"] + task.description=request_body["description"] + + db.session.commit() + return jsonify({"task": task.task_dict()}), 200 + + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + response_body = f'Task {task.task_id} "{task.title}" successfully deleted' + return jsonify({"details": response_body}), 200 \ No newline at end of file From 287aea8607e450e0a8516f93a3249b0f089672e5 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Wed, 3 Nov 2021 17:57:16 -0500 Subject: [PATCH 04/14] Updated migration version --- migrations/versions/106deb886b95_.py | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 migrations/versions/106deb886b95_.py diff --git a/migrations/versions/106deb886b95_.py b/migrations/versions/106deb886b95_.py new file mode 100644 index 000000000..a0d9bca0a --- /dev/null +++ b/migrations/versions/106deb886b95_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 106deb886b95 +Revises: +Create Date: 2021-11-03 17:48:10.369440 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '106deb886b95' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### From 3e84b1b5150eefca3c3d00b36542b88a06a713bc Mon Sep 17 00:00:00 2001 From: sjolivas Date: Wed, 3 Nov 2021 18:36:44 -0500 Subject: [PATCH 05/14] Added asc and desc functionality to task routes --- app/routes.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 69d4c9805..16d026b84 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app import db from flask import Blueprint, request, jsonify from app.models.task import Task +from sqlalchemy import asc, desc tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -28,8 +29,16 @@ def handle_tasks(): return jsonify({"task": new_task.task_dict()}), 201 elif request.method == "GET": - tasks = Task.query.all() - task_response = [task.task_dict() for task in tasks] + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(asc("title")) + task_response = [task.task_dict() for task in tasks] + elif sort_query == "desc": + tasks = Task.query.order_by(desc("title")) + task_response = [task.task_dict() for task in tasks] + else: + tasks = Task.query.all() + task_response = [task.task_dict() for task in tasks] return jsonify(task_response), 200 From 360dd1c0d5975bea60aaf5df7d766ea787603af2 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Wed, 3 Nov 2021 20:03:05 -0500 Subject: [PATCH 06/14] Added two tasks endpoints & PATCH method to routes.py --- app/routes.py | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 16d026b84..f7d87a685 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,6 +3,7 @@ from flask import Blueprint, request, jsonify from app.models.task import Task from sqlalchemy import asc, desc +from datetime import datetime tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -63,4 +64,29 @@ def handle_one_task(task_id): db.session.delete(task) db.session.commit() response_body = f'Task {task.task_id} "{task.title}" successfully deleted' - return jsonify({"details": response_body}), 200 \ No newline at end of file + return jsonify({"details": response_body}), 200 + + +@tasks_bp.route("/mark_complete", methods=["PATCH"]) +def mark_task_complete(task_id): + task = Task.query.get(task_id) + if task is None: + return jsonify(task), 404 + current_datetime = datetime.now() + task.completed_at = current_datetime + + db.session.commit() + + return jsonify({"task": task.task_dict()}), 200 + + +@tasks_bp.route("/mark_incomplete", methods=["PATCH"]) +def mark_task_incomplete(task_id): + task = Task.query.get(task_id) + if task is None: + return jsonify(task), 404 + task.completed_at = None + + db.session.commit() + + return jsonify({"task": task.task_dict()}), 200 From 773e6383552461487cd24066e1829e38d1284215 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Wed, 3 Nov 2021 23:34:40 -0500 Subject: [PATCH 07/14] Added slack bot functionality --- app/routes.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index f7d87a685..5aa952bb6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,6 +4,10 @@ from app.models.task import Task from sqlalchemy import asc, desc from datetime import datetime +import os, requests +from dotenv import load_dotenv + +load_dotenv() tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -69,11 +73,22 @@ def handle_one_task(task_id): @tasks_bp.route("/mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): - task = Task.query.get(task_id) + URL = "https://slack.com/api/chat.postMessage" + task= Task.query.get(task_id) + if task is None: return jsonify(task), 404 - current_datetime = datetime.now() - task.completed_at = current_datetime + + current_time = datetime.now() + task.completed_at = current_time + BOT_TOKEN = os.environ.get('BOT_TOKEN') + requests.post( + URL, headers= {"Authorization": f"Bearer {BOT_TOKEN}"}, + data={ + "channel", "task_notifications", + "text", f"Someone just completed the task {task.title}" + } + ) db.session.commit() From 6db250b1167781380ecfc4282c80ab5398d3cf57 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Thu, 4 Nov 2021 00:21:43 -0500 Subject: [PATCH 08/14] Added model, registered bp, HTTP methods for Goals --- app/__init__.py | 3 +++ app/models/goal.py | 9 ++++++++- app/routes.py | 49 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index ae1caa94a..1cb66cc5f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -31,4 +31,7 @@ def create_app(test_config=None): from .routes import tasks_bp app.register_blueprint(tasks_bp) + from .routes import goals_bp + app.register_blueprint(goals_bp) + return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..718b976cb 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,4 +3,11 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement = True) + title = db.Column(db.String) + + def goal_dict(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 5aa952bb6..796e96713 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,7 +1,8 @@ from io import DEFAULT_BUFFER_SIZE from app import db -from flask import Blueprint, request, jsonify +from flask import Blueprint, json, request, jsonify from app.models.task import Task +from app.models.goal import Goal from sqlalchemy import asc, desc from datetime import datetime import os, requests @@ -10,6 +11,7 @@ load_dotenv() tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @tasks_bp.route("", methods=["POST", "GET"]) def handle_tasks(): @@ -105,3 +107,48 @@ def mark_task_incomplete(task_id): db.session.commit() return jsonify({"task": task.task_dict()}), 200 + + +@goals_bp.route("", methods=["GET", "POST"]) +def handle_goals(): + if request.method == "POST": + request_body = request.get_json() + if "title" not in request_body: + return jsonify({"details": "Invalid data"}), 400 + + new_goal = Goal(title = request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + + return jsonify({"goal": new_goal.goal_dict()}), 201 + + elif request.method == "GET": + request_body = request.get_json() + goals = Goal.query.all() + goal_response = [goal.goal_dict() for goal in goals] + return jsonify(goal_response), 200 + + +@goals_bp.route("/", methods = ["GET", "PUT", "DELETE"]) +def handle_one_goal(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return jsonify(goal), 404 + + request_body = request.get_json() + if request.method == "GET": + return jsonify({"goal": goal.goal_dict()}), 200 + + elif request.method == "PUT": + if "title" not in request_body: + return jsonify({"details": "Invalid data"}), 400 + + goal.title = request_body["title"] + db.session.commit() + return jsonify({"goal": goal.goal_dict()}), 200 + + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + return jsonify({'details': f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}) From 5d790e585696c5b0bf2785f366ce660017aca620 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Thu, 4 Nov 2021 00:54:09 -0500 Subject: [PATCH 09/14] Completed wave 5 tests --- tests/test_wave_05.py | 58 ++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 6ba60c6fa..2af05b41f 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,4 +1,5 @@ import pytest +from app.models.goal import Goal def test_get_goals_no_saved_goals(client): # Act @@ -41,7 +42,7 @@ def test_get_goal(client, one_goal): } } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act @@ -49,10 +50,9 @@ def test_get_goal_not_found(client): response_body = response.get_json() # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == None + def test_create_goal(client): # Act @@ -71,30 +71,33 @@ def test_create_goal(client): } } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - pass # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Build a habit of going outside daily" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == {"goal": { + "id": 1, + "title": "Build a habit of going outside daily" + }} -@pytest.mark.skip(reason="test to be completed by student") + +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - pass # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body is None + def test_delete_goal(client, one_goal): @@ -113,18 +116,17 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - pass - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == None + assert Goal.query.all() == [] + def test_create_goal_missing_title(client): From c38523069e7027170b7e748832c9849680627660 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Thu, 4 Nov 2021 14:01:02 -0500 Subject: [PATCH 10/14] Established Goal and Task relationship --- app/models/goal.py | 13 ++++++++++++- app/models/task.py | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 718b976cb..69c534ba0 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,9 +5,20 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement = True) title = db.Column(db.String) + # tasks = db.relationship("Task", back_populates="goal", lazy="True") + tasks = db.relationship("Task", back_populates="goal") + def goal_dict(self): return { "id": self.goal_id, "title": self.title - } \ No newline at end of file + } + + + def goal_and_task_dict(self): + return{ + "id": self.goal_id, + "title": self.title, + "tasks": [task.task_and_goal_dict() for task in self.tasks] + } diff --git a/app/models/task.py b/app/models/task.py index 96504b760..5d04f0959 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,12 +1,15 @@ from flask import current_app from app import db - class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) + # goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id")) + goal = db.relationship("Goal", back_populates="tasks") + def task_dict(self): return { @@ -15,3 +18,13 @@ def task_dict(self): "description": self.description, "is_complete": False if self.completed_at is None else True, } + + + def task_and_goal_dict(self): + return { + "id":self.task_id, + "title": self.title, + "description": self.description, + "is_complete": False if self.completed_at is None else True, + "goal_id": self.goal_id + } From 004f704f2606eeab6543897e32f119371fe01c9d Mon Sep 17 00:00:00 2001 From: sjolivas Date: Thu, 4 Nov 2021 14:01:36 -0500 Subject: [PATCH 11/14] Migrations for Goal and Task relationship update --- ...a2_updated_goals_and_tasks_one_to_many_.py | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 migrations/versions/93b62a26e1a2_updated_goals_and_tasks_one_to_many_.py diff --git a/migrations/versions/93b62a26e1a2_updated_goals_and_tasks_one_to_many_.py b/migrations/versions/93b62a26e1a2_updated_goals_and_tasks_one_to_many_.py new file mode 100644 index 000000000..1c3458ab5 --- /dev/null +++ b/migrations/versions/93b62a26e1a2_updated_goals_and_tasks_one_to_many_.py @@ -0,0 +1,32 @@ +"""Updated Goals and Tasks, one to many relationship + +Revision ID: 93b62a26e1a2 +Revises: 106deb886b95 +Create Date: 2021-11-04 12:15:40.652621 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '93b62a26e1a2' +down_revision = '106deb886b95' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_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') + op.drop_column('goal', 'title') + # ### end Alembic commands ### From 7c55119fe6481cc6423f8c890f98f18eb589934a Mon Sep 17 00:00:00 2001 From: sjolivas Date: Thu, 4 Nov 2021 14:03:29 -0500 Subject: [PATCH 12/14] Added endpoint //tasks & verb functions --- app/routes.py | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index 796e96713..d8facaa25 100644 --- a/app/routes.py +++ b/app/routes.py @@ -56,6 +56,8 @@ def handle_one_task(task_id): return jsonify(task), 404 if request.method == "GET": + if task.goal_id: + return jsonify({"task": task.task_and_goal_dict()}) return ({"task": task.task_dict()}), 200 elif request.method == "PUT": @@ -75,21 +77,18 @@ def handle_one_task(task_id): @tasks_bp.route("/mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): - URL = "https://slack.com/api/chat.postMessage" task= Task.query.get(task_id) - if task is None: return jsonify(task), 404 current_time = datetime.now() task.completed_at = current_time + BOT_TOKEN = os.environ.get('BOT_TOKEN') requests.post( - URL, headers= {"Authorization": f"Bearer {BOT_TOKEN}"}, - data={ - "channel", "task_notifications", - "text", f"Someone just completed the task {task.title}" - } + url="https://slack.com/api/chat.postMessage", + headers={"Authorization": f"Bearer {BOT_TOKEN}"}, + data={"channel": "task_notifications", "text": f"Someone just completed the task {task.title}"} ) db.session.commit() @@ -152,3 +151,29 @@ def handle_one_goal(goal_id): db.session.delete(goal) db.session.commit() return jsonify({'details': f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}) + + +@goals_bp.route("//tasks", methods=["POST", "GET"]) +def handle_goal_and_task(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return jsonify(goal), 404 + + if request.method=="POST": + request_body = request.get_json() + + for task_id in request_body["task_ids"]: + task = Task.query.get(task_id) + if task is None: + return jsonify(None), 404 + goal.tasks.append(task) + db.session.commit() + + task_ids = [] + for task in goal.tasks: + task_ids.append(task.task_id) + + return jsonify({"id": goal.goal_id, "task_ids": task_ids}), 200 + + elif request.method == "GET": + return jsonify(goal.goal_and_task_dict()), 200 From 582c25373ffd9ad7904a5949389db1a1262f63f2 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Thu, 4 Nov 2021 14:58:59 -0500 Subject: [PATCH 13/14] Modified the Goal and Task realtionship --- app/models/goal.py | 4 +--- app/models/task.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 69c534ba0..8ff2bd3f0 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,12 +1,10 @@ from flask import current_app from app import db - class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement = True) title = db.Column(db.String) - # tasks = db.relationship("Task", back_populates="goal", lazy="True") - tasks = db.relationship("Task", back_populates="goal") + tasks = db.relationship("Task", back_populates="goal", lazy=True) def goal_dict(self): diff --git a/app/models/task.py b/app/models/task.py index 5d04f0959..a4e193d75 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,8 +6,7 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) - # goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) - goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id")) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) goal = db.relationship("Goal", back_populates="tasks") From 0dc4ce61b5aee16e9542ad947249d2b5da29e0e1 Mon Sep 17 00:00:00 2001 From: sjolivas Date: Fri, 5 Nov 2021 20:20:53 -0500 Subject: [PATCH 14/14] Added Procfile --- Procfile | 1 + app/routes.py | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) 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 diff --git a/app/routes.py b/app/routes.py index d8facaa25..abd98b317 100644 --- a/app/routes.py +++ b/app/routes.py @@ -39,13 +39,13 @@ def handle_tasks(): sort_query = request.args.get("sort") if sort_query == "asc": tasks = Task.query.order_by(asc("title")) - task_response = [task.task_dict() for task in tasks] elif sort_query == "desc": tasks = Task.query.order_by(desc("title")) - task_response = [task.task_dict() for task in tasks] else: tasks = Task.query.all() - task_response = [task.task_dict() for task in tasks] + + task_response = [task.task_dict() for task in tasks] + return jsonify(task_response), 200 @@ -159,7 +159,10 @@ def handle_goal_and_task(goal_id): if goal is None: return jsonify(goal), 404 - if request.method=="POST": + if request.method == "GET": + return jsonify(goal.goal_and_task_dict()), 200 + + elif request.method=="POST": request_body = request.get_json() for task_id in request_body["task_ids"]: @@ -174,6 +177,3 @@ def handle_goal_and_task(goal_id): task_ids.append(task.task_id) return jsonify({"id": goal.goal_id, "task_ids": task_ids}), 200 - - elif request.method == "GET": - return jsonify(goal.goal_and_task_dict()), 200