diff --git a/.gitignore b/.gitignore index 4e9b18359..9f8aaa5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -138,4 +138,6 @@ dmypy.json .pytype/ # Cython debug symbols -cython_debug/ \ No newline at end of file +cython_debug/ + +venvsource/ \ No newline at end of file diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..8e0a1cfd9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,10 +1,13 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy +from flask import Flask +from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate import os from dotenv import load_dotenv + db = SQLAlchemy() migrate = Migrate() load_dotenv() @@ -24,11 +27,21 @@ def create_app(test_config=None): # Import models here for Alembic setup from app.models.task import Task - from app.models.goal import Goal + db.init_app(app) migrate.init_app(app, db) - # Register Blueprints here + + + 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..572bf5a14 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,12 @@ 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{ + "id": self.goal_id, + "title": self.title, + } + \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..cdc389065 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,38 @@ 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 is_complete(self): + if self.completed_at is None: + is_complete = False + else: + is_complete = True + return is_complete + + def to_json(self): + if self.goal_id: + return { + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } + else: + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } + + def from_json(self, input_data): + return self(title=input_data["title"], + description=input_data["description"], + completed_at=input_data["completed_at"]) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..129c91ab1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,269 @@ -from flask import Blueprint +from app import db +from .models.task import Task +from .models.goal import Goal +from flask import request, Blueprint, make_response, jsonify +from sqlalchemy import desc, asc +import datetime +import os +import requests + + + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + + +@tasks_bp.route("", methods=["POST", "GET"]) +def handle_tasks(): + if request.method == "GET": + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(Task.title) + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete() + }) + return jsonify(tasks_response) + + elif request.method == "POST": + request_body = request.get_json() + + if "title" not in request_body or "description" not in request_body\ + or "completed_at" not in request_body: + return ({ + "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": new_task.is_complete() + }}, 201) + +@tasks_bp.route("/", methods=["GET", "PUT", "DELETE"]) +def handle_task(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + if request.method == "GET": + if task.goal_id is None: + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete() + }} + if task.task_id: + return { + "task": { + "id": task.task_id, + "goal_id": task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete() + }} + else: + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete() + }} + elif request.method == "PUT": + form_data = request.get_json() + + task.title = form_data["title"] + task.description = form_data["description"] + task.completed_at = form_data["completed_at"] + + db.session.commit() + + headers = {"Authorization": os.environ.get("SLACK_KEY")} + data = { + "channel": "C021BV8A5V0", + "text": f"Someone just completed the task {task.title}" + } + + requests.patch('https://slack.com/api/chat.postMessage', + headers=headers, data=data) + + + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete() + }} + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + return { + "details": (f'Task {task.task_id} "{task.title}" successfully deleted') + } + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + task.completed_at = None + db.session.commit() + + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + } + +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + task.completed_at = datetime.datetime.now() + db.session.commit() + + + + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True + } + } + + +@goals_bp.route("", methods=["GET"]) +def get_goals(): + goals = Goal.query.all() + goals_response = [] + for goal in goals: + goals_response.append(goal.to_json()) + return jsonify(goals_response) + +@goals_bp.route("", methods=["POST"]) +def post_goal(): + request_body = request.get_json() + + if "title" not in request_body: + return ({ + "details": "Invalid data" + }, 400) + + new_goal = Goal( + title=request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + + return ({"goal": new_goal.to_json()}, 201) + +@goals_bp.route("/", methods=["GET"]) +def get_task(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return make_response("", 404) + + return { + "goal": goal.to_json() + } + +@goals_bp.route("/", methods=["PUT"]) +def update_task(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return make_response("", 404) + + form_data = request.get_json() + + goal.title = form_data["title"] + + db.session.commit() + + return { + "goal": goal.to_json() + } + +@goals_bp.route("/", methods=["DELETE"]) +def delete_task(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return make_response("", 404) + + db.session.delete(goal) + db.session.commit() + return { + "details": (f'Goal {goal.goal_id} "{goal.title}" successfully deleted') + } + +@goals_bp.route("//tasks", methods=["GET"]) +def get_goals_tasks(goal_id): + + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response("", 404) + + tasks = Task.query.filter_by(goal_id=goal.goal_id) + + tasks_response = [] + for task in tasks: + tasks_dict = task.to_json() + tasks_response.append(tasks_dict) + + return { + "id": goal.goal_id, + "title": goal.title, + "tasks": tasks_response + } + +@goals_bp.route("//tasks", methods=["POST"]) +def post_goals_tasks(goal_id): + + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response("", 404) + + request_body = request.get_json() + + for task_id in request_body["task_ids"]: + task = Task.query.get(task_id) + task.goal_id = goal.goal_id + + db.session.commit() + + return { + "id": goal.goal_id, + "task_ids": request_body["task_ids"] + } \ No newline at end of file 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/a771a348db6c_.py b/migrations/versions/a771a348db6c_.py new file mode 100644 index 000000000..117b67dc5 --- /dev/null +++ b/migrations/versions/a771a348db6c_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: a771a348db6c +Revises: b166692a9bfb +Create Date: 2021-05-11 12:19:27.018643 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a771a348db6c' +down_revision = 'b166692a9bfb' +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/b166692a9bfb_.py b/migrations/versions/b166692a9bfb_.py new file mode 100644 index 000000000..c5aba8b8f --- /dev/null +++ b/migrations/versions/b166692a9bfb_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: b166692a9bfb +Revises: +Create Date: 2021-05-07 14:05:07.791129 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b166692a9bfb' +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('description', sa.String(length=500), nullable=True), + sa.Column('title', sa.String(length=100), 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 ###