diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..9bbc5c0bf 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -25,10 +25,17 @@ 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 app.routes import task_bp + from .routes import goal_bp + db.init_app(app) migrate.init_app(app, db) # Register Blueprints here + app.register_blueprint(task_bp) + app.register_blueprint(goal_bp) return app + + diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..5b57b3aa1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,4 +3,30 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String, nullable=False) + tasks = db.relationship('Task', backref= 'goal', lazy=True) + + + def now_json(self): + return { + "id": self.goal_id, + "title": self.title + } + + def tasks_json(self): + result = [] + for task in self.tasks: + task = task.to_json() + task["goal_id"] = self.goal_id + result.append(task) + return result + + + def full_json(self): + return { + "id": self.goal_id, + "title": self.title, + "tasks": self.tasks_json() + } + \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..1751cf572 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,31 @@ 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) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) + + + def to_json(self): + + if self.completed_at == None: + is_complete = False + else: + is_complete = True + if self.goal_id: + return { + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..8aa391f2c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,188 @@ -from flask import Blueprint +from app import db +from app.models.task import Task +from flask import Blueprint, request, make_response, jsonify +from datetime import datetime +import requests +import flask_migrate +import os +from app.models.goal import Goal + + + +task_bp = Blueprint("task", __name__, url_prefix='/tasks') +goal_bp = Blueprint("goal", __name__, url_prefix='/goals') + +@task_bp.route("", methods=["POST"], strict_slashes = False) +def post_task(): + request_body = request.get_json() + + if "title" in request_body and "description" in request_body and "completed_at" in request_body: + 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 jsonify({"task": new_task.to_json()}), 201 + else: + return make_response({"details": "Invalid data"}), 400 + + +@task_bp.route("", methods=["GET"], strict_slashes = False) +def get_all_tasks(): + sort_method = request.args.get("sort") + if sort_method == "asc": + tasks = Task.query.order_by(Task.title.asc()) + elif sort_method == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + task_response_body = [] + for task in tasks: + task_response_body.append(task.to_json()) + return jsonify(task_response_body), 200 + +@task_bp.route('/', methods=['GET'], strict_slashes = False) +def get_single_task(task_id): # same name as parameter route + task = Task.query.get(task_id) + if not task: + return "", 404 + return make_response({"task": task.to_json()}), 200 + + +@task_bp.route("/", methods=['DELETE', 'PUT'], strict_slashes = False) +def delete_or_put_tasks(task_id): + task = Task.query.get(task_id) + if not task: + return "", 404 + elif request.method == 'DELETE': + db.session.delete(task) + db.session.commit() + return jsonify({ + "details": f'Task {task_id} "{task.title}" successfully deleted' + }), 200 + + elif request.method == 'PUT': + request_body = request.get_json() + task.title = request_body["title"] + task.completed_at = request_body["completed_at"] + task.description = request_body["description"] + db.session.commit() + return jsonify({"task": task.to_json()}), 200 + + +@task_bp.route('//mark_complete', methods=["PATCH"], strict_slashes = False) +def mark_complete(task_id): + task = Task.query.get(task_id) + if task == None: + return make_response(), 404 + + if task: + task.completed_at = datetime.utcnow() + db.session.commit() + call_slack(task) + return make_response({"task": task.to_json()}, 200) + + + +def call_slack(task): + key = os.environ.get("API_KEY") + url = "https://slack.com/api/chat.postMessage" + slack_str = f"Someone just completed the task {task.title}" + requests.post(url, data={"token":key ,"channel":"general" , "text": slack_str}) + + + +@task_bp.route('//mark_incomplete', methods=["PATCH"], strict_slashes = False) +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 jsonify({"task": task.to_json()}), 200 + + + +@goal_bp.route("", methods=["POST"], strict_slashes = False) +def post_new_goal(): + request_body = request.get_json() + + if "title" in request_body: + new_goal = Goal(title=request_body["title"]) + db.session.add(new_goal) + db.session.commit() + return jsonify({"goal": new_goal.now_json()}), 201 + else: + return make_response({"details": "Invalid data"}), 400 + +@goal_bp.route("", methods=["GET"], strict_slashes = False) +def get_all_goals(): + sort_method = request.args.get("sort") + if sort_method == "asc": + goals = Goal.query.order_by(Goal.title.asc()) + elif sort_method == "desc": + goals = Goal.query.order_by(Goal.title.desc()) + else: + goals = Goal.query.all() + goal_response_body = [] + for goal in goals: + goal_response_body.append(goal.now_json()) + return jsonify(goal_response_body), 200 + + + +@goal_bp.route('/', methods=['GET'], strict_slashes = False) +def get_single_goal(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return "", 404 + return make_response({"goal": goal.now_json()}), 200 + +@goal_bp.route("/", methods=['DELETE', 'PUT'], strict_slashes = False) +def delete_or_put_goals(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return "", 404 + elif request.method == 'DELETE': + db.session.delete(goal) + db.session.commit() + return jsonify({ + "details": f'Goal {goal_id} "{goal.title}" successfully deleted' + }), 200 + + elif request.method == 'PUT': + request_body = request.get_json() + goal.title = request_body["title"] + db.session.commit() + return jsonify({"goal": goal.now_json()}), 200 + + +@goal_bp.route("//tasks", methods=["POST"], strict_slashes = False) +def post_new_task(goal_id): + request_body = request.get_json() + task_ids = request_body["task_ids"] + goal = Goal.query.get(goal_id) + for task_id in task_ids: + task = Task.query.get(task_id) + if task.goal_id != goal_id: + goal.tasks.append(task) + response_body = { + "id": goal_id, + "task_ids": task_ids + } + return jsonify(response_body), 200 + + +@goal_bp.route('//tasks', methods=['GET']) +def get_tasks_goals(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return '', 404 + return jsonify(goal.full_json()), 200 + + + + + + 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/69fba104e4eb_.py b/migrations/versions/69fba104e4eb_.py new file mode 100644 index 000000000..26fb39d83 --- /dev/null +++ b/migrations/versions/69fba104e4eb_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 69fba104e4eb +Revises: +Create Date: 2021-05-11 22:36:08.219522 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '69fba104e4eb' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=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 ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ###