diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..f9ded840e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,9 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - + from .routes import task_bp + from .routes import goal_bp + 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..cbcdfb6d1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,21 @@ from flask import current_app +from sqlalchemy.orm import relationship from app import db +from app.models.task import Task +from sqlalchemy import Table, Column, Integer, ForeignKey +from sqlalchemy.orm import relationship +from sqlalchemy.ext.declarative import declarative_base + +Base = declarative_base() 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) + +#helper function-returns goal attributes in corrected format + def goal_to_json(self): + goal_dict={"id": self.goal_id, + "title": self.title} + return goal_dict + diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..ec40f002c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,41 @@ from flask import current_app +from sqlalchemy.orm import backref from app import db 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, default=None) + +#establishing one to many relationship with Goal + goal_id = db.Column(db.Integer,db.ForeignKey('goal.goal_id'), nullable=True) + goal = db.relationship("Goal",backref=db.backref('tasks'),lazy=True) + +#returns True when there is a task completed + def is_complete(self): + if self.completed_at==None: + return False + else: + return True + +#runs to determine which body to return based on goal bool status + def to_json(self): + if self.goal_id == None: + task_dict={ + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } + else: + task_dict={ + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } + return task_dict + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..f785d0681 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,293 @@ -from flask import Blueprint +from flask import request,Blueprint,make_response,jsonify +from werkzeug.datastructures import Authorization +from app import db +from app.models.task import Task +from datetime import datetime +import requests +import os + + + +task_bp = Blueprint("task", __name__, url_prefix="/tasks") + +@task_bp.route("", methods=["GET"]) +def get_tasks(): + + title_query = request.args.get("title") + if title_query: + tasks = Task.query.filter_by(title=title_query) + + else: + tasks = Task.query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_json()) + + if "asc" in request.full_path: + sort_tasks=sorted(tasks_response, key = lambda i: i['title']) + return jsonify(sort_tasks) + + elif "desc" in request.full_path: + sort_tasks=sorted(tasks_response, key = lambda i: i['title'], reverse=True) + return jsonify(sort_tasks) + + else: + return jsonify(tasks_response) + +@task_bp.route("", methods=["POST"]) +def post_tasks(): + + request_body = request.get_json() + + if all(keys in request_body for keys in ("title","description","completed_at"))== False: + 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() + + task = Task.query.get(new_task.task_id) + return { + "task": task.to_json() + }, 201 + + +@task_bp.route("/", methods=["GET"]) +def get_task(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response ("",404) + else: + return {"task":task.to_json()},200 + + +@task_bp.route("/", methods=["PUT"]) +def put_task(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response ("",404) + else: + 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() + + return { + "task": task.to_json() + }, 200 + +@task_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response ("",404) + else: + + db.session.delete(task) + + db.session.commit() + + + return make_response({ + "details": f'Task {task.task_id} \"{task.title}\" successfully deleted' + }, 200) + +@task_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": task.to_json() + }, 200 + + +@task_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.utcnow() + db.session.commit() + + + url = f"https://slack.com/api/chat.postMessage?channel=task-notifications&text=Someone just completed the task {task.title}" + + + + token=os.environ.get("bot_user_token") + + + headers_dict={"Authorization":token} + response = requests.request("POST", url, headers=headers_dict) + return { + "task": { + "id": task.task_id, + "title": task.title, + "description":task.description, + "is_complete": task.is_complete() + } + }, 200 + + + +from app.models.goal import Goal +goal_bp = Blueprint("goal", __name__, url_prefix="/goals") + +@goal_bp.route("", methods=["GET"]) +def get_goals(): + + title_query = request.args.get("title") + if title_query: + goals = Goal.query.filter_by(title=title_query) + + else: + goals = Goal.query.all() + + goals_response = [] + for goal in goals: + goals_response.append(goal.goal_to_json()) + + if "asc" in request.full_path: + + sort_goals=sorted(goals_response, key = lambda i: i['title']) + + return jsonify(sort_goals) + + elif "desc" in request.full_path: + sort_goals=sorted(goals_response, key = lambda i: i['title'], reverse=True) + return jsonify(sort_goals) + + else: + return jsonify(goals_response) + +@goal_bp.route("", methods=["POST"]) +def post_goals(): + + request_body = request.get_json() + + if "title" not in request_body: + return { + "details": "Invalid data" + },400 + else: + new_goal = Goal(title=request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + + get_goal = Goal.query.get(new_goal.goal_id) + + return { + "goal": get_goal.goal_to_json() + }, 201 + + +@goal_bp.route("/", methods=["GET"]) +def get_goal(goal_id): + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response ("",404) + else: + return { + "goal": goal.goal_to_json() + }, 200 + +@goal_bp.route("/", methods=["PUT"]) +def put_goal(goal_id): + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response ("",404) + else: + form_data = request.get_json() + + goal.title=form_data["title"] + + + #db.session.add(new_data) #adding data to db(a record/row) i.e git add + db.session.commit() + #new_task = Task.query.get(new_data.task_id) + return { + "goal": goal.goal_to_json() + }, 200 + + +@goal_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response ("",404) + else: + db.session.delete(goal) + + db.session.commit() + + return make_response({ + "details": f'Goal {goal.goal_id} \"{goal.title}\" successfully deleted' + }, 200) + +@goal_bp.route("//tasks", methods=["POST"]) +def post_task_id_to_goal(goal_id): + request_body=request.get_json() #information passed in given in json + goal=Goal.query.get(goal_id) #grab my goal from db and bring it back + + + if not goal: + return make_response("",404) + else: + for task_id in request_body["task_ids"]: + task=Task.query.get(task_id) + task.goal_id=goal_id + db.session.commit() + + return { + "id": goal.goal_id, + "task_ids": request_body["task_ids"] + },200 + + +@goal_bp.route("//tasks", methods=["GET"]) +def get_tasks_for_goal(goal_id): + + goal=Goal.query.get(goal_id) + task = Task.query.get(goal_id) + + + if not goal: + return make_response("",404) + else: + + outer_dict=goal.goal_to_json() + if task==None: + outer_dict['tasks']=[] + else: + inner_dict=task.to_json() + + inner_dict["goal_id"]=goal.goal_id + outer_dict['tasks']=[inner_dict] + db.session.commit() + return outer_dict,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/5d284ae063d6_.py b/migrations/versions/5d284ae063d6_.py new file mode 100644 index 000000000..6f4f1dd13 --- /dev/null +++ b/migrations/versions/5d284ae063d6_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 5d284ae063d6 +Revises: +Create Date: 2021-05-06 13:37:36.645552 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5d284ae063d6' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + 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.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + # ### end Alembic commands ### diff --git a/migrations/versions/9f87b42f3a81_.py b/migrations/versions/9f87b42f3a81_.py new file mode 100644 index 000000000..603e6f4a7 --- /dev/null +++ b/migrations/versions/9f87b42f3a81_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 9f87b42f3a81 +Revises: ed388af3be73 +Create Date: 2021-05-11 22:31:46.025397 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9f87b42f3a81' +down_revision = 'ed388af3be73' +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.drop_constraint('task_goal_goal_id_fkey', 'task', type_='foreignkey') + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + op.drop_column('task', 'goal_goal_id') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_goal_id', sa.INTEGER(), autoincrement=False, nullable=True)) + op.drop_constraint(None, 'task', type_='foreignkey') + op.create_foreign_key('task_goal_goal_id_fkey', 'task', 'goal', ['goal_goal_id'], ['goal_id']) + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/ed388af3be73_.py b/migrations/versions/ed388af3be73_.py new file mode 100644 index 000000000..bbd56bed7 --- /dev/null +++ b/migrations/versions/ed388af3be73_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: ed388af3be73 +Revises: 5d284ae063d6 +Create Date: 2021-05-11 21:36:24.401111 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ed388af3be73' +down_revision = '5d284ae063d6' +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=True), + sa.PrimaryKeyConstraint('goal_id') + ) + op.add_column('task', sa.Column('goal_goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['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_goal_id') + op.drop_table('goal') + # ### end Alembic commands ### 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