-
Notifications
You must be signed in to change notification settings - Fork 15
C15 Accelerate - Regina Tam #12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
adad46d
bea4d86
eb8c32b
44b066e
9256405
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,4 @@ | |
|
||
class Goal(db.Model): | ||
goal_id = db.Column(db.Integer, primary_key=True) | ||
title = db.Column(db.String) | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,7 @@ | |
|
||
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, nullable=True, default=None) | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,186 @@ | ||
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, json | ||
import datetime, requests, os | ||
|
||
tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") | ||
goals_bp = Blueprint("goals", __name__, url_prefix="/goals") | ||
|
||
|
||
@tasks_bp.route("", methods=["GET","POST"]) | ||
def handle_tasks(): | ||
if request.method == "GET": | ||
task_query = request.args.get("sort") | ||
if task_query == "asc": | ||
tasks = Task.query.order_by(Task.title) | ||
elif task_query == "desc": | ||
tasks = Task.query.order_by(Task.title.desc()).all() | ||
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": bool(task.completed_at) | ||
}) | ||
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": f"Invalid data"}, 400 | ||
# if request_body["completed_at"] is None: | ||
# request_body["completed_at"] = false | ||
Comment on lines
+34
to
+35
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. go ahead and remove commented code |
||
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": bool(new_task.completed_at) | ||
}}, 201) | ||
|
||
@tasks_bp.route("/<task_id>", methods=["GET", "PUT", "DELETE"]) | ||
def handle_task(task_id): | ||
task = Task.query.get(task_id) | ||
|
||
if task is None: | ||
return make_response("Not Found", 404) | ||
elif request.method == "GET": | ||
return { "task":{ | ||
"id": task.task_id, | ||
"title": task.title, | ||
"description": task.description, | ||
"is_complete": bool(task.completed_at) | ||
}} | ||
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() | ||
|
||
return { | ||
"task":{ | ||
"id": task.task_id, | ||
"title": task.title, | ||
"description": task.description, | ||
"is_complete": bool(task.completed_at) | ||
}} | ||
elif request.method == "DELETE": | ||
db.session.delete(task) | ||
db.session.commit() | ||
return make_response({ | ||
"details":f"Task {task.task_id} \"{task.title}\" successfully deleted" | ||
}) | ||
Comment on lines
+51
to
+85
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💃🏽 |
||
|
||
def post_to_slack(slack_message): | ||
SLACK_TOKEN = os.environ.get('SLACK_ACCESS_TOKEN') | ||
slack_path = "https://slack.com/api/chat.postMessage" | ||
query_params ={ | ||
'channel': 'task-notifications', | ||
'text': slack_message | ||
} | ||
headers = {'Authorization': f"Bearer {SLACK_TOKEN}"} | ||
requests.post(slack_path, params=query_params, headers=headers) | ||
Comment on lines
+87
to
+95
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I like that you created a different method for slack! |
||
|
||
@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"]) | ||
def handle_task_completion(task_id): | ||
task = Task.query.get(task_id) | ||
if task is None: | ||
return make_response("Not Found", 404) | ||
elif request.method == "PATCH": | ||
if bool(task.completed_at) == False: | ||
task.completed_at = datetime.datetime.now() | ||
slack_message = f"Someone just completed the task {task.title}" | ||
post_to_slack(slack_message) | ||
return ( | ||
{ "task":{ | ||
"id": task.task_id, | ||
"title": task.title, | ||
"description": task.description, | ||
"is_complete": bool(task.completed_at) | ||
}}, 200 | ||
) | ||
Comment on lines
+98
to
+114
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💃🏽 |
||
|
||
@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"]) | ||
def handle_task_not_completion(task_id): | ||
task = Task.query.get(task_id) | ||
if task is None: | ||
return make_response("Not Found", 404) | ||
elif request.method == "PATCH": | ||
task.completed_at = None | ||
return ({ "task":{ | ||
"id": task.task_id, | ||
"title": task.title, | ||
"description": task.description, | ||
"is_complete": False | ||
}}, 200) | ||
Comment on lines
+116
to
+128
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💃🏽 |
||
|
||
@goals_bp.route("", methods=["GET","POST"]) | ||
def handle_goals(): | ||
if request.method == "GET": | ||
goals = Goal.query.all() | ||
goals_response = [] | ||
for goal in goals: | ||
goals_response.append({ | ||
"id": goal.goal_id, | ||
"title": goal.title, | ||
}) | ||
return jsonify(goals_response) | ||
elif request.method == "POST": | ||
request_body = request.get_json() | ||
if "title" not in request_body: | ||
return {"details": f"Invalid data"}, 400 | ||
new_goal = Goal( | ||
title=request_body["title"] | ||
) | ||
db.session.add(new_goal) | ||
db.session.commit() | ||
|
||
return make_response( | ||
{"goal": { | ||
"id": new_goal.goal_id, | ||
"title": new_goal.title | ||
}}, 201 | ||
) | ||
|
||
@goals_bp.route("/<goal_id>", methods=["GET", "PUT", "DELETE"]) | ||
def handle_goal(goal_id): | ||
goal = Goal.query.get(goal_id) | ||
|
||
if goal is None: | ||
return make_response("Not Found", 404) | ||
elif request.method == "GET": | ||
return { "goal":{ | ||
"id": goal.goal_id, | ||
"title": goal.title, | ||
}} | ||
elif request.method == "PUT": | ||
form_data = request.get_json() | ||
|
||
goal.title = form_data["title"] | ||
|
||
db.session.commit() | ||
|
||
return { | ||
"goal":{ | ||
"id": goal.goal_id, | ||
"title": goal.title | ||
}} | ||
elif request.method == "DELETE": | ||
db.session.delete(goal) | ||
db.session.commit() | ||
return make_response({ | ||
"details":f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" | ||
}) | ||
Comment on lines
+158
to
+186
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💃🏽
Comment on lines
+158
to
+186
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To get wave six passing go ahead and follow what you've been doing! |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Generic single-database configuration. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"} |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add
tasks
to the Goal model withdb.relationship
this will set up the connection between goal and task.