diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..50f15d5de 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - + from app.models.task import Task + 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..a361dd27d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,29 @@ from flask import current_app +import requests, os 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) + is_complete = db.Column(db.Boolean) + + def to_dict(self): + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.completed_at is not None + } + + def post_message_on_slack(self): + url = os.environ.get("URL") + data = { + 'token': os.environ.get("KEY"), + 'channel': "task_notifications", + 'text': f"Someone just completed the task: {self.title}" + } + requests.post(url, data) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..bdd22e6e1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,115 @@ from flask import Blueprint +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, make_response, request, abort +import datetime, requests, os +import os + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +def valid_int(number, parameter_type): + try: + int(number) + except: + abort(make_response({"error": f"{parameter_type} must be an int"})), 400 + +def get_task_from_id(task_id): + valid_int(task_id, "task_id") + return Task.query.get_or_404(task_id, description="{task not found}") + + +@tasks_bp.route("", methods=["POST"]) +def create_tasks(): + 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 + + 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_dict()}), 201 + + +@tasks_bp.route("/", methods=["GET"]) +def read_task(task_id): + task = get_task_from_id(task_id) + return {"task": task.to_dict()} + + +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = get_task_from_id(task_id) + db.session.delete(task) + db.session.commit() + return make_response({"details":f'Task {task.task_id} "{task.title}" successfully deleted'}), 200 + +@tasks_bp.route("/", methods=["PUT"]) +def update_task(task_id): + task= get_task_from_id(task_id) + request_body=request.get_json() + + if "title" in request_body: + task.title=request_body["title"] + if "description" in request_body: + task.description=request_body["description"] + if "completed_at" in request_body: + task.completed_at=request_body["completed_at"] + + db.session.commit() + return make_response({"task":task.to_dict()}), 200 + + +@tasks_bp.route("", methods=["GET"]) +def read_all_tasks(): + + 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: + tasks = Task.query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append( + task.to_dict() + ) + return jsonify(tasks_response) + +#### marking tasks complete #### +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete_on_incomplete_task(task_id): + + task = get_task_from_id(task_id) + + task.completed_at = datetime.date.today() + db.session.commit() + + task.post_message_on_slack() + ####i do not know what is missing here### + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete_on_complete_task(task_id): + task = get_task_from_id(task_id) + + task.completed_at = None + db.session.commit() + + + + + + + + + + + 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/00c09637dfc9_.py b/migrations/versions/00c09637dfc9_.py new file mode 100644 index 000000000..91d0affb7 --- /dev/null +++ b/migrations/versions/00c09637dfc9_.py @@ -0,0 +1,40 @@ +"""empty message + +Revision ID: 00c09637dfc9 +Revises: +Create Date: 2021-11-04 10:47:01.998328 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '00c09637dfc9' +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.Column('is_complete', sa.Boolean(), 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 ###