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/__init__.py b/app/__init__.py index 2764c4cc8..477096f1f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -25,10 +25,12 @@ def create_app(test_config=None): # Import models here for Alembic setup from app.models.task import Task from app.models.goal import Goal - + from .routes import tasks_bp + from .routes import goals_bp db.init_app(app) migrate.init_app(app, db) # Register Blueprints here - + 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..3a41f956b 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,5 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.Text) + task_id = db.relationship("Task", backref='goal', lazy=True) diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..dd8af010a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,3 +4,10 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.Text) + description = db.Column(db.Text) + completed_at = db.Column(db.DateTime,nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) + + + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..b1d5a6ea2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,253 @@ -from flask import Blueprint +from app import db +from app.models.task import Task +from app.models.goal import Goal +from flask import request, Blueprint, make_response, jsonify +from sqlalchemy import asc, desc +from datetime import datetime +import os +import requests + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint('goals', __name__, url_prefix='/goals') + +def is_complete(completed_at): + + if completed_at is None: + return False + else: + return True +token=os.environ.get('SLACK_TOKEN') + +@tasks_bp.route("", methods=["GET", "POST"]) +def handle_tasks(): + + if request.method == "GET": + tasks = Task.query.all() + title_query = request.args.get("sort") + if title_query == "asc": + tasks = Task.query.order_by(asc(Task.title)) + elif title_query == "desc": + tasks = Task.query.order_by(desc(Task.title)) + + tasks_response = [] + + for task in tasks: + if task.completed_at is None : + tasks_response.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete" : False + }) + else: + tasks_response.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "completed_at": task.completed_at, + "is_complete" : False + }) + return jsonify(tasks_response), 200 + + if request.method == "POST": + request_body = request.get_json() + if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: + return make_response({ + "details": "Invalid data" + }, 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() + return make_response( + { "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": is_complete(new_task.completed_at) + }}, 201) + +@tasks_bp.route("/", methods=["GET","PUT", "DELETE"]) +def handle_tasks_id(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + if request.method == "GET": + if task is not None: + return {"task":{ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + }} + + + elif request.method == "PUT": + data = request.get_json() + + task.title = data["title"] + task.description = data["description"] + task.completed_at = data["completed_at"] + + db.session.commit() + + data_response= { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": is_complete(task.completed_at) + } + } + return make_response(jsonify(data_response),200) + + + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + + delete_id_response= f'Task {task.task_id} "{task.title}" successfully deleted' + + return make_response(jsonify({"details":delete_id_response})) + + +@tasks_bp.route("//mark_complete", methods = ["PATCH"]) +def handle_complete(task_id): + task = Task.query.get(task_id) + + if task is None : + return make_response("", 404) + + task.completed_at = datetime.now() + + db.session.commit() + + slack_url='https://slack.com/api/chat.postMessage' + token= os.environ.get("SLACK_TOKEN") + params = { + 'channel': 'task-notifications', + 'text': f'Someone just completed the task {task.title}' + } + headers={ + 'Content-type': 'application/json', + 'Authorization': f"Bearer {token}" + } + + requests.post(slack_url,json=params,headers=headers) + data_response = { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True + } + } + + + return make_response(jsonify(data_response),200) + + + +@tasks_bp.route("//mark_incomplete", methods = ["PATCH"]) +def handle_incomplete(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response("",404) + + data_response = { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + } + db.session.commit() + if task.completed_at is None : + return make_response(jsonify(data_response),200) + + task.completed_at = None + return make_response(jsonify(data_response),200) + + + + +# Routes for Goal + +@goals_bp.route("", methods=["GET","POST"]) +def handle_goals(): + goal_reponse=[] + goals = Goal.query.all() + + if request.method == "GET": + + for goal in goals: + + goal_reponse.append({ + "id": goal.goal_id, + "title":goal.title, + }) + return make_response(jsonify(goal_reponse),200) + + else: + request_body = request.get_json() + if "title" not in request_body: + return make_response({"details": "Invalid data"}, 400) + new_goal = Goal(title = request_body["title"]) + db.session.add(new_goal) + db.session.commit() + response_data = { + "goal": { + 'id': new_goal.goal_id, + "title":new_goal.title + + } + + } + + return make_response(response_data,201) + + + + + +@goals_bp.route("/", methods= ["GET","PUT","DELETE"]) +def handle_goal_id(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return make_response("",404) + if request.method == "GET": + if goal is not None: + return { + "goal":{ + "id" : goal.goal_id, + "title": goal.title + } + } + + elif request.method == "PUT": + data = request.get_json() + goal.title= data["title"] + db.session.commit() + + data_response= { + "goal":{ + "id": goal.goal_id, + "title": goal.title + } + } + + return make_response(data_response) + + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + delete_id_response= f'Goal {goal_id} "{goal.title}" successfully deleted' + return make_response(jsonify({"details":delete_id_response})) + +# @goals_bp.route('/tasks', methods=["GET", "POST"]) + + 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/27ccacbdde36_.py b/migrations/versions/27ccacbdde36_.py new file mode 100644 index 000000000..b74a142d8 --- /dev/null +++ b/migrations/versions/27ccacbdde36_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 27ccacbdde36 +Revises: 68a86dd916cb +Create Date: 2021-06-16 00:55:45.106004 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '27ccacbdde36' +down_revision = '68a86dd916cb' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.Text(), 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/68a86dd916cb_.py b/migrations/versions/68a86dd916cb_.py new file mode 100644 index 000000000..0678b1868 --- /dev/null +++ b/migrations/versions/68a86dd916cb_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 68a86dd916cb +Revises: +Create Date: 2021-06-08 18:56:23.568755 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '68a86dd916cb' +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.Text(), nullable=True), + sa.Column('description', sa.Text(), nullable=True), + sa.Column('completed_at', sa.Time(), 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/6bf85ea8766d_.py b/migrations/versions/6bf85ea8766d_.py new file mode 100644 index 000000000..1d945bc94 --- /dev/null +++ b/migrations/versions/6bf85ea8766d_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 6bf85ea8766d +Revises: 27ccacbdde36 +Create Date: 2021-06-16 19:01:22.550429 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6bf85ea8766d' +down_revision = '27ccacbdde36' +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 ###