From 73dee56325f41d1b0ddaf425757d717de6a9cf6e Mon Sep 17 00:00:00 2001 From: Marisa Date: Tue, 4 May 2021 13:52:33 -0700 Subject: [PATCH 01/10] Set up project on local machine --- 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 11be115abf0c2a650b24fda8129893c4063213e6 Mon Sep 17 00:00:00 2001 From: Marisa Date: Tue, 4 May 2021 18:50:53 -0700 Subject: [PATCH 02/10] Built Task Model --- app/models/task.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..1b0d74ceb 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,3 +4,6 @@ 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, default = None) From f2bce91e8a0a823726dc162ef5243446df0e51ac Mon Sep 17 00:00:00 2001 From: Marisa Date: Thu, 6 May 2021 17:02:29 -0700 Subject: [PATCH 03/10] Built code to pass wave 1 --- .noseids | Bin 0 -> 1800 bytes app/__init__.py | 5 +- app/models/task.py | 17 ++++++- app/routes.py | 66 ++++++++++++++++++++++++++- migrations/versions/20faa5e269e7_.py | 40 ++++++++++++++++ migrations/versions/fea427009997_.py | 28 ++++++++++++ tests/test_wave_02.py | 1 + tests/test_wave_05.py | 1 + tests/test_wave_06.py | 1 - 9 files changed, 153 insertions(+), 6 deletions(-) create mode 100644 .noseids create mode 100644 migrations/versions/20faa5e269e7_.py create mode 100644 migrations/versions/fea427009997_.py diff --git a/.noseids b/.noseids new file mode 100644 index 0000000000000000000000000000000000000000..2112d7c25f925445fd6382e3894551776c719112 GIT binary patch literal 1800 zcmcK5J5R$f5CCA3zIe2}76cN^ENvP}3+!x_*cg#zCD%5P#!=2GVnAYJ@o0W766Zuh z3DC_%IxDfPe7>{eyfr^Q+Z)C8s?Sv;3Q^O|)KOFK9w9?-$+HOgQe->^^lo7Vu}C5F z(o8%;AkmW?pZalxvd`1VlYpj=TK3FWz=r-HebMT$=pR)3_1(Lky4IYFHO_@r#|1kF z$;@1lp~xhJjANi_3JtqcSaj6M-(CnM*t7T^=DcMZqNoce!>)L*y1sQM&#cCO5 z`=6LR4XezKb*B90Donk6UF%?3z7S%ll&@!(fxz fr?IY2gI#~DL3L5&SpY2IOF(+5YMES7^L+3H+HkeS literal 0 HcmV?d00001 diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..1f3d81a0c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,12 +4,10 @@ import os from dotenv import load_dotenv - db = SQLAlchemy() migrate = Migrate() load_dotenv() - def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False @@ -29,6 +27,7 @@ def create_app(test_config=None): db.init_app(app) 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 1b0d74ceb..0d103857e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,9 +1,24 @@ from flask import current_app from app import db - 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, default = None) + + def is_complete(self): + if self.completed_at == None: + return False + else: + return True + + def make_json(self): + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } + + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..b4d35a388 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,66 @@ -from flask import Blueprint +from flask import Blueprint, request, make_response, jsonify +from app import db +from app.models.task import Task + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["GET","POST"]) +def handle_tasks(): + if request.method == "GET": + tasks = Task.query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete() + }) + return jsonify(tasks_response) + + elif request.method == "POST": + request_body = request.get_json() + # if request_body["title", "description", "completed_at"] == None: + # if request_body["title"] == None or request_body["description"] == None: + if "title" not in request_body.keys() or "description" not in request_body.keys() or "completed_at" not in request_body.keys(): + invalid_data = {"details": "Invalid data"} + return make_response(invalid_data, 400) + + else: + new_task = Task(title=request_body["title"], description=request_body["description"], completed_at=None) + + db.session.add(new_task) + db.session.commit() + + return make_response({"task": new_task.make_json()}, 201) + +@tasks_bp.route("/", methods= ["GET", "PUT", "DELETE"]) +def handle_task(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response("", 404) + + elif request.method == "GET": + return make_response({"task": task.make_json()}) + + elif request.method == "PUT": + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + task.completed_at = request_body["completed_at"] + + db.session.commit() + + return make_response({"task": task.make_json()}) + + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + + return { + "details": (f"Task {task.task_id} \"{task.title}\" successfully deleted") + } diff --git a/migrations/versions/20faa5e269e7_.py b/migrations/versions/20faa5e269e7_.py new file mode 100644 index 000000000..f122c3ee7 --- /dev/null +++ b/migrations/versions/20faa5e269e7_.py @@ -0,0 +1,40 @@ +"""empty message + +Revision ID: 20faa5e269e7 +Revises: +Create Date: 2021-05-06 11:32:33.105125 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '20faa5e269e7' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('is_complete', 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 ### diff --git a/migrations/versions/fea427009997_.py b/migrations/versions/fea427009997_.py new file mode 100644 index 000000000..1cd54cf46 --- /dev/null +++ b/migrations/versions/fea427009997_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: fea427009997 +Revises: 20faa5e269e7 +Create Date: 2021-05-06 14:31:58.352445 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fea427009997' +down_revision = '20faa5e269e7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.VARCHAR(), autoincrement=False, nullable=True)) + # ### end Alembic commands ### diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 399daf4db..9847b58d0 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,3 +1,4 @@ + def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 2b79e559d..ad1a53c4c 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,3 +1,4 @@ + def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 48ecd0523..4a7f2e662 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -1,6 +1,5 @@ from app.models.goal import Goal - def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ From e4bd23e0db95a21257e7dcc41ea1bfd9e94e27c5 Mon Sep 17 00:00:00 2001 From: Marisa Date: Fri, 7 May 2021 10:45:38 -0700 Subject: [PATCH 04/10] Rebuilt code to pass wave 2 --- app/models/task.py | 2 +- app/routes.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 0d103857e..65b39b147 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,7 +2,7 @@ from app import db 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, default = None) diff --git a/app/routes.py b/app/routes.py index b4d35a388..8babf4c67 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,13 +1,23 @@ from flask import Blueprint, request, make_response, jsonify from app import db from app.models.task import Task +from sqlalchemy import asc, desc tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @tasks_bp.route("", methods=["GET","POST"]) def handle_tasks(): if request.method == "GET": - tasks = Task.query.all() + sort = request.args.get("sort") + + if sort == "asc": + tasks = Task.query.order_by(asc("title")) + + elif sort == "desc": + tasks = Task.query.order_by(desc("title")) + + else: + tasks = Task.query.all() tasks_response = [] for task in tasks: @@ -21,8 +31,7 @@ def handle_tasks(): elif request.method == "POST": request_body = request.get_json() - # if request_body["title", "description", "completed_at"] == None: - # if request_body["title"] == None or request_body["description"] == None: + if "title" not in request_body.keys() or "description" not in request_body.keys() or "completed_at" not in request_body.keys(): invalid_data = {"details": "Invalid data"} return make_response(invalid_data, 400) From e5573a1e2c6fc296f799e0ba5d99ddbbc05dc4b9 Mon Sep 17 00:00:00 2001 From: Marisa Date: Mon, 10 May 2021 15:26:40 -0700 Subject: [PATCH 05/10] updateing for midpoint submission --- app/models/task.py | 11 ++++++----- app/routes.py | 25 ++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 65b39b147..803fcf008 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,13 +5,14 @@ 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, default = None) + completed_at = db.Column(db.DateTime, nullable = True) def is_complete(self): - if self.completed_at == None: - return False - else: - return True + return self.completed_at != None + # if self.completed_at is None: + # return False + # else: + # return True def make_json(self): return { diff --git a/app/routes.py b/app/routes.py index 8babf4c67..00508eabc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app import db from app.models.task import Task from sqlalchemy import asc, desc +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -37,7 +38,7 @@ def handle_tasks(): return make_response(invalid_data, 400) else: - new_task = Task(title=request_body["title"], description=request_body["description"], completed_at=None) + 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() @@ -73,3 +74,25 @@ def handle_task(task_id): "details": (f"Task {task.task_id} \"{task.title}\" successfully deleted") } +@tasks_bp.route("//mark_complete", methods= ["PATCH"]) +def mark_complete(task_id): + task = Task.query.get(task_id) + + if task == None: + return make_response("", 404) + + task.completed_at = datetime.utcnow() + db.session.commit() + return make_response({"task": task.make_json()}) + +@tasks_bp.route("//mark_incomplete", methods= ["PATCH"]) +def mark_incomplete(task_id): + task = Task.query.get(task_id) + + if task == None: + return make_response("", 404) + + task.completed_at = None + db.session.commit() + return make_response({"task": task.make_json()}) + From a3ad8991bac2caedcf6171e19a66c62cd0554b70 Mon Sep 17 00:00:00 2001 From: Marisa Date: Mon, 10 May 2021 18:07:26 -0700 Subject: [PATCH 06/10] Modified mark_complete to send a message to the slack workspace --- app/routes.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 00508eabc..7786a2c1e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,6 +3,8 @@ from app.models.task import Task from sqlalchemy import asc, desc from datetime import datetime +import requests +import os tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -77,13 +79,21 @@ def handle_task(task_id): @tasks_bp.route("//mark_complete", methods= ["PATCH"]) def mark_complete(task_id): task = Task.query.get(task_id) + API_KEY = os.environ.get("API_KEY") + PATH = "https://slack.com/api/chat.postMessage" + query_params = { + "channel": "task-notifications", + "text": f"Someone just completed the task {task.title}." + } if task == None: return make_response("", 404) - - task.completed_at = datetime.utcnow() - db.session.commit() - return make_response({"task": task.make_json()}) + + else: + task.completed_at = datetime.utcnow() + db.session.commit() + requests.post(PATH, data=query_params, headers={"Authorization":API_KEY}) + return make_response({"task": task.make_json()}) @tasks_bp.route("//mark_incomplete", methods= ["PATCH"]) def mark_incomplete(task_id): From 40c8eac2cfe11f9623fdcc684a98e0d7761aad56 Mon Sep 17 00:00:00 2001 From: Marisa Date: Tue, 11 May 2021 09:09:23 -0700 Subject: [PATCH 07/10] Modified to pass wave 5 --- app/__init__.py | 3 ++ app/models/goal.py | 8 ++- app/routes.py | 75 ++++++++++++++++++++++++---- migrations/versions/2d2454983e28_.py | 28 +++++++++++ 4 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 migrations/versions/2d2454983e28_.py diff --git a/app/__init__.py b/app/__init__.py index 1f3d81a0c..cac5d268b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,4 +30,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..6e337f730 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,12 @@ 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.String) + + def create_response(self): + return{ + "id": self.goal_id, + "title": self.title + } diff --git a/app/routes.py b/app/routes.py index 7786a2c1e..bf32c1f2c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,3 +1,5 @@ +# from werkzeug.wrappers import ETagRequestMixin +from app.models.goal import Goal from flask import Blueprint, request, make_response, jsonify from app import db from app.models.task import Task @@ -36,8 +38,7 @@ def handle_tasks(): request_body = request.get_json() if "title" not in request_body.keys() or "description" not in request_body.keys() or "completed_at" not in request_body.keys(): - invalid_data = {"details": "Invalid data"} - return make_response(invalid_data, 400) + return make_response({"details": "Invalid data"}, 400) else: new_task = Task(title=request_body["title"], description=request_body["description"], completed_at=request_body["completed_at"]) @@ -79,21 +80,20 @@ def handle_task(task_id): @tasks_bp.route("//mark_complete", methods= ["PATCH"]) def mark_complete(task_id): task = Task.query.get(task_id) + + if task == None: + return make_response("", 404) + API_KEY = os.environ.get("API_KEY") PATH = "https://slack.com/api/chat.postMessage" query_params = { "channel": "task-notifications", "text": f"Someone just completed the task {task.title}." } - - if task == None: - return make_response("", 404) - - else: - task.completed_at = datetime.utcnow() - db.session.commit() - requests.post(PATH, data=query_params, headers={"Authorization":API_KEY}) - return make_response({"task": task.make_json()}) + task.completed_at = datetime.utcnow() + db.session.commit() + requests.post(PATH, data=query_params, headers={"Authorization":API_KEY}) + return make_response({"task": task.make_json()}) @tasks_bp.route("//mark_incomplete", methods= ["PATCH"]) def mark_incomplete(task_id): @@ -106,3 +106,56 @@ def mark_incomplete(task_id): db.session.commit() return make_response({"task": task.make_json()}) +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +@goals_bp.route("", methods=["GET","POST"]) +def handle_goals(): + if request.method == "GET": + goals = Goal.query.all() + + goal_response = [] + for goal in goals: + goal_response.append({ + "id": goal.goal_id, + "title": goal.title, + }) + return jsonify(goal_response) + + elif request.method == "POST": + request_body = request.get_json() + + if "title" not in request_body.keys(): + return make_response({"details": "Invalid data"}, 400) + + else: + new_goal = Goal(title=request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + + return make_response({"goal": new_goal.create_response()}, 201) + +@goals_bp.route("/", methods=["GET", "PUT", "DELETE"]) +def handle_goal(goal_id): + goal = Goal.query.get(goal_id) + + if goal == None: + return make_response("", 404) + + elif request.method == "GET": + return make_response({"goal": goal.create_response()}) + + elif request.method == "PUT": + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + + return make_response({"goal": goal.create_response()}) + + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + + return {"details": (f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted")} \ No newline at end of file diff --git a/migrations/versions/2d2454983e28_.py b/migrations/versions/2d2454983e28_.py new file mode 100644 index 000000000..0fc66ff2a --- /dev/null +++ b/migrations/versions/2d2454983e28_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 2d2454983e28 +Revises: fea427009997 +Create Date: 2021-05-10 18:52:12.158910 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2d2454983e28' +down_revision = 'fea427009997' +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)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### From 89c64c1b42e37814b1218b6e9a8b7d541f81e199 Mon Sep 17 00:00:00 2001 From: Marisa Date: Tue, 11 May 2021 14:24:24 -0700 Subject: [PATCH 08/10] Modifys code to pass most of wave 6 --- app/models/goal.py | 15 ++++++++++++- app/models/task.py | 21 +++++++++++------- app/routes.py | 32 +++++++++++++++++++++++++++- migrations/versions/f8cf9fed5e65_.py | 30 ++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 migrations/versions/f8cf9fed5e65_.py diff --git a/app/models/goal.py b/app/models/goal.py index 6e337f730..80720f5c5 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,9 +4,22 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) + tasks = db.relationship("Task", backref="goal", lazy=True) def create_response(self): return{ "id": self.goal_id, - "title": self.title + "title": self.title, } + + def return_tasks(self): + return { + "id": self.goal_id, + "task_ids": self.tasks + } + def return_goal_tasks(self): + return{ + "id": self.goal_id, + "title": self.title, + "tasks": self.tasks + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 803fcf008..2d1d4aff2 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,20 +6,25 @@ 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) def is_complete(self): return self.completed_at != None - # if self.completed_at is None: - # return False - # else: - # return True + def make_json(self): - return { + if self.goal_id == None: + return { "id": self.task_id, "title": self.title, "description": self.description, "is_complete": self.is_complete() - } - - + } + else: + return { + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index bf32c1f2c..9b23744d0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -158,4 +158,34 @@ def handle_goal(goal_id): db.session.delete(goal) db.session.commit() - return {"details": (f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted")} \ No newline at end of file + return {"details": (f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted")} + + +@goals_bp.route("//tasks", methods=["GET", "POST"]) +def handle_goal_tasks(goal_id): + goal = Goal.query.get(goal_id) + + if goal == None: + return make_response("", 404) + + elif request.method == "GET": + # tasks_list = Task.query.get(goal_id) + return make_response(goal.return_goal_tasks()) + + # return make_response({ + # "id": goal.goal_id, + # "title": goal.title, + # "tasks": tasks_list + # }) + + elif request.method == "POST": + request_body = request.get_json() + task_ids = request_body["task_ids"] + + for id in task_ids: + task = Task.query.get(id) + task.goal_id = goal.goal_id + + db.session.commit() + + return make_response(jsonify({"id": goal.goal_id, "task_ids": task_ids})) \ No newline at end of file diff --git a/migrations/versions/f8cf9fed5e65_.py b/migrations/versions/f8cf9fed5e65_.py new file mode 100644 index 000000000..70c395909 --- /dev/null +++ b/migrations/versions/f8cf9fed5e65_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: f8cf9fed5e65 +Revises: 2d2454983e28 +Create Date: 2021-05-11 09:30:24.507088 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f8cf9fed5e65' +down_revision = '2d2454983e28' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['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') + # ### end Alembic commands ### From f2699a13086f206fa81ff5a7c8d48411edcf7f0f Mon Sep 17 00:00:00 2001 From: Marisa Date: Wed, 12 May 2021 14:24:36 -0700 Subject: [PATCH 09/10] Modified to routes to pass wave 6 --- app/models/goal.py | 5 ++++- app/routes.py | 13 +++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 80720f5c5..1b52e4950 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -18,8 +18,11 @@ def return_tasks(self): "task_ids": self.tasks } def return_goal_tasks(self): + tasks_list = [] + for task in self.tasks: + tasks_list.append(task.make_json()) return{ "id": self.goal_id, "title": self.title, - "tasks": self.tasks + "tasks": tasks_list } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 9b23744d0..42fe6e626 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,4 @@ -# from werkzeug.wrappers import ETagRequestMixin +from werkzeug.wrappers import ETagRequestMixin from app.models.goal import Goal from flask import Blueprint, request, make_response, jsonify from app import db @@ -168,15 +168,8 @@ def handle_goal_tasks(goal_id): if goal == None: return make_response("", 404) - elif request.method == "GET": - # tasks_list = Task.query.get(goal_id) + elif request.method == "GET": return make_response(goal.return_goal_tasks()) - - # return make_response({ - # "id": goal.goal_id, - # "title": goal.title, - # "tasks": tasks_list - # }) elif request.method == "POST": request_body = request.get_json() @@ -188,4 +181,4 @@ def handle_goal_tasks(goal_id): db.session.commit() - return make_response(jsonify({"id": goal.goal_id, "task_ids": task_ids})) \ No newline at end of file + return make_response({"id": goal.goal_id, "task_ids": task_ids}) \ No newline at end of file From 691b5572899e99437320d002a8685f2caad06d5a Mon Sep 17 00:00:00 2001 From: Marisa Date: Wed, 12 May 2021 16:41:46 -0700 Subject: [PATCH 10/10] Adds Procfile to setup for deployment --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..066ed31d9 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()'