Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,10 @@ def create_app(test_config=None):
migrate.init_app(app, db)

# Register Blueprints here
#(unneeded? look above) from app.models.task import Task
from .routes import tasks_bp
from .routes import goals_bp
app.register_blueprint(tasks_bp)
app.register_blueprint(goals_bp)

return app
20 changes: 19 additions & 1 deletion app/models/goal.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,22 @@


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(100), nullable = False)
tasks = db.relationship("Task", back_populates="goal", lazy=True)

# Have to rename? or use the one from Task model?
def to_dict(self):
return {
"id": self.goal_id,
"title": self.title
}

def tasks_to_dict(self):
task_ids_list = []
for task in self.tasks:
task_ids_list.append(task.task_id)
return {
"id": self.goal_id,
"task_ids": task_ids_list
}
21 changes: 20 additions & 1 deletion app/models/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,23 @@


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(100), nullable = False)
description = db.Column(db.String(200), nullable = False)
completed_at = db.Column(db.DateTime, nullable = True)
# I'm not sure about completed_at and is_completed.
# Is completed_at only for POST, and then is_completed only for responses?
goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable = True)
goal = db.relationship("Goal", back_populates="tasks")

def to_dict(self):
if self.completed_at:
is_complete = True
else:
is_complete = False
return {
"id": self.task_id,
"title": self.title,
"description": self.description,
"is_complete": is_complete
}
190 changes: 189 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,190 @@
from flask import Blueprint
from sqlalchemy.sql.expression import null
from app import db
from app.models.goal import Goal
from app.models.task import Task
from datetime import datetime
from flask import abort, Blueprint, jsonify, make_response, request
import os
import requests
from sqlalchemy import desc

tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
goals_bp = Blueprint("goals", __name__, url_prefix="/goals")

# Task routes
# Posts new task
@tasks_bp.route("", methods=["POST"])
def create_task():
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 jsonify({"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(tasks_response), 200
new_task_response = {"task": new_task.to_dict()}
return jsonify(new_task_response), 201

# Handles all tasks
@tasks_bp.route("", methods=["GET"])
def handle_tasks():
tasks_response = []
sort_by = request.args.get('sort')
if sort_by == "asc":
tasks = Task.query.order_by(Task.title).all()
elif sort_by == "desc":
tasks = Task.query.order_by(desc(Task.title)).all()
else:
tasks = Task.query.all()
for task in tasks:
tasks_response.append(task.to_dict())
return jsonify(tasks_response), 200

# Handles one task
@tasks_bp.route("/<task_id>", methods=["GET", "PUT"])
def handle_task(task_id):
task_id = validate_id_int(task_id)
task = Task.query.get(task_id)
if not task:
return make_response("", 404)
if request.method == "GET":
return jsonify({"task": task.to_dict()}), 200
elif request.method == "PUT":
request_body = request.get_json()
task.title=request_body["title"]
task.description=request_body["description"]
if "completed_at" in request_body:
task.completed_at=request_body["completed_at"]

db.session.commit()
return jsonify({"task": task.to_dict()}), 200

@tasks_bp.route("<task_id>/<patch_complete>", methods=["PATCH"])
def patch_task(task_id, patch_complete):
task_id = validate_id_int(task_id)
task = Task.query.get(task_id)
if not task:
return make_response("", 404)
if patch_complete == "mark_complete":
task.completed_at=datetime.now()
# ID of the channel you want to send the message to
channel_id = "C02LA52J4AW"
SLACK_KEY = os.environ.get("SLACK_API_KEY")
text=f"Someone just completed the task {task.title}"
data = {
'channel': channel_id,
'as_user': True,
'text': text
}
requests.post("https://slack.com/api/chat.postMessage", headers={"Authorization": f"Bearer {SLACK_KEY}"}, data=data)
elif patch_complete == "mark_incomplete":
task.completed_at=None
db.session.commit()
return jsonify({"task": task.to_dict()}), 200

@tasks_bp.route("/<task_id>", methods=["DELETE"])
def delete_task(task_id):
print(task_id)
task_id=validate_id_int(task_id)

task = Task.query.get(task_id)

if task:
db.session.delete(task)
db.session.commit()
return jsonify({"details": f'Task {task_id} "{task.title}" successfully deleted'}), 200
else:
return make_response("", 404)

def validate_id_int(task_id):
try:
task_id = int(task_id)
return task_id
except:
abort(400, "Error: Task ID needs to be a number")

# Goal routes
# Posts new goal
@goals_bp.route("", methods=["POST"])
def create_goal():
request_body = request.get_json()
if "title" not in request_body:
return jsonify({"details": "Invalid data"}), 400
new_goal = Goal(title=request_body["title"])

db.session.add(new_goal)
db.session.commit()

#return jsonify(tasks_response), 200
new_goal_response = {"goal": new_goal.to_dict()}
return jsonify(new_goal_response), 201

# Handles all goals
@goals_bp.route("", methods=["GET"])
def handle_goals():
goals_response = []
sort_by = request.args.get('sort')
if sort_by == "asc":
goals = Goal.query.order_by(Goal.title).all()
elif sort_by == "desc":
goals = Goal.query.order_by(desc(Goal.title)).all()
else:
goals = Goal.query.all()
for goal in goals:
goals_response.append(goal.to_dict())
return jsonify(goals_response), 200

# Handles one goal
@goals_bp.route("/<goal_id>", methods=["GET", "PUT"])
def handle_goal(goal_id):
goal_id = validate_id_int(goal_id)
goal = Goal.query.get(goal_id)
if not goal:
return make_response("", 404)
if request.method == "GET":
return jsonify({"goal": goal.to_dict()}), 200
elif request.method == "PUT":
request_body = request.get_json()
goal.title=request_body["title"]
# Remove, not needed? - goal.description=request_body["description"]

db.session.commit()
return jsonify({"goal": goal.to_dict()}), 200

@goals_bp.route("/<goal_id>", methods=["DELETE"])
def delete_goal(goal_id):
print(goal_id)
goal_id=validate_id_int(goal_id)

goal = Goal.query.get(goal_id)

if goal:
db.session.delete(goal)
db.session.commit()
return jsonify({"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}), 200
else:
return make_response("", 404)

@goals_bp.route("/<goal_id>/tasks", methods=["GET", "POST"])
def handle_goals_tasks(goal_id):
goal = Goal.query.get(goal_id)
if goal is None:
return make_response("Goal not found", 404)

if request.method == "POST":
request_body = request.get_json()
for task_id in request_body["task_ids"]:
task = Task.query.get(task_id)
goal.tasks.append(task)
db.session.commit()
return jsonify(goal.tasks_to_dict()), 200

elif request.method == "GET":
tasks_response = []
for task in goal.tasks:
tasks_response.append(task.to_dict())
return jsonify(tasks_response), 200
1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Generic single-database configuration.
45 changes: 45 additions & 0 deletions migrations/alembic.ini
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
96 changes: 96 additions & 0 deletions migrations/env.py
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()
Loading