From 52915953088240f2344ad0a6abb39c07056e8820 Mon Sep 17 00:00:00 2001 From: Araceli Date: Mon, 10 May 2021 08:33:27 -0700 Subject: [PATCH 1/6] mid point review --- app/__init__.py | 8 +- app/models/task.py | 15 ++- app/routes.py | 136 ++++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ migrations/versions/2d846581fa16_.py | 39 ++++++++ 8 files changed, 358 insertions(+), 6 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/2d846581fa16_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..eeb520216 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,12 +15,10 @@ def create_app(test_config=None): app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = "postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_development" else: app.config["TESTING"] = True - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = "postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_test" # Import models here for Alembic setup from app.models.task import Task @@ -30,5 +28,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..3531014c5 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,19 @@ -from flask import current_app +from flask import request, 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) + + +def to_dict(self): + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..1c9509197 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,136 @@ -from flask import Blueprint +from app import db +from app.models.task import Task, to_dict +from flask import Blueprint, request, make_response, jsonify + +tasks_bp = Blueprint("tasks", __name__) + +@tasks_bp.route("/tasks", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + response = {"details": "Invalid data"} + + if "title" not in request_body.keys() or "description" not in request_body.keys() or "completed_at" not in request_body.keys(): + + return jsonify(response), 400 + + else: + 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() + valid_task = {"task": to_dict(new_task)} + + return jsonify(valid_task), 201 + + +@tasks_bp.route("/tasks?sort=asc", methods=["GET"]) +def asc_tasks_sort(tasks): + tasks = Task.query.all() + tasks_response = [] + + if tasks is None: + return jsonify(tasks_response) + + else: + for task in tasks: + tasks_response.append(to_dict(task)) + + sorted_list = sorted(tasks_response, key=lambda x: (x["title"])) + + return jsonify(sorted_list) + + +@tasks_bp.route("/tasks", methods=["GET"]) +def get_tasks(): + tasks = Task.query.all() + tasks_response = [] + + if tasks is None: + return jsonify(tasks_response) + + else: + for task in tasks: + tasks_response.append(to_dict(task)) + + return jsonify(tasks_response) + + +@tasks_bp.route("/tasks/", methods=["GET", "PUT", "DELETE"]) +def handle_task(task_id): + + task = Task.query.get(task_id) + + if request.method == "GET": + if task is None: + return make_response(f"404 Not Found", 404) + + else: + one_task = to_dict(task) + + return {"task": one_task} + + + elif request.method == "PUT": + if task: + form_data = request.get_json() + task.title = form_data["title"] + task.description = form_data["description"] + task.is_complete = form_data["completed_at"] + db.session.commit() + + updated_task = { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at) + } + else: + return make_response(f"", 404) + + return {'task': updated_task} + + elif request.method == "DELETE": + if task: + db.session.delete(task) + db.session.commit() + + response = {"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"} + + return jsonify(response), 200 + + else: + return make_response(f"", 404) + + +@tasks_bp.route("/tasks//mark_complete", methods=["PATCH"]) +def mark_complete(task): + + request_body = request.get_json() + complete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) + + + mark_task_complete = { + "id": complete_task.task_id, + "title": complete_task.title, + "description": complete_task.description, + "is_complete": True + } + + return {"task": mark_task_complete} + + +@tasks_bp.route("/tasks//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task): + request_body = request.get_json() + incomplete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) + + + mark_task_incomplete = { + "id": incomplete_task.task_id, + "title": incomplete_task.title, + "description": incomplete_task.description, + "is_complete": False + } + + return {"task": mark_task_incomplete} 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/2d846581fa16_.py b/migrations/versions/2d846581fa16_.py new file mode 100644 index 000000000..53961cef8 --- /dev/null +++ b/migrations/versions/2d846581fa16_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 2d846581fa16 +Revises: +Create Date: 2021-05-09 17:57:28.378225 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2d846581fa16' +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 1689e2b98dbb762791550884cf9a749d06b99c00 Mon Sep 17 00:00:00 2001 From: Araceli Date: Mon, 10 May 2021 12:20:06 -0700 Subject: [PATCH 2/6] updates --- app/routes.py | 71 +++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/app/routes.py b/app/routes.py index 1c9509197..16983cf06 100644 --- a/app/routes.py +++ b/app/routes.py @@ -24,21 +24,22 @@ def create_task(): return jsonify(valid_task), 201 -@tasks_bp.route("/tasks?sort=asc", methods=["GET"]) -def asc_tasks_sort(tasks): - tasks = Task.query.all() - tasks_response = [] +# @tasks_bp.route("/tasks?sort=asc", methods=["GET"]) +# def asc_tasks_sort(tasks): +# tasks = Task.query.all() +# tasks_response = [] - if tasks is None: - return jsonify(tasks_response) +# if tasks is None: +# return jsonify(tasks_response) - else: - for task in tasks: - tasks_response.append(to_dict(task)) +# else: +# for task in tasks: +# tasks_response.append(to_dict(task)) - sorted_list = sorted(tasks_response, key=lambda x: (x["title"])) +# sorted_list = sorted(tasks_response, key=lambda x: (x["title"])) + +# return jsonify(sorted_list) - return jsonify(sorted_list) @tasks_bp.route("/tasks", methods=["GET"]) @@ -103,34 +104,36 @@ def handle_task(task_id): return make_response(f"", 404) -@tasks_bp.route("/tasks//mark_complete", methods=["PATCH"]) -def mark_complete(task): +# @tasks_bp.route("/tasks//mark_complete", methods=["PATCH"]) +# def mark_complete(task): - request_body = request.get_json() - complete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) +# request_body = request.get_json() +# complete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) - mark_task_complete = { - "id": complete_task.task_id, - "title": complete_task.title, - "description": complete_task.description, - "is_complete": True - } +# mark_task_complete = { +# "id": complete_task.task_id, +# "title": complete_task.title, +# "description": complete_task.description, +# "is_complete": True +# } - return {"task": mark_task_complete} +# return {"task": mark_task_complete} -@tasks_bp.route("/tasks//mark_incomplete", methods=["PATCH"]) -def mark_incomplete(task): - request_body = request.get_json() - incomplete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) +# @tasks_bp.route("/tasks//mark_incomplete", methods=["PATCH"]) +# def mark_incomplete(task): +# request_body = request.get_json() +# incomplete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) - mark_task_incomplete = { - "id": incomplete_task.task_id, - "title": incomplete_task.title, - "description": incomplete_task.description, - "is_complete": False - } - - return {"task": mark_task_incomplete} +# mark_task_incomplete = { +# "id": incomplete_task.task_id, +# "title": incomplete_task.title, +# "description": incomplete_task.description, +# "is_complete": False +# } + +# return {"task": mark_task_incomplete} + +# comment From de638eb175f9dc127fb62e3fcbf6fbf6a6f2383b Mon Sep 17 00:00:00 2001 From: Araceli Date: Wed, 12 May 2021 11:22:02 -0700 Subject: [PATCH 3/6] most recent version --- app/__init__.py | 2 + app/models/goal.py | 8 +- app/models/task.py | 11 +- app/routes.py | 168 ++++++++++++++++++--------- migrations/versions/1b4c721059dd_.py | 32 +++++ 5 files changed, 167 insertions(+), 54 deletions(-) create mode 100644 migrations/versions/1b4c721059dd_.py diff --git a/app/__init__.py b/app/__init__.py index eeb520216..7da712a09 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -29,6 +29,8 @@ def create_app(test_config=None): # Register Blueprints here from .routes import tasks_bp + from .routes import goals_bp app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..c98d38dce 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 to_json(self): + return { + "id": self.goal_id, + "title": self.title, + } diff --git a/app/models/task.py b/app/models/task.py index 3531014c5..c5013da93 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,7 +6,7 @@ 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) + completed_at = db.Column(db.DateTime, nullable=True) def to_dict(self): @@ -17,3 +17,12 @@ def to_dict(self): "is_complete": bool(self.completed_at) } +# def completed_task(self): +# if self.completed_at == None: +# completed = False +# else: +# completed = True + + + + diff --git a/app/routes.py b/app/routes.py index 16983cf06..fbdc27ab4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,11 +1,19 @@ from app import db from app.models.task import Task, to_dict +from app.models.goal import Goal, to_json from flask import Blueprint, request, make_response, jsonify +from datetime import datetime +from dotenv import load_dotenv +import os +import requests +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") +load_dotenv() -tasks_bp = Blueprint("tasks", __name__) +# tasks -@tasks_bp.route("/tasks", methods=["POST"]) +@tasks_bp.route("", methods=["POST"], strict_slashes=False) def create_task(): request_body = request.get_json() @@ -24,40 +32,30 @@ def create_task(): return jsonify(valid_task), 201 -# @tasks_bp.route("/tasks?sort=asc", methods=["GET"]) -# def asc_tasks_sort(tasks): -# tasks = Task.query.all() -# tasks_response = [] - -# if tasks is None: -# return jsonify(tasks_response) - -# else: -# for task in tasks: -# tasks_response.append(to_dict(task)) - -# sorted_list = sorted(tasks_response, key=lambda x: (x["title"])) - -# return jsonify(sorted_list) - +@tasks_bp.route("", methods=["GET"], strict_slashes=False) +def get_tasks(): -@tasks_bp.route("/tasks", methods=["GET"]) -def get_tasks(): - tasks = Task.query.all() tasks_response = [] - if tasks is None: - return jsonify(tasks_response) + 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: - for task in tasks: - tasks_response.append(to_dict(task)) + tasks = Task.query.all() + + for task in tasks: + tasks_response.append(to_dict(task)) - return jsonify(tasks_response) + return jsonify(tasks_response), 200 -@tasks_bp.route("/tasks/", methods=["GET", "PUT", "DELETE"]) +@tasks_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes=False) def handle_task(task_id): task = Task.query.get(task_id) @@ -104,36 +102,102 @@ def handle_task(task_id): return make_response(f"", 404) -# @tasks_bp.route("/tasks//mark_complete", methods=["PATCH"]) -# def mark_complete(task): +@tasks_bp.route("//mark_complete", methods=["PATCH"], strict_slashes=False) +def mark_complete(task_id): -# request_body = request.get_json() -# complete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) + task = Task.query.get(task_id) - -# mark_task_complete = { -# "id": complete_task.task_id, -# "title": complete_task.title, -# "description": complete_task.description, -# "is_complete": True -# } + if task is None: + return jsonify(None), 404 -# return {"task": mark_task_complete} + task.completed_at = datetime.utcnow() + db.session.commit() + slack_bot_message("Did this work") + + return jsonify({"task": to_dict(task)}), 200 + +def slack_bot_message(message): + path = "https://slack.com/api/chat.postMessage" + SLACK_KEY = os.environ.get("SLACK_TOKEN") + headers = {"Authorization": f"Bearer {SLACK_KEY}"} + query_params = {"channel": "task-notifications", "text": message} + requests.post(path, params=query_params, headers=headers) -# @tasks_bp.route("/tasks//mark_incomplete", methods=["PATCH"]) -# def mark_incomplete(task): -# request_body = request.get_json() -# incomplete_task = Task(title = request_body["title"], description = request_body["description"], completed_at = request_body["completed_at"]) - -# mark_task_incomplete = { -# "id": incomplete_task.task_id, -# "title": incomplete_task.title, -# "description": incomplete_task.description, -# "is_complete": False -# } -# return {"task": mark_task_incomplete} +@tasks_bp.route("/mark_incomplete", methods=["PATCH"], strict_slashes=False) +def mark_incomplete(task_id): -# comment + task = Task.query.get(task_id) + + if task is None: + return jsonify(None), 404 + + task.completed_at = None + db.session.commit() + + return jsonify({"task": to_dict(task)}), 200 + + +# goals + +@goals_bp.route("", methods=["POST"], strict_slashes=False) +def create_goal(): + request_body = request.get_json() + + response = {"details": "Invalid data"} + + if "title" not in request_body.keys(): + + return jsonify(response), 400 + + else: + new_goal = Goal(title = request_body["title"]) + db.session.add(new_goal) + db.session.commit() + valid_goal = {"goal": to_json(new_goal)} + + return jsonify(valid_goal), 201 + +@goals_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes=False) +def handle_goal(goal_id): + + goal = Goal.query.get(goal_id) + + if request.method == "GET": + if goal is None: + return make_response(f"404 Not Found", 404) + + else: + one_goal = to_json(goal) + + return {"goal": one_goal} + + elif request.method == "PUT": + if goal: + form_data = request.get_json() + goal.title = form_data["title"] + db.session.commit() + + updated_goal = { + "id": goal.goal_id, + "title": goal.title + } + + else: + return make_response(f"", 404) + + return {'goal': updated_goal} + + elif request.method == "DELETE": + if goal: + db.session.delete(goal) + db.session.commit() + + response = {"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"} + + return jsonify(response), 200 + + else: + return make_response(f"", 404) diff --git a/migrations/versions/1b4c721059dd_.py b/migrations/versions/1b4c721059dd_.py new file mode 100644 index 000000000..1f4a1afc4 --- /dev/null +++ b/migrations/versions/1b4c721059dd_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 1b4c721059dd +Revises: 2d846581fa16 +Create Date: 2021-05-12 00:27:08.504853 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1b4c721059dd' +down_revision = '2d846581fa16' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('completed_at', sa.DateTime(), nullable=True)) + op.add_column('goal', sa.Column('description', sa.String(), nullable=True)) + 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') + op.drop_column('goal', 'description') + op.drop_column('goal', 'completed_at') + # ### end Alembic commands ### From ef7b48c97fe25c6ad869f72a11e2e41b9c11c431 Mon Sep 17 00:00:00 2001 From: Araceli Date: Wed, 12 May 2021 20:16:04 -0700 Subject: [PATCH 4/6] updates --- app/models/goal.py | 3 ++ app/models/task.py | 3 +- app/routes.py | 71 ++++++++++++++++++++++++---- migrations/versions/7325a3cbdc46_.py | 30 ++++++++++++ migrations/versions/848a9211d197_.py | 34 +++++++++++++ 5 files changed, 130 insertions(+), 11 deletions(-) create mode 100644 migrations/versions/7325a3cbdc46_.py create mode 100644 migrations/versions/848a9211d197_.py diff --git a/app/models/goal.py b/app/models/goal.py index c98d38dce..051aa7c35 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,12 +1,15 @@ from flask import current_app from app import db +# from app.models.task import Task class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) + tasks = db.relationship("Task", backref="owner", lazy=True) def to_json(self): return { "id": self.goal_id, "title": self.title, } + diff --git a/app/models/task.py b/app/models/task.py index c5013da93..7326885cf 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,6 @@ from flask import request, current_app from app import db +# from app.models.goal import Goal class Task(db.Model): @@ -7,7 +8,7 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) - + owner_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id")) def to_dict(self): return { diff --git a/app/routes.py b/app/routes.py index fbdc27ab4..0895e7c96 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,3 +1,4 @@ +from flask.wrappers import Response from app import db from app.models.task import Task, to_dict from app.models.goal import Goal, to_json @@ -15,6 +16,7 @@ @tasks_bp.route("", methods=["POST"], strict_slashes=False) def create_task(): + request_body = request.get_json() response = {"details": "Invalid data"} @@ -35,7 +37,6 @@ def create_task(): @tasks_bp.route("", methods=["GET"], strict_slashes=False) def get_tasks(): - tasks_response = [] sort_query = request.args.get("sort") @@ -113,11 +114,11 @@ def mark_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() - slack_bot_message("Did this work") + slack_bot_notification("Did this work") return jsonify({"task": to_dict(task)}), 200 -def slack_bot_message(message): +def slack_bot_notification(message): path = "https://slack.com/api/chat.postMessage" SLACK_KEY = os.environ.get("SLACK_TOKEN") headers = {"Authorization": f"Bearer {SLACK_KEY}"} @@ -125,7 +126,6 @@ def slack_bot_message(message): requests.post(path, params=query_params, headers=headers) - @tasks_bp.route("/mark_incomplete", methods=["PATCH"], strict_slashes=False) def mark_incomplete(task_id): @@ -160,19 +160,35 @@ def create_goal(): return jsonify(valid_goal), 201 +@goals_bp.route("", methods=["GET"], strict_slashes=False) +def get_goals(): + + goals = Goal.query.all() + goals_response = [] + + if goals != None: + + for goal in goals: + goals_response.append(to_json(goal)) + + return jsonify(goals_response), 200 + + return jsonify(goals_response), 200 + + @goals_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes=False) def handle_goal(goal_id): - + goal = Goal.query.get(goal_id) if request.method == "GET": if goal is None: - return make_response(f"404 Not Found", 404) - + return make_response(f"", 404) + else: - one_goal = to_json(goal) - - return {"goal": one_goal} + valid_goal = {"goal": to_json(goal)} + + return jsonify(valid_goal), 200 elif request.method == "PUT": if goal: @@ -201,3 +217,38 @@ def handle_goal(goal_id): else: return make_response(f"", 404) + + +@goals_bp.route("//tasks", methods=["POST", "GET"], strict_slashes=False) +def goal_task_relationship(goal_id): + + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response("", 404) + + if request.method == "POST": + + response_body = request.get_json() + task_ids_list = [] + + + for task_id in response_body["task_ids"]: + task = Task.query.get(task_id) + + task_ids_list.append(task) + + task.goal_id = goal_id + + db.session.commit() + + return ({"id": int(goal_id), "task_ids": task_ids_list}) + + # elif request.method == "GET": + + # task_goal = [] + + # for task in goal.tasks: + # task_goal.append(to_dict(task)) + + # return make_response(jsonify(id=int(goal_id))) diff --git a/migrations/versions/7325a3cbdc46_.py b/migrations/versions/7325a3cbdc46_.py new file mode 100644 index 000000000..a204c1467 --- /dev/null +++ b/migrations/versions/7325a3cbdc46_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 7325a3cbdc46 +Revises: 848a9211d197 +Create Date: 2021-05-12 17:46:47.020346 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '7325a3cbdc46' +down_revision = '848a9211d197' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint('task_owner_id_fkey', 'task', type_='foreignkey') + op.create_foreign_key(None, 'task', 'goal', ['owner_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.create_foreign_key('task_owner_id_fkey', 'task', 'task', ['owner_id'], ['task_id']) + # ### end Alembic commands ### diff --git a/migrations/versions/848a9211d197_.py b/migrations/versions/848a9211d197_.py new file mode 100644 index 000000000..16aa0a994 --- /dev/null +++ b/migrations/versions/848a9211d197_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 848a9211d197 +Revises: 1b4c721059dd +Create Date: 2021-05-12 17:42:21.006564 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '848a9211d197' +down_revision = '1b4c721059dd' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'description') + op.drop_column('goal', 'completed_at') + op.add_column('task', sa.Column('owner_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'task', ['owner_id'], ['task_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'owner_id') + op.add_column('goal', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True)) + op.add_column('goal', sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=True)) + # ### end Alembic commands ### From f2a85c27376f150dc9ee5c0d532a88b033acdb59 Mon Sep 17 00:00:00 2001 From: Araceli Date: Thu, 13 May 2021 00:26:22 -0700 Subject: [PATCH 5/6] updates procfile --- Procfile | 1 + app/models/goal.py | 2 +- app/models/task.py | 15 +++++- app/routes.py | 47 +++++++++++-------- migrations/versions/1b4c721059dd_.py | 32 ------------- migrations/versions/7325a3cbdc46_.py | 30 ------------ migrations/versions/848a9211d197_.py | 34 -------------- .../{2d846581fa16_.py => 90c15be06d65_.py} | 11 +++-- 8 files changed, 50 insertions(+), 122 deletions(-) create mode 100644 Procfile delete mode 100644 migrations/versions/1b4c721059dd_.py delete mode 100644 migrations/versions/7325a3cbdc46_.py delete mode 100644 migrations/versions/848a9211d197_.py rename migrations/versions/{2d846581fa16_.py => 90c15be06d65_.py} (71%) diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index 051aa7c35..a6e25c9f8 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,7 +5,7 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) - tasks = db.relationship("Task", backref="owner", lazy=True) +# tasks = db.relationship("Task", backref="goal", lazy=True) def to_json(self): return { diff --git a/app/models/task.py b/app/models/task.py index 7326885cf..d50b991f9 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,11 +4,12 @@ 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) - owner_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id")) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + goal = db.relationship("Goal", backref=db.backref("tasks"), lazy=True) def to_dict(self): return { @@ -18,6 +19,16 @@ def to_dict(self): "is_complete": bool(self.completed_at) } +def to_dict_goal(self): + return { + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + + # def completed_task(self): # if self.completed_at == None: # completed = False diff --git a/app/routes.py b/app/routes.py index 0895e7c96..18e4d9cda 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,6 @@ from flask.wrappers import Response from app import db -from app.models.task import Task, to_dict +from app.models.task import Task, to_dict, to_dict_goal from app.models.goal import Goal, to_json from flask import Blueprint, request, make_response, jsonify from datetime import datetime @@ -144,8 +144,9 @@ def mark_incomplete(task_id): @goals_bp.route("", methods=["POST"], strict_slashes=False) def create_goal(): - request_body = request.get_json() + request_body = request.get_json() + response = {"details": "Invalid data"} if "title" not in request_body.keys(): @@ -183,7 +184,7 @@ def handle_goal(goal_id): if request.method == "GET": if goal is None: - return make_response(f"", 404) + return make_response("", 404) else: valid_goal = {"goal": to_json(goal)} @@ -202,7 +203,7 @@ def handle_goal(goal_id): } else: - return make_response(f"", 404) + return make_response("", 404) return {'goal': updated_goal} @@ -224,31 +225,39 @@ def goal_task_relationship(goal_id): goal = Goal.query.get(goal_id) - if goal is None: - return make_response("", 404) + request_body = request.get_json() if request.method == "POST": - - response_body = request.get_json() - task_ids_list = [] + task_ids = request_body["task_ids"] - for task_id in response_body["task_ids"]: + for task_id in task_ids: task = Task.query.get(task_id) + task.goal_id = goal_id # or goal.tasks.append(task) - task_ids_list.append(task) + db.session.commit() - task.goal_id = goal_id + return {"id": int(goal_id), "task_ids": task_ids}, 200 - db.session.commit() + elif request.method == "GET": - return ({"id": int(goal_id), "task_ids": task_ids_list}) + # tasks_list = [] - # elif request.method == "GET": + if goal: + tasks = goal.tasks + + # for task in tasks: + # tasks_list.append(to_dict_goal(task)) - # task_goal = [] + task_list = [to_dict_goal(task) for task in tasks] - # for task in goal.tasks: - # task_goal.append(to_dict(task)) + return { + "id": goal.goal_id, + "title": goal.title, + "tasks": task_list + }, 200 + + else: + return make_response("", 404) + - # return make_response(jsonify(id=int(goal_id))) diff --git a/migrations/versions/1b4c721059dd_.py b/migrations/versions/1b4c721059dd_.py deleted file mode 100644 index 1f4a1afc4..000000000 --- a/migrations/versions/1b4c721059dd_.py +++ /dev/null @@ -1,32 +0,0 @@ -"""empty message - -Revision ID: 1b4c721059dd -Revises: 2d846581fa16 -Create Date: 2021-05-12 00:27:08.504853 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '1b4c721059dd' -down_revision = '2d846581fa16' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('goal', sa.Column('completed_at', sa.DateTime(), nullable=True)) - op.add_column('goal', sa.Column('description', sa.String(), nullable=True)) - 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') - op.drop_column('goal', 'description') - op.drop_column('goal', 'completed_at') - # ### end Alembic commands ### diff --git a/migrations/versions/7325a3cbdc46_.py b/migrations/versions/7325a3cbdc46_.py deleted file mode 100644 index a204c1467..000000000 --- a/migrations/versions/7325a3cbdc46_.py +++ /dev/null @@ -1,30 +0,0 @@ -"""empty message - -Revision ID: 7325a3cbdc46 -Revises: 848a9211d197 -Create Date: 2021-05-12 17:46:47.020346 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '7325a3cbdc46' -down_revision = '848a9211d197' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint('task_owner_id_fkey', 'task', type_='foreignkey') - op.create_foreign_key(None, 'task', 'goal', ['owner_id'], ['goal_id']) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'task', type_='foreignkey') - op.create_foreign_key('task_owner_id_fkey', 'task', 'task', ['owner_id'], ['task_id']) - # ### end Alembic commands ### diff --git a/migrations/versions/848a9211d197_.py b/migrations/versions/848a9211d197_.py deleted file mode 100644 index 16aa0a994..000000000 --- a/migrations/versions/848a9211d197_.py +++ /dev/null @@ -1,34 +0,0 @@ -"""empty message - -Revision ID: 848a9211d197 -Revises: 1b4c721059dd -Create Date: 2021-05-12 17:42:21.006564 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -# revision identifiers, used by Alembic. -revision = '848a9211d197' -down_revision = '1b4c721059dd' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('goal', 'description') - op.drop_column('goal', 'completed_at') - op.add_column('task', sa.Column('owner_id', sa.Integer(), nullable=True)) - op.create_foreign_key(None, 'task', 'task', ['owner_id'], ['task_id']) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'task', type_='foreignkey') - op.drop_column('task', 'owner_id') - op.add_column('goal', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True)) - op.add_column('goal', sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=True)) - # ### end Alembic commands ### diff --git a/migrations/versions/2d846581fa16_.py b/migrations/versions/90c15be06d65_.py similarity index 71% rename from migrations/versions/2d846581fa16_.py rename to migrations/versions/90c15be06d65_.py index 53961cef8..e7d5d080a 100644 --- a/migrations/versions/2d846581fa16_.py +++ b/migrations/versions/90c15be06d65_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 2d846581fa16 +Revision ID: 90c15be06d65 Revises: -Create Date: 2021-05-09 17:57:28.378225 +Create Date: 2021-05-12 22:24:33.196689 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '2d846581fa16' +revision = '90c15be06d65' down_revision = None branch_labels = None depends_on = None @@ -20,13 +20,16 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.create_table('goal', sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), sa.PrimaryKeyConstraint('goal_id') ) op.create_table('task', - sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('title', sa.String(), nullable=True), sa.Column('description', sa.String(), nullable=True), sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ), sa.PrimaryKeyConstraint('task_id') ) # ### end Alembic commands ### From ae6da1147152fc112ec185f2131892d0a8f6b59e Mon Sep 17 00:00:00 2001 From: Araceli Date: Thu, 13 May 2021 00:46:35 -0700 Subject: [PATCH 6/6] changes --- Procfile | 2 +- app/__init__.py | 4 ++-- app/models/goal.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Procfile b/Procfile index 62e430aca..6730bb663 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn 'app:create_app()' \ No newline at end of file +web: gunicorn "app:create_app()" \ No newline at end of file diff --git a/app/__init__.py b/app/__init__.py index 7da712a09..96eb32093 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,10 +15,10 @@ def create_app(test_config=None): app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = "postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_development" + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI") else: app.config["TESTING"] = True - app.config["SQLALCHEMY_DATABASE_URI"] = "postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_test" + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task diff --git a/app/models/goal.py b/app/models/goal.py index a6e25c9f8..e777f1fe7 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,7 +5,6 @@ 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 to_json(self): return {