From 01624ada4b4021326fa58e038abe552a21c1d232 Mon Sep 17 00:00:00 2001 From: Abigail Charime Date: Fri, 7 May 2021 10:02:39 -0700 Subject: [PATCH 1/7] Created GET,POST,and PUT functionality to driver code/Wave 01 --- app/__init__.py | 4 +- app/models/task.py | 15 ++++- app/routes.py | 76 +++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/339e72752100_.py | 39 +++++++++++ 8 files changed, 297 insertions(+), 3 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/339e72752100_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..678b39e76 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,4 +1,4 @@ -from flask import Flask +from flask import Flask, Blueprint from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate import os @@ -30,5 +30,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..bc07945df 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,17 @@ 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 to_json(self): + # This method was created so that we do not have to write out the dictionary many times in the routes.py file. + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + # Not sure if I should change this part to make if completed_at is null is_complete is False + "is_complete": False + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..0735c814a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,76 @@ -from flask import Blueprint +from app import db +from app.models.task import Task +from flask import Blueprint, request, make_response, jsonify + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("/", methods=["GET","PUT", "DELETE"]) +def get_single_task(task_id): + + task = Task.query.get(task_id) + # With the GET, POST and DELETE request if there is nothing we output this + if request == None or task == None: + return jsonify(None), 404 + # This portion is the GET request for only one task + elif request.method == "GET": + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False}}, 200 + elif request.method == "PUT": + # This portion is the PUT request for only one task + request_body = request.get_json() + task.title = request_body["title"] + task.description = request_body["description"] + # Save action + db.session.commit() + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False}}, 200 + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + return { + "details": f"Task {task.task_id} \"{task.title}\" successfully deleted" + }, 200 + +@tasks_bp.route("", methods=["GET"]) +def tasks_index(): + # This portion is the GET request + tasks = Task.query.all() + if tasks == None: + return [] + else: + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_json()) + return jsonify(tasks_response), 200 + + +@tasks_bp.route("", methods=["POST"]) +def tasks(): + try: + # This portion is the POST request + request_body = request.get_json() + new_task = Task(title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"]) + + db.session.add(new_task) + db.session.commit() + + return make_response({ + "task": { + "id": new_task.task_id, + "title": request_body["title"], + "description": request_body["description"], + "is_complete": False + }}, 201) + except KeyError: + return { + "details": "Invalid data"}, 400 + diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/339e72752100_.py b/migrations/versions/339e72752100_.py new file mode 100644 index 000000000..b5856503c --- /dev/null +++ b/migrations/versions/339e72752100_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 339e72752100 +Revises: +Create Date: 2021-05-05 16:04:03.682616 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '339e72752100' +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('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 7e507402c9abb4153b42b8a0622a7090ba7437c7 Mon Sep 17 00:00:00 2001 From: Abigail Charime Date: Sat, 8 May 2021 20:03:59 -0700 Subject: [PATCH 2/7] Added Ascending and Descending filte functionality to title column data --- app/routes.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0735c814a..1b6ab4faf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -40,7 +40,20 @@ def get_single_task(task_id): @tasks_bp.route("", methods=["GET"]) def tasks_index(): # This portion is the GET request - tasks = Task.query.all() + query_sorted = request.args.get("sort") + if query_sorted == "asc": + # Found in SQLALchemy documentation. + # The order_by method takes the data in the user table (Task) + # and filters by title in ascending order + tasks = Task.query.order_by(Task.title.asc()) + elif query_sorted == "desc": + # Found in SQLALchemy documentation. + # The order_by method takes the data in the user table (Task) + # and filters by title in descending order + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + if tasks == None: return [] else: @@ -72,5 +85,3 @@ def tasks(): except KeyError: return { "details": "Invalid data"}, 400 - - From 1b60f354b92551b9bc119d7d7231f45c9b269d62 Mon Sep 17 00:00:00 2001 From: Abigail Charime Date: Sat, 8 May 2021 20:03:59 -0700 Subject: [PATCH 3/7] Added Ascending and Descending filter functionality to title column data --- app/routes.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0735c814a..1b6ab4faf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -40,7 +40,20 @@ def get_single_task(task_id): @tasks_bp.route("", methods=["GET"]) def tasks_index(): # This portion is the GET request - tasks = Task.query.all() + query_sorted = request.args.get("sort") + if query_sorted == "asc": + # Found in SQLALchemy documentation. + # The order_by method takes the data in the user table (Task) + # and filters by title in ascending order + tasks = Task.query.order_by(Task.title.asc()) + elif query_sorted == "desc": + # Found in SQLALchemy documentation. + # The order_by method takes the data in the user table (Task) + # and filters by title in descending order + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + if tasks == None: return [] else: @@ -72,5 +85,3 @@ def tasks(): except KeyError: return { "details": "Invalid data"}, 400 - - From 27b5296539361512726096bf3bb64cf0c3d5eaa7 Mon Sep 17 00:00:00 2001 From: Abigail Charime Date: Mon, 10 May 2021 00:29:41 -0700 Subject: [PATCH 4/7] Added Custom Endpoints/Wave 3 --- app/models/task.py | 15 ++++++++++++-- app/routes.py | 49 +++++++++++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index bc07945df..73b06cacb 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,19 +1,30 @@ from flask import current_app from app import db +import datetime 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) + def to_json(self): + if self.completed_at != None: + result = self.completed_at + result = True + elif self.completed_at == None: + result = self.completed_at + result = False + # This method was created so that we do not have to write out the dictionary many times in the routes.py file. return { "id": self.task_id, "title": self.title, "description": self.description, # Not sure if I should change this part to make if completed_at is null is_complete is False - "is_complete": False - } \ No newline at end of file + "is_complete": result + } + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 1b6ab4faf..042f1eeca 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from app.models.task import Task -from flask import Blueprint, request, make_response, jsonify +from flask import Blueprint, request, jsonify +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -13,11 +14,7 @@ def get_single_task(task_id): return jsonify(None), 404 # This portion is the GET request for only one task elif request.method == "GET": - return {"task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False}}, 200 + return {"task": task.to_json()}, 200 elif request.method == "PUT": # This portion is the PUT request for only one task request_body = request.get_json() @@ -25,11 +22,7 @@ def get_single_task(task_id): task.description = request_body["description"] # Save action db.session.commit() - return {"task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False}}, 200 + return {"task": task.to_json()}, 200 elif request.method == "DELETE": db.session.delete(task) db.session.commit() @@ -39,7 +32,7 @@ def get_single_task(task_id): @tasks_bp.route("", methods=["GET"]) def tasks_index(): - # This portion is the GET request + query_sorted = request.args.get("sort") if query_sorted == "asc": # Found in SQLALchemy documentation. @@ -53,7 +46,7 @@ def tasks_index(): tasks = Task.query.order_by(Task.title.desc()) else: tasks = Task.query.all() - + # This portion is the just a GET request if tasks == None: return [] else: @@ -75,13 +68,29 @@ def tasks(): db.session.add(new_task) db.session.commit() - return make_response({ - "task": { - "id": new_task.task_id, - "title": request_body["title"], - "description": request_body["description"], - "is_complete": False - }}, 201) + return {"task": new_task.to_json()}, 201 except KeyError: return { "details": "Invalid data"}, 400 + +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete(task_id): + patch_task = Task.query.get(task_id) + date = datetime.utcnow() + if patch_task == None: + return jsonify(None), 404 + # Mark Complete on an Incompleted Task + patch_task.completed_at = date + db.session.commit() + + return {"task":patch_task.to_json()}, 200 + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + patch_task = Task.query.get(task_id) + if patch_task == None: + return jsonify(None), 404 + patch_task.completed_at = None + db.session.commit() + + return {"task":patch_task.to_json()}, 200 \ No newline at end of file From 1e13696ff37553173efa45482b0448d191023620 Mon Sep 17 00:00:00 2001 From: Abigail Charime Date: Wed, 12 May 2021 15:37:43 -0700 Subject: [PATCH 5/7] Added bot notification functionality, Added POST, GET, DELETE, and PUT functionality to driver code, and added one to many rel to goal and task model/Wave 4,5,(a bit of 6) --- app/__init__.py | 3 + app/models/goal.py | 14 +++- app/models/task.py | 1 + app/routes.py | 96 +++++++++++++++++++++++++++- migrations/versions/5a8537a0140d_.py | 28 ++++++++ migrations/versions/d1fe3aa0c191_.py | 30 +++++++++ 6 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 migrations/versions/5a8537a0140d_.py create mode 100644 migrations/versions/d1fe3aa0c191_.py diff --git a/app/__init__.py b/app/__init__.py index 678b39e76..38289100f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -33,4 +33,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..c22d5a107 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,18 @@ from flask import current_app +from sqlalchemy.orm import backref from app import db 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) + tasks = db.relationship('Task', backref='goal', lazy=True) + + + def to_json_goal(self): + # This method was created so that we do not have to write out the dictionary many times in the routes.py file. + return { + "id": self.goal_id, + "title": self.title, + } + diff --git a/app/models/task.py b/app/models/task.py index 73b06cacb..ad2b439da 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,6 +9,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) def to_json(self): diff --git a/app/routes.py b/app/routes.py index 042f1eeca..32550ef40 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,7 +1,10 @@ +from werkzeug.datastructures import Authorization from app import db from app.models.task import Task from flask import Blueprint, request, jsonify from datetime import datetime +import os +import requests tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -81,9 +84,29 @@ def mark_complete(task_id): return jsonify(None), 404 # Mark Complete on an Incompleted Task patch_task.completed_at = date + bot_notification(patch_task) db.session.commit() - + return {"task":patch_task.to_json()}, 200 + + +def bot_notification(patch_task): + # notification_task = Task.query.get(task_id) + PATH = "https://slack.com/api/chat.postMessage" + API_TOKEN = os.environ.get("API_KEY") + + query_params = { + "channel": "task-notifications", + "text": f"Someone just completed the task {patch_task.title}" + } + + header = { + "Authorization": f"Bearer {API_TOKEN}" + + } + result = requests.get(PATH, params=query_params,headers=header) + + return result @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_incomplete(task_id): @@ -93,4 +116,73 @@ def mark_incomplete(task_id): patch_task.completed_at = None db.session.commit() - return {"task":patch_task.to_json()}, 200 \ No newline at end of file + return {"task":patch_task.to_json()}, 200 + + +# ============================Goals========================================= + +from app.models.goal import Goal +from flask import Blueprint, request, jsonify + +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +@goals_bp.route("",methods=["POST"]) +def create_goal(): + try: + # This portion is the POST request + request_body = request.get_json() + new_goal = Goal(title=request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + return {"goal": new_goal.to_json_goal()}, 201 + except KeyError: + return { + "details": "Invalid data"}, 400 +@goals_bp.route("", methods=["GET"]) +def goals_index(): + # This portion is the just a GET request + goals = Goal.query.all() + if goals == None: + return [] + else: + goals_response = [] + for goal in goals: + goals_response.append(goal.to_json_goal()) + return jsonify(goals_response), 200 + +@goals_bp.route("/", methods=["GET","PUT", "DELETE"]) +def get_single_goal(goal_id): + + goal = Goal.query.get(goal_id) + # With the GET, POST and DELETE request if there is nothing we output this + if request == None or goal == None: + return jsonify(None), 404 + # This portion is the GET request for only one task + elif request.method == "GET": + return {"goal": goal.to_json_goal()}, 200 + elif request.method == "PUT": + # This portion is the PUT request for only one task + request_body = request.get_json() + goal.title = request_body["title"] + # Save action + db.session.commit() + return {"goal": goal.to_json_goal()}, 200 + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + return { + "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" + }, 200 + + +# # ===============Establishing One to Many Realtionship================================= + +# @goals_bp.route("goals//tasks", method=["POST"]) +# def send_task_ids(): +# request_body = request.get_json() +# add_tasks = Goal(tasks=request_body["task_ids"]) + +# db.session.add(add_tasks) +# db.session.commit() +# return { "id": "goal_id", "task_ids": add_tasks}, 201 \ No newline at end of file diff --git a/migrations/versions/5a8537a0140d_.py b/migrations/versions/5a8537a0140d_.py new file mode 100644 index 000000000..26941bafb --- /dev/null +++ b/migrations/versions/5a8537a0140d_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 5a8537a0140d +Revises: 339e72752100 +Create Date: 2021-05-12 08:43:05.678562 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5a8537a0140d' +down_revision = '339e72752100' +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 ### diff --git a/migrations/versions/d1fe3aa0c191_.py b/migrations/versions/d1fe3aa0c191_.py new file mode 100644 index 000000000..0b157ef59 --- /dev/null +++ b/migrations/versions/d1fe3aa0c191_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: d1fe3aa0c191 +Revises: 5a8537a0140d +Create Date: 2021-05-12 14:17:28.686324 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd1fe3aa0c191' +down_revision = '5a8537a0140d' +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 41c738cebd7cf02b5667ae8264e98b89d00c0950 Mon Sep 17 00:00:00 2001 From: Abigail Charime Date: Wed, 12 May 2021 23:57:18 -0700 Subject: [PATCH 6/7] Added GET and POST functionality to code --- app/__init__.py | 1 + app/models/goal.py | 2 +- app/models/task.py | 30 ++++++++++++++++-------- app/routes.py | 34 +++++++++++++++++++++------- migrations/versions/10fba805e3f7_.py | 34 ++++++++++++++++++++++++++++ migrations/versions/1bf482252e77_.py | 34 ++++++++++++++++++++++++++++ 6 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 migrations/versions/10fba805e3f7_.py create mode 100644 migrations/versions/1bf482252e77_.py diff --git a/app/__init__.py b/app/__init__.py index 38289100f..b4aaa45e3 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -35,5 +35,6 @@ def create_app(test_config=None): from .routes import goals_bp app.register_blueprint(goals_bp) + from app.models.goal import Goal return app diff --git a/app/models/goal.py b/app/models/goal.py index c22d5a107..b49e29be1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,11 +4,11 @@ class Goal(db.Model): + __tablename__ = 'goal' goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) tasks = db.relationship('Task', backref='goal', lazy=True) - def to_json_goal(self): # This method was created so that we do not have to write out the dictionary many times in the routes.py file. return { diff --git a/app/models/task.py b/app/models/task.py index ad2b439da..aae718f45 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,7 +4,7 @@ class Task(db.Model): - + __tablename__ = 'task' task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) description = db.Column(db.String) @@ -20,12 +20,22 @@ def to_json(self): result = self.completed_at result = False - # This method was created so that we do not have to write out the dictionary many times in the routes.py file. - return { - "id": self.task_id, - "title": self.title, - "description": self.description, - # Not sure if I should change this part to make if completed_at is null is_complete is False - "is_complete": result - } - \ No newline at end of file + # This method was created so that we do not have to write out the dictionary many times in the routes.py file. + if self.goal_id == None: + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + # Not sure if I should change this part to make if completed_at is null is_complete is False + "is_complete": result + } + else: + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + # Not sure if I should change this part to make if completed_at is null is_complete is False + "is_complete": result, + "goal_id": self.goal_id + + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 32550ef40..463c1f613 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,7 +1,7 @@ from werkzeug.datastructures import Authorization from app import db from app.models.task import Task -from flask import Blueprint, request, jsonify +from flask import Blueprint, request, jsonify, make_response from datetime import datetime import os import requests @@ -178,11 +178,29 @@ def get_single_goal(goal_id): # # ===============Establishing One to Many Realtionship================================= -# @goals_bp.route("goals//tasks", method=["POST"]) -# def send_task_ids(): -# request_body = request.get_json() -# add_tasks = Goal(tasks=request_body["task_ids"]) -# db.session.add(add_tasks) -# db.session.commit() -# return { "id": "goal_id", "task_ids": add_tasks}, 201 \ No newline at end of file +@goals_bp.route("/tasks", methods=["POST"]) +def post_tasks_ids_to_goal(goal_id): + goal = Goal.query.get(goal_id) + request_body = request.get_json() + # Post + + for task_id in request_body["task_ids"]: + task = Task.query.get(task_id) + goal.tasks.append(task) + db.session.commit() + return make_response({"id": goal.goal_id, "task_ids": request_body["task_ids"]}, 200) + +@goals_bp.route("/tasks", methods=["GET"]) +def getting_tasks_of_one_goal(goal_id): + goal = Goal.query.get(goal_id) + if goal == None: + return jsonify(None), 404 + else: + tasks_from_goal = goal.tasks + + tasks_response = [] + for task in tasks_from_goal: + tasks_response.append(task.to_json()) + + return {"id":goal.goal_id,"title": goal.title, "tasks": tasks_response}, 200 \ No newline at end of file diff --git a/migrations/versions/10fba805e3f7_.py b/migrations/versions/10fba805e3f7_.py new file mode 100644 index 000000000..b39d99560 --- /dev/null +++ b/migrations/versions/10fba805e3f7_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 10fba805e3f7 +Revises: 1bf482252e77 +Create Date: 2021-05-12 20:53:38.453343 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '10fba805e3f7' +down_revision = '1bf482252e77' +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.drop_constraint('task_goal_id_FK_fkey', 'task', type_='foreignkey') + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + op.drop_column('task', 'goal_id_FK') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id_FK', sa.INTEGER(), autoincrement=False, nullable=True)) + op.drop_constraint(None, 'task', type_='foreignkey') + op.create_foreign_key('task_goal_id_FK_fkey', 'task', 'goal', ['goal_id_FK'], ['goal_id']) + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/1bf482252e77_.py b/migrations/versions/1bf482252e77_.py new file mode 100644 index 000000000..d5734400f --- /dev/null +++ b/migrations/versions/1bf482252e77_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 1bf482252e77 +Revises: d1fe3aa0c191 +Create Date: 2021-05-12 19:31:53.269412 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1bf482252e77' +down_revision = 'd1fe3aa0c191' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id_FK', sa.Integer(), nullable=True)) + op.drop_constraint('task_goal_id_fkey', 'task', type_='foreignkey') + op.create_foreign_key(None, 'task', 'goal', ['goal_id_FK'], ['goal_id']) + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.INTEGER(), autoincrement=False, nullable=True)) + op.drop_constraint(None, 'task', type_='foreignkey') + op.create_foreign_key('task_goal_id_fkey', 'task', 'goal', ['goal_id'], ['goal_id']) + op.drop_column('task', 'goal_id_FK') + # ### end Alembic commands ### From 1ba97ef80bb7da06c04c97fa8cfbf6998217d961 Mon Sep 17 00:00:00 2001 From: Abigail Charime Date: Thu, 13 May 2021 00:05:40 -0700 Subject: [PATCH 7/7] Cleaned up code, Passed wave 6 --- app/models/task.py | 2 -- app/routes.py | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index aae718f45..f08626f5c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -26,7 +26,6 @@ def to_json(self): "id": self.task_id, "title": self.title, "description": self.description, - # Not sure if I should change this part to make if completed_at is null is_complete is False "is_complete": result } else: @@ -34,7 +33,6 @@ def to_json(self): "id": self.task_id, "title": self.title, "description": self.description, - # Not sure if I should change this part to make if completed_at is null is_complete is False "is_complete": result, "goal_id": self.goal_id diff --git a/app/routes.py b/app/routes.py index 463c1f613..b16754dc5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -23,7 +23,6 @@ def get_single_task(task_id): request_body = request.get_json() task.title = request_body["title"] task.description = request_body["description"] - # Save action db.session.commit() return {"task": task.to_json()}, 200 elif request.method == "DELETE": @@ -49,7 +48,7 @@ def tasks_index(): tasks = Task.query.order_by(Task.title.desc()) else: tasks = Task.query.all() - # This portion is the just a GET request + # This portion is just a GET request if tasks == None: return [] else: @@ -91,7 +90,6 @@ def mark_complete(task_id): def bot_notification(patch_task): - # notification_task = Task.query.get(task_id) PATH = "https://slack.com/api/chat.postMessage" API_TOKEN = os.environ.get("API_KEY") @@ -158,14 +156,13 @@ def get_single_goal(goal_id): # With the GET, POST and DELETE request if there is nothing we output this if request == None or goal == None: return jsonify(None), 404 - # This portion is the GET request for only one task + # This portion is the GET request for only one goal elif request.method == "GET": return {"goal": goal.to_json_goal()}, 200 elif request.method == "PUT": - # This portion is the PUT request for only one task + # This portion is the PUT request for only one goal request_body = request.get_json() goal.title = request_body["title"] - # Save action db.session.commit() return {"goal": goal.to_json_goal()}, 200 elif request.method == "DELETE": @@ -183,7 +180,6 @@ def get_single_goal(goal_id): def post_tasks_ids_to_goal(goal_id): goal = Goal.query.get(goal_id) request_body = request.get_json() - # Post for task_id in request_body["task_ids"]: task = Task.query.get(task_id)