From ed23c084da318209ff844622152dab6063839238 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 15:05:04 -0700 Subject: [PATCH 01/38] Add migrations folder to tracking --- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++ migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++++ 4 files changed, 166 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 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 425ae715db66074c43978f72a3901a456e4127dc Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 15:25:23 -0700 Subject: [PATCH 02/38] Add Task model and table --- app/models/task.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..acdc881a6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,8 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True) + From 11fd4e7d87a8a52976e083f616ea9accbf520bfd Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 15:31:44 -0700 Subject: [PATCH 03/38] Create and register task bp --- app/__init__.py | 4 +++- app/routes.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..f0ff4e61b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - + from .routes import task_bp + app.register_blueprint(task_bp) + return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..ce64d60ec 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,5 @@ -from flask import Blueprint +from flask import Blueprint, jsonify, make_respponse, request, abort +from app.models.task import Task + +task_bp = Blueprint("task", __name__,url_prefix ="/task") From c3b6c8ee26cab6c18c7a1884cf59cd4164671061 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 15:51:52 -0700 Subject: [PATCH 04/38] Add to_dict method for Task class --- app/models/task.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/task.py b/app/models/task.py index acdc881a6..4a02abc3c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,3 +8,10 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) + def to_dict(self): + return { + "task_id": self.task_id, + "title": self.title, + "description": self.description, + "completed_at": self.completed_at + } \ No newline at end of file From a5c7820114e35add66f2bee23ca3a8a908b05f2e Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 15:54:12 -0700 Subject: [PATCH 05/38] Add create_task route --- app/routes.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index ce64d60ec..80934c50b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,5 +1,37 @@ -from flask import Blueprint, jsonify, make_respponse, request, abort +from flask import Blueprint, jsonify, make_response, request, abort +from flask.helpers import make_response +from flask.json import tojson_filter +from werkzeug.utils import header_property from app.models.task import Task +from app import db task_bp = Blueprint("task", __name__,url_prefix ="/task") +# Helper Functions +# TODO:PUT ANY HELPER FUNCTIONS header_property + +# Routes +@task_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + new_task = Task( + title=request_body["title"], + description=request_body["description"] + ) + + db.session.add(new_task) + db.session.commit() + + return make_response(new_task.to_dict(), 201) + +# @task_bp.route("", methods=["GET"]) +# def read_all_tasks(): +# tasks = Task.query.all() + +# task_response = [] +# for task in tasks: +# task_response.append( +# task.to_dict() +# ) +# return make_response(jsonify(task_response), 200) From 387f5400614f94899cb09ec9d76d5a95ffc59de6 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 15:55:37 -0700 Subject: [PATCH 06/38] Add read all tasks route --- app/routes.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/routes.py b/app/routes.py index 80934c50b..85d4fbd1a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -25,13 +25,13 @@ def create_task(): return make_response(new_task.to_dict(), 201) -# @task_bp.route("", methods=["GET"]) -# def read_all_tasks(): -# tasks = Task.query.all() - -# task_response = [] -# for task in tasks: -# task_response.append( -# task.to_dict() -# ) -# return make_response(jsonify(task_response), 200) +@task_bp.route("", methods=["GET"]) +def read_all_tasks(): + tasks = Task.query.all() + + task_response = [] + for task in tasks: + task_response.append( + task.to_dict() + ) + return make_response(jsonify(task_response), 200) From 6dd7de0d24624428bf54fdc12c7d5fe30231a731 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 16:26:12 -0700 Subject: [PATCH 07/38] Add check for title and description for POST --- app/routes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 85d4fbd1a..e6feeebfa 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,7 +5,7 @@ from app.models.task import Task from app import db -task_bp = Blueprint("task", __name__,url_prefix ="/task") +task_bp = Blueprint("task", __name__,url_prefix ="/tasks") # Helper Functions # TODO:PUT ANY HELPER FUNCTIONS header_property @@ -14,6 +14,8 @@ @task_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() + if "title" not in request_body or "description" not in request_body: + return make_response({"details": "Invalid data"}, 400) new_task = Task( title=request_body["title"], From 709f945d35288c9e18eb6ea018c7d9a1b1d9f3ae Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 28 Oct 2021 16:31:56 -0700 Subject: [PATCH 08/38] Add is_complete to Task model and table --- app/models/task.py | 1 + app/routes.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 4a02abc3c..759f5e26a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,7 @@ 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) + is_complete = db.Column(db.Boolean) completed_at = db.Column(db.DateTime, nullable=True) def to_dict(self): diff --git a/app/routes.py b/app/routes.py index e6feeebfa..63e1a650f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -19,7 +19,8 @@ def create_task(): new_task = Task( title=request_body["title"], - description=request_body["description"] + description=request_body["description"], + completed_at=request_body["completed_at"] ) db.session.add(new_task) From 787f870ab7d232c244cc429489e4931d6ec5b668 Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 29 Oct 2021 10:39:45 -0700 Subject: [PATCH 09/38] Add nullable constraints to Task class --- app/models/task.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 759f5e26a..22b546cef 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,9 +4,8 @@ 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) - is_complete = db.Column(db.Boolean) + title = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) def to_dict(self): From f3001eb68b11de991a5b57dc7e28cd726f9ddda8 Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 29 Oct 2021 13:10:59 -0700 Subject: [PATCH 10/38] Add code to pass create task test cases --- app/models/task.py | 5 ++++- app/routes.py | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 22b546cef..f30a8af59 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,9 +9,12 @@ class Task(db.Model): completed_at = db.Column(db.DateTime, nullable=True) def to_dict(self): + if not self.completed_at: + self.completed_at = False + return { "task_id": self.task_id, "title": self.title, "description": self.description, - "completed_at": self.completed_at + "is_complete": self.completed_at } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 63e1a650f..ffdb1b03d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -14,13 +14,12 @@ @task_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() - if "title" not in request_body or "description" not in request_body: + if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: return make_response({"details": "Invalid data"}, 400) new_task = Task( title=request_body["title"], description=request_body["description"], - completed_at=request_body["completed_at"] ) db.session.add(new_task) From 69c07ca314696d761ba32f46240346a42ec73a77 Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 29 Oct 2021 13:41:38 -0700 Subject: [PATCH 11/38] Add code to pass Get one task test --- app/models/task.py | 2 +- app/routes.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index f30a8af59..a77016c7c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -13,7 +13,7 @@ def to_dict(self): self.completed_at = False return { - "task_id": self.task_id, + "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 ffdb1b03d..58943415b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -15,17 +15,18 @@ def create_task(): request_body = request.get_json() if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: + # if "title" not in request_body or "description" not in request_body: return make_response({"details": "Invalid data"}, 400) new_task = Task( title=request_body["title"], - description=request_body["description"], + description=request_body["description"] ) db.session.add(new_task) db.session.commit() - return make_response(new_task.to_dict(), 201) + return make_response({"task": new_task.to_dict()}, 201) @task_bp.route("", methods=["GET"]) def read_all_tasks(): From 1c00ed9d5ceb2495b84a184fda9727f20e2e1c7d Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 29 Oct 2021 15:16:14 -0700 Subject: [PATCH 12/38] Add read_one_task route --- app/routes.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 58943415b..f6f47a318 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,7 +8,15 @@ task_bp = Blueprint("task", __name__,url_prefix ="/tasks") # Helper Functions -# TODO:PUT ANY HELPER FUNCTIONS header_property +def valid_int(number, parameter_type): + try: + int(number) + except: + abort(make_response({"error": f"{parameter_type} must be an int"}, 400)) + +def get_task_from_id(task_id): + valid_int(task_id, "task_id") + return Task.query.get_or_404(task_id, description="{task not found}") # Routes @task_bp.route("", methods=["POST"]) @@ -38,3 +46,8 @@ def read_all_tasks(): task.to_dict() ) return make_response(jsonify(task_response), 200) + +@task_bp.route("/", methods=["GET"]) +def read_one_task(task_id): + task = get_task_from_id(task_id) + return make_response({"task": task.to_dict()}, 200) From e33e799ad3dd3b7b6a1acaf193010fd7a94c4ba5 Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 29 Oct 2021 15:45:31 -0700 Subject: [PATCH 13/38] Add update_task route --- app/routes.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/routes.py b/app/routes.py index f6f47a318..468b47fda 100644 --- a/app/routes.py +++ b/app/routes.py @@ -51,3 +51,16 @@ def read_all_tasks(): def read_one_task(task_id): task = get_task_from_id(task_id) return make_response({"task": task.to_dict()}, 200) + +@task_bp.route("/", methods=["PUT"]) +def update_task(task_id): + task = get_task_from_id(task_id) + request_body = request.get_json() + task.title=request_body["title"] + task.description=request_body["description"] + db.session.commit + return make_response({"task": task.to_dict()}, 200) + + + + From ebf73ea7aa475f8c1a73700717a90e993c2cbe65 Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 29 Oct 2021 16:14:56 -0700 Subject: [PATCH 14/38] Refactor to_dict method to use complete --- app/routes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 468b47fda..99cc6781b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -58,9 +58,16 @@ def update_task(task_id): request_body = request.get_json() task.title=request_body["title"] task.description=request_body["description"] - db.session.commit + db.session.commit() return make_response({"task": task.to_dict()}, 200) + +@task_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = get_task_from_id(task_id) + db.session.delete(task) + db.session.commit() + return make_response({"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"}, 200) From 21786bdc245b8af2b8f5683afd2da60ba1693273 Mon Sep 17 00:00:00 2001 From: Jessica Date: Fri, 29 Oct 2021 16:15:30 -0700 Subject: [PATCH 15/38] Add Delete Route --- app/models/task.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index a77016c7c..16d0907b1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,12 +9,13 @@ class Task(db.Model): completed_at = db.Column(db.DateTime, nullable=True) def to_dict(self): - if not self.completed_at: - self.completed_at = False + complete = False + if self.completed_at: + complete = True return { "id": self.task_id, "title": self.title, "description": self.description, - "is_complete": self.completed_at + "is_complete": complete } \ No newline at end of file From 4f826f429a70dea2d0ca9c6a12a466ef9fcb59c6 Mon Sep 17 00:00:00 2001 From: Jessica Date: Sat, 30 Oct 2021 12:17:28 -0700 Subject: [PATCH 16/38] Add sorting by title to pass wave 2 --- app/routes.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 99cc6781b..1b8a10ce5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, jsonify, make_response, request, abort from flask.helpers import make_response from flask.json import tojson_filter +from flask.signals import request_tearing_down from werkzeug.utils import header_property from app.models.task import Task from app import db @@ -38,7 +39,15 @@ def create_task(): @task_bp.route("", methods=["GET"]) def read_all_tasks(): - tasks = Task.query.all() + + sort_query = request.args.get("sort") + + if sort_query == "asc": + tasks = Task.query.order_by(Task.title.asc()) + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() task_response = [] for task in tasks: From 5b2e592c1688579e47efbf98f8e83f5d4fc08d1f Mon Sep 17 00:00:00 2001 From: Jessica Date: Sat, 30 Oct 2021 15:45:50 -0700 Subject: [PATCH 17/38] Add Mark Complete Route --- app/routes.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/routes.py b/app/routes.py index 1b8a10ce5..0d274a572 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,6 +5,7 @@ from werkzeug.utils import header_property from app.models.task import Task from app import db +from datetime import datetime task_bp = Blueprint("task", __name__,url_prefix ="/tasks") @@ -79,4 +80,11 @@ def delete_task(task_id): return make_response({"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"}, 200) +@task_bp.route("//mark_complete", methods=["PATCH"]) +def mark_task_complete(task_id): + task = get_task_from_id(task_id) + task.completed_at = datetime.now() + + db.session.commit() + return make_response({"task": task.to_dict()}, 200) \ No newline at end of file From c5cbd1d9463760e85ce5121f24a860ef543ab5dd Mon Sep 17 00:00:00 2001 From: Jessica Date: Sun, 31 Oct 2021 15:12:04 -0700 Subject: [PATCH 18/38] Modify create task to account for completed_at --- app/routes.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0d274a572..019d4fe05 100644 --- a/app/routes.py +++ b/app/routes.py @@ -30,7 +30,8 @@ def create_task(): new_task = Task( title=request_body["title"], - description=request_body["description"] + description=request_body["description"], + completed_at=request_body["completed_at"] ) db.session.add(new_task) @@ -83,8 +84,17 @@ def delete_task(task_id): @task_bp.route("//mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): task = get_task_from_id(task_id) - task.completed_at = datetime.now() + task.completed_at = datetime.utcnow() db.session.commit() - return make_response({"task": task.to_dict()}, 200) \ No newline at end of file + return make_response({"task": task.to_dict()}, 200) + +# @task_bp.route("//mark_incomplete", methods=["PATCH"]) +# def mark_task_complete(task_id): +# task = get_task_from_id(task_id) +# task.completed_at = None + +# db.session.commit() + +# return make_response({"task": task.to_dict()}, 200) From b2ba54ad7c540b204c082b10b7441ae325a8d4b1 Mon Sep 17 00:00:00 2001 From: Jessica Date: Sun, 31 Oct 2021 21:00:32 -0700 Subject: [PATCH 19/38] Add mark task incomplete route --- app/routes.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/routes.py b/app/routes.py index 019d4fe05..ce62974ba 100644 --- a/app/routes.py +++ b/app/routes.py @@ -90,11 +90,11 @@ def mark_task_complete(task_id): return make_response({"task": task.to_dict()}, 200) -# @task_bp.route("//mark_incomplete", methods=["PATCH"]) -# def mark_task_complete(task_id): -# task = get_task_from_id(task_id) -# task.completed_at = None +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_task_incomplete(task_id): + task = get_task_from_id(task_id) + task.completed_at = None -# db.session.commit() + db.session.commit() -# return make_response({"task": task.to_dict()}, 200) + return make_response({"task": task.to_dict()}, 200) From cbb8dd8511b30c3c89d4f6bdc943d2a5fc4668c4 Mon Sep 17 00:00:00 2001 From: Jessica Date: Mon, 1 Nov 2021 21:11:29 -0700 Subject: [PATCH 20/38] Add slack messaging to mark complete route --- app/__init__.py | 3 +++ app/routes.py | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index f0ff4e61b..4c21b48a7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -32,5 +32,8 @@ def create_app(test_config=None): # Register Blueprints here from .routes import task_bp app.register_blueprint(task_bp) + + # from .routes import slack_bot_bp + # app.register_blueprint(slack_bot_bp) return app diff --git a/app/routes.py b/app/routes.py index ce62974ba..6f72bb8a6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -6,6 +6,10 @@ from app.models.task import Task from app import db from datetime import datetime +from dotenv import load_dotenv +import requests, os + +load_dotenv() task_bp = Blueprint("task", __name__,url_prefix ="/tasks") @@ -20,6 +24,19 @@ def get_task_from_id(task_id): valid_int(task_id, "task_id") return Task.query.get_or_404(task_id, description="{task not found}") +def post_slack_message(message): + token = os.environ.get('SLACK_TOKEN') + CHANNEL_ID = "C02KD4B5A07" + + Headers = {"Authorization": "Bearer xoxb-" + token} + data = { + "channel": CHANNEL_ID, + "text": message + } + response = requests.post("https://slack.com/api/chat.postMessage", headers=Headers, json=data) + return response + + # Routes @task_bp.route("", methods=["POST"]) def create_task(): @@ -87,6 +104,8 @@ def mark_task_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() + message = f"Someone just completed the task {task.title}" + post_slack_message(message) return make_response({"task": task.to_dict()}, 200) @@ -94,7 +113,7 @@ def mark_task_complete(task_id): def mark_task_incomplete(task_id): task = get_task_from_id(task_id) task.completed_at = None - db.session.commit() return make_response({"task": task.to_dict()}, 200) + From 23443416e3abef8e6d929b4a22cdabf6168274c1 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 09:54:42 -0700 Subject: [PATCH 21/38] Add Goal Model --- app/models/goal.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..d24c943f5 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, nullable=False) + + def to_dict(self): + return { + "id": self.goal_id, + "title": self.title + } From 13765c56f2f881f5083b1b386e5d01d6ce82b9ae Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:07:12 -0700 Subject: [PATCH 22/38] Refactor folder to put routes file into routes folder and create task routes --- app/__init__.py | 4 +--- app/{routes.py => routes/task_routes.py} | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename app/{routes.py => routes/task_routes.py} (100%) diff --git a/app/__init__.py b/app/__init__.py index 4c21b48a7..a3603212a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,10 +30,8 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import task_bp + from .routes.task_routes import task_bp app.register_blueprint(task_bp) - # from .routes import slack_bot_bp - # app.register_blueprint(slack_bot_bp) return app diff --git a/app/routes.py b/app/routes/task_routes.py similarity index 100% rename from app/routes.py rename to app/routes/task_routes.py From 3fe282415693697cf2925ec59f365e07f405074a Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:36:45 -0700 Subject: [PATCH 23/38] Add and register Goal blueprint --- app/__init__.py | 3 ++ app/routes/goal_routes.py | 102 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 app/routes/goal_routes.py diff --git a/app/__init__.py b/app/__init__.py index a3603212a..5f7dda5b7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -33,5 +33,8 @@ def create_app(test_config=None): from .routes.task_routes import task_bp app.register_blueprint(task_bp) + from .routes.goal_routes import goal_bp + app.register_blueprint(goal_bp) + return app diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py new file mode 100644 index 000000000..f1fe4f33c --- /dev/null +++ b/app/routes/goal_routes.py @@ -0,0 +1,102 @@ +from flask import Blueprint, jsonify, make_response, request, abort +from flask.helpers import make_response +from flask.json import tojson_filter +from flask.signals import request_tearing_down +from werkzeug.utils import header_property +from app.models.task import Task +from app import db +from datetime import datetime + + +goal_bp = Blueprint("goal", __name__,url_prefix ="/goals") + +# Helper Functions +def valid_int(number, parameter_type): + try: + int(number) + except: + abort(make_response({"error": f"{parameter_type} must be an int"}, 400)) + +def get_goal_from_id(goal_id): + valid_int(goal_id, "goal_id") + return Goal.query.get_or_404(goal_id, description="{goal not found}") + + + +# Routes +@goal_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + if "title" not in request_body: + 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.to_dict()}, 201) + +# @task_bp.route("", methods=["GET"]) +# def read_all_tasks(): + +# sort_query = request.args.get("sort") + +# if sort_query == "asc": +# tasks = Task.query.order_by(Task.title.asc()) +# elif sort_query == "desc": +# tasks = Task.query.order_by(Task.title.desc()) +# else: +# tasks = Task.query.all() + +# task_response = [] +# for task in tasks: +# task_response.append( +# task.to_dict() +# ) +# return make_response(jsonify(task_response), 200) + +# @task_bp.route("/", methods=["GET"]) +# def read_one_task(task_id): +# task = get_task_from_id(task_id) +# return make_response({"task": task.to_dict()}, 200) + +# @task_bp.route("/", methods=["PUT"]) +# def update_task(task_id): +# task = get_task_from_id(task_id) +# request_body = request.get_json() +# task.title=request_body["title"] +# task.description=request_body["description"] +# db.session.commit() +# return make_response({"task": task.to_dict()}, 200) + +# @task_bp.route("/", methods=["DELETE"]) +# def delete_task(task_id): +# task = get_task_from_id(task_id) + +# db.session.delete(task) +# db.session.commit() + +# return make_response({"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"}, 200) + +# @task_bp.route("//mark_complete", methods=["PATCH"]) +# def mark_task_complete(task_id): +# task = get_task_from_id(task_id) +# task.completed_at = datetime.utcnow() + +# db.session.commit() +# message = f"Someone just completed the task {task.title}" +# post_slack_message(message) + +# return make_response({"task": task.to_dict()}, 200) + +# @task_bp.route("//mark_incomplete", methods=["PATCH"]) +# def mark_task_incomplete(task_id): +# task = get_task_from_id(task_id) +# task.completed_at = None +# db.session.commit() + +# return make_response({"task": task.to_dict()}, 200) + From aedee15bdc4de2f4bc5afb74c9c1424cf5622052 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:41:18 -0700 Subject: [PATCH 24/38] Fix import of Goal class in goal_routes --- app/routes/goal_routes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index f1fe4f33c..871d6a3b9 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -3,7 +3,7 @@ from flask.json import tojson_filter from flask.signals import request_tearing_down from werkzeug.utils import header_property -from app.models.task import Task +from app.models.goal import Goal from app import db from datetime import datetime @@ -22,7 +22,6 @@ def get_goal_from_id(goal_id): return Goal.query.get_or_404(goal_id, description="{goal not found}") - # Routes @goal_bp.route("", methods=["POST"]) def create_goal(): From 538cfdb3890965f9ba61664667e87db2c1af7e30 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:44:55 -0700 Subject: [PATCH 25/38] Add get all goals route --- app/routes/goal_routes.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 871d6a3b9..7ea965e9a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -38,24 +38,24 @@ def create_goal(): return make_response({"goal": new_goal.to_dict()}, 201) -# @task_bp.route("", methods=["GET"]) -# def read_all_tasks(): - -# sort_query = request.args.get("sort") - -# if sort_query == "asc": -# tasks = Task.query.order_by(Task.title.asc()) -# elif sort_query == "desc": -# tasks = Task.query.order_by(Task.title.desc()) -# else: -# tasks = Task.query.all() - -# task_response = [] -# for task in tasks: -# task_response.append( -# task.to_dict() -# ) -# return make_response(jsonify(task_response), 200) +@goal_bp.route("", methods=["GET"]) +def read_all_goals(): + + sort_query = request.args.get("sort") + + if sort_query == "asc": + goals = Goal.query.order_by(Goal.title.asc()) + elif sort_query == "desc": + goals = Goal.query.order_by(Goal.title.desc()) + else: + goals = Goal.query.all() + + goal_response = [] + for goal in goals: + goal_response.append( + goal.to_dict() + ) + return make_response(jsonify(goal_response), 200) # @task_bp.route("/", methods=["GET"]) # def read_one_task(task_id): From d6a1116e57b7ebad66113886e68d0897b749e9a7 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:46:24 -0700 Subject: [PATCH 26/38] Add get one goal route --- app/routes/goal_routes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 7ea965e9a..4a603c7ae 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -57,10 +57,10 @@ def read_all_goals(): ) return make_response(jsonify(goal_response), 200) -# @task_bp.route("/", methods=["GET"]) -# def read_one_task(task_id): -# task = get_task_from_id(task_id) -# return make_response({"task": task.to_dict()}, 200) +@goal_bp.route("/", methods=["GET"]) +def read_one_goal(goal_id): + goal = get_goal_from_id(goal_id) + return make_response({"goal": goal.to_dict()}, 200) # @task_bp.route("/", methods=["PUT"]) # def update_task(task_id): From e5c9ea39143c341e03ea7a5bd6fcf1674f3a5a5e Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:51:03 -0700 Subject: [PATCH 27/38] Add delete goal route --- app/routes/goal_routes.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 4a603c7ae..b7054c952 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -71,14 +71,14 @@ def read_one_goal(goal_id): # db.session.commit() # return make_response({"task": task.to_dict()}, 200) -# @task_bp.route("/", methods=["DELETE"]) -# def delete_task(task_id): -# task = get_task_from_id(task_id) +@goal_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = get_goal_from_id(goal_id) -# db.session.delete(task) -# db.session.commit() + db.session.delete(goal) + db.session.commit() -# return make_response({"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"}, 200) + return make_response({"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}, 200) # @task_bp.route("//mark_complete", methods=["PATCH"]) # def mark_task_complete(task_id): From 254f2b5b85b15ba21f2f3259d8514dad25eab93c Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:55:04 -0700 Subject: [PATCH 28/38] Add PUT goal route --- app/routes/goal_routes.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index b7054c952..05e0f5123 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -62,14 +62,13 @@ def read_one_goal(goal_id): goal = get_goal_from_id(goal_id) return make_response({"goal": goal.to_dict()}, 200) -# @task_bp.route("/", methods=["PUT"]) -# def update_task(task_id): -# task = get_task_from_id(task_id) -# request_body = request.get_json() -# task.title=request_body["title"] -# task.description=request_body["description"] -# db.session.commit() -# return make_response({"task": task.to_dict()}, 200) +@goal_bp.route("/", methods=["PUT"]) +def update_task(goal_id): + goal = get_goal_from_id(goal_id) + request_body = request.get_json() + goal.title=request_body["title"] + db.session.commit() + return make_response({"goal": goal.to_dict()}, 200) @goal_bp.route("/", methods=["DELETE"]) def delete_goal(goal_id): From 715c9ef00b39a017a3987f5d5d943f4acb03840c Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 10:56:28 -0700 Subject: [PATCH 29/38] Fix typo in PUT goal route --- app/routes/goal_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 05e0f5123..0efdcbfe9 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -63,7 +63,7 @@ def read_one_goal(goal_id): return make_response({"goal": goal.to_dict()}, 200) @goal_bp.route("/", methods=["PUT"]) -def update_task(goal_id): +def update_goal(goal_id): goal = get_goal_from_id(goal_id) request_body = request.get_json() goal.title=request_body["title"] From 77f5dc6dd2fcf609170552c81d85c23a393a07e9 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 21:18:53 -0700 Subject: [PATCH 30/38] Cleanup line spaces --- app/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 5f7dda5b7..7b99bb75a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -36,5 +36,4 @@ def create_app(test_config=None): from .routes.goal_routes import goal_bp app.register_blueprint(goal_bp) - return app From bed7ae4e8a4ad1a1456481329b242351602e9971 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 2 Nov 2021 21:46:16 -0700 Subject: [PATCH 31/38] Complete tests for wave 5 --- tests/test_wave_05.py | 52 ++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 6ba60c6fa..815f5291f 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,17 +42,17 @@ 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 response = client.get("/goals/1") response_body = response.get_json() # Assert # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == None # ---- Complete Test ---- def test_create_goal(client): @@ -71,29 +72,42 @@ 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": "Updated Goal Title" + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" # ---- Complete Assertions Here ---- -@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", json={ + "title": "Updated Goal Title", + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == None # ---- Complete Assertions Here ---- @@ -113,17 +127,19 @@ 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 + assert response.status_code == 404 + assert response_body == None + assert Goal.query.all() == [] # ---- Complete Assertions Here ---- From 984bbd15025c575a2aca8736e5e5ba0af1921a5c Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 3 Nov 2021 15:33:32 -0700 Subject: [PATCH 32/38] Add utils file for shared valid input function --- app/routes/goal_routes.py | 7 +------ app/routes/task_routes.py | 6 +----- app/routes/utils.py | 7 +++++++ 3 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 app/routes/utils.py diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 0efdcbfe9..79a506818 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -6,17 +6,12 @@ from app.models.goal import Goal from app import db from datetime import datetime +from app.routes.utils import valid_int goal_bp = Blueprint("goal", __name__,url_prefix ="/goals") # Helper Functions -def valid_int(number, parameter_type): - try: - int(number) - except: - abort(make_response({"error": f"{parameter_type} must be an int"}, 400)) - def get_goal_from_id(goal_id): valid_int(goal_id, "goal_id") return Goal.query.get_or_404(goal_id, description="{goal not found}") diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 6f72bb8a6..b45f36f29 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -8,17 +8,13 @@ from datetime import datetime from dotenv import load_dotenv import requests, os +from app.routes.utils import valid_int load_dotenv() task_bp = Blueprint("task", __name__,url_prefix ="/tasks") # Helper Functions -def valid_int(number, parameter_type): - try: - int(number) - except: - abort(make_response({"error": f"{parameter_type} must be an int"}, 400)) def get_task_from_id(task_id): valid_int(task_id, "task_id") diff --git a/app/routes/utils.py b/app/routes/utils.py new file mode 100644 index 000000000..e61331ca1 --- /dev/null +++ b/app/routes/utils.py @@ -0,0 +1,7 @@ +from flask import make_response, abort + +def valid_int(number, parameter_type): + try: + int(number) + except: + abort(make_response({"error": f"{parameter_type} must be an int"}, 400)) \ No newline at end of file From 7dfadb090a68d655c1bb77f9989af004863070c2 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 3 Nov 2021 22:49:09 -0700 Subject: [PATCH 33/38] Add foreign key relationship for task to goals --- app/models/goal.py | 1 + app/models/task.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/models/goal.py b/app/models/goal.py index d24c943f5..7459f8037 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,6 +5,7 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String, nullable=False) + tasks = db.relationship("Task", back_populates="goal") def to_dict(self): return { diff --git a/app/models/task.py b/app/models/task.py index 16d0907b1..5ed4b16eb 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,6 @@ from flask import current_app from app import db +from app.models.goal import Goal class Task(db.Model): @@ -7,6 +8,8 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey(Goal.goal_id)) + goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): complete = False From 763f162e152d494f098c6a5566e8ee3a79632617 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 4 Nov 2021 10:12:58 -0700 Subject: [PATCH 34/38] Add link task to goal route --- app/models/goal.py | 5 ++++- app/models/task.py | 6 ++++-- app/routes/goal_routes.py | 32 ++++++++++++++------------------ 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 7459f8037..7169b440c 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,11 +1,14 @@ +from re import T from flask import current_app +from sqlalchemy.orm import backref, lazyload from app import db class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String, nullable=False) - tasks = db.relationship("Task", back_populates="goal") + tasks = db.relationship("Task", backref="goal", lazy=True) + # tasks = db.relationship("Task", back_populates="goal") def to_dict(self): return { diff --git a/app/models/task.py b/app/models/task.py index 5ed4b16eb..8212f5a06 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,4 +1,5 @@ from flask import current_app +from sqlalchemy.orm import lazyload from app import db from app.models.goal import Goal @@ -8,8 +9,9 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) - goal_id = db.Column(db.Integer, db.ForeignKey(Goal.goal_id)) - goal = db.relationship("Goal", back_populates="tasks") + goal_id = db.Column(db.Integer, db.ForeignKey(Goal.goal_id), nullable=True) + # goal = db.relationship("Goal", backref="tasks", lazy=True) + # goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): complete = False diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 79a506818..749df9f31 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -7,6 +7,7 @@ from app import db from datetime import datetime from app.routes.utils import valid_int +from app.models.task import Task goal_bp = Blueprint("goal", __name__,url_prefix ="/goals") @@ -74,22 +75,17 @@ def delete_goal(goal_id): return make_response({"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}, 200) -# @task_bp.route("//mark_complete", methods=["PATCH"]) -# def mark_task_complete(task_id): -# task = get_task_from_id(task_id) -# task.completed_at = datetime.utcnow() - -# db.session.commit() -# message = f"Someone just completed the task {task.title}" -# post_slack_message(message) - -# return make_response({"task": task.to_dict()}, 200) - -# @task_bp.route("//mark_incomplete", methods=["PATCH"]) -# def mark_task_incomplete(task_id): -# task = get_task_from_id(task_id) -# task.completed_at = None -# db.session.commit() - -# return make_response({"task": task.to_dict()}, 200) +@goal_bp.route("//tasks", methods=["POST"]) +def link_tasks_to_goals(goal_id): + request_body = request.get_json() + task_ids = request_body["task_ids"] + for t_id in task_ids: + task = Task.query.get(t_id) + task.goal_id = goal_id + db.session.commit() + response_body = { + "id": int(goal_id), + "task_ids": task_ids + } + return make_response(response_body, 200) From 3b29755e9686e37f961a3a09acdac5cdc1b329ef Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 4 Nov 2021 16:33:36 -0700 Subject: [PATCH 35/38] Add read tasks for goal and refactor to_dict functions to account for goals --- app/models/goal.py | 16 ++++++++++++++++ app/models/task.py | 11 +++++++++-- app/routes/goal_routes.py | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 7169b440c..50933a5f7 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,6 @@ from re import T from flask import current_app +from flask.helpers import make_response from sqlalchemy.orm import backref, lazyload from app import db @@ -15,3 +16,18 @@ def to_dict(self): "id": self.goal_id, "title": self.title } + + def create_task_list(self): + task_list = [] + for task in self.tasks: + task_list.append(task.to_dict()) + return task_list + + def to_dict_with_tasks(self): + return { + "id": self.goal_id, + "title": self.title, + "tasks": [task.to_dict() for task in self.tasks] + } + + # foal - goal.query.get(goal_id) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 8212f5a06..3081d5988 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -13,11 +13,18 @@ class Task(db.Model): # goal = db.relationship("Goal", backref="tasks", lazy=True) # goal = db.relationship("Goal", back_populates="tasks") - def to_dict(self): + def to_dict(self): #if no goal id this else: if goal id add to dict complete = False if self.completed_at: complete = True - + if self.goal_id: + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": complete, + "goal_id": self.goal_id + } return { "id": self.task_id, "title": self.title, diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 749df9f31..370950a67 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -89,3 +89,25 @@ def link_tasks_to_goals(goal_id): } return make_response(response_body, 200) +@goal_bp.route("//tasks", methods=["GET"]) +def read_tasks_for_goal(goal_id): + goal = get_goal_from_id(goal_id) + return make_response(goal.to_dict_with_tasks(), 200) + + # Task.query.filter(Task.goal_id == goal_id) + # sort_query = request.args.get("sort") + + # if sort_query == "asc": + # goals = Goal.query.order_by(Goal.title.asc()) + # elif sort_query == "desc": + # goals = Goal.query.order_by(Goal.title.desc()) + # else: + # goals = Goal.query.all() + + # goal_response = [] + # for goal in goals: + # goal_response.append( + # goal.to_dict() + # ) + # return make_response(jsonify(goal_response), 200) + From c4adf6fa7c9ad0adfa2818cdcb25dee8994cb67a Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 4 Nov 2021 16:36:28 -0700 Subject: [PATCH 36/38] Cleanup working comments --- app/models/goal.py | 3 --- app/models/task.py | 4 +--- app/routes/goal_routes.py | 18 ------------------ app/routes/task_routes.py | 2 -- 4 files changed, 1 insertion(+), 26 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 50933a5f7..05a4242ab 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -9,7 +9,6 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String, nullable=False) tasks = db.relationship("Task", backref="goal", lazy=True) - # tasks = db.relationship("Task", back_populates="goal") def to_dict(self): return { @@ -29,5 +28,3 @@ def to_dict_with_tasks(self): "title": self.title, "tasks": [task.to_dict() for task in self.tasks] } - - # foal - goal.query.get(goal_id) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 3081d5988..05a7f3ad2 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,10 +10,8 @@ class Task(db.Model): description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) goal_id = db.Column(db.Integer, db.ForeignKey(Goal.goal_id), nullable=True) - # goal = db.relationship("Goal", backref="tasks", lazy=True) - # goal = db.relationship("Goal", back_populates="tasks") - def to_dict(self): #if no goal id this else: if goal id add to dict + def to_dict(self): complete = False if self.completed_at: complete = True diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 370950a67..d420b6424 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -93,21 +93,3 @@ def link_tasks_to_goals(goal_id): def read_tasks_for_goal(goal_id): goal = get_goal_from_id(goal_id) return make_response(goal.to_dict_with_tasks(), 200) - - # Task.query.filter(Task.goal_id == goal_id) - # sort_query = request.args.get("sort") - - # if sort_query == "asc": - # goals = Goal.query.order_by(Goal.title.asc()) - # elif sort_query == "desc": - # goals = Goal.query.order_by(Goal.title.desc()) - # else: - # goals = Goal.query.all() - - # goal_response = [] - # for goal in goals: - # goal_response.append( - # goal.to_dict() - # ) - # return make_response(jsonify(goal_response), 200) - diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index b45f36f29..3408b2b0d 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -15,7 +15,6 @@ task_bp = Blueprint("task", __name__,url_prefix ="/tasks") # Helper Functions - def get_task_from_id(task_id): valid_int(task_id, "task_id") return Task.query.get_or_404(task_id, description="{task not found}") @@ -38,7 +37,6 @@ def post_slack_message(message): def create_task(): request_body = request.get_json() if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: - # if "title" not in request_body or "description" not in request_body: return make_response({"details": "Invalid data"}, 400) new_task = Task( From dc4813aa2eb607e92781577c834be6c9bf3f1f35 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 4 Nov 2021 21:17:23 -0700 Subject: [PATCH 37/38] Add migrations versions folder --- migrations/versions/faa3962d8150_.py | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 migrations/versions/faa3962d8150_.py diff --git a/migrations/versions/faa3962d8150_.py b/migrations/versions/faa3962d8150_.py new file mode 100644 index 000000000..3c749b06e --- /dev/null +++ b/migrations/versions/faa3962d8150_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: faa3962d8150 +Revises: +Create Date: 2021-11-04 09:53:27.681005 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'faa3962d8150' +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(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### From 4aca36c2fac4f97c2d0bad660a34a66f09978863 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 4 Nov 2021 21:23:48 -0700 Subject: [PATCH 38/38] Add Procfile --- 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