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: 4 additions & 1 deletion app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
from .db import db, migrate
from .models import task, goal
import os
from .routes.task_routes import bp as tasks_bp
from .routes.goal_routes import bp as goals_bp

def create_app(config=None):
app = Flask(__name__)
Expand All @@ -18,5 +20,6 @@ def create_app(config=None):
migrate.init_app(app, db)

# Register Blueprints here

app.register_blueprint(tasks_bp)
app.register_blueprint(goals_bp)
return app
18 changes: 17 additions & 1 deletion app/models/goal.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.orm import Mapped, mapped_column,relationship
from ..db import db

class Goal(db.Model):
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
title: Mapped[str]
tasks: Mapped[list["Task"]] = relationship(back_populates="goal")


@classmethod
def from_dict(cls, goal_data):
new_goal = cls(title=goal_data["title"])
return new_goal



def to_dict(self):
return {
"id": self.id,
"title": self.title
}
38 changes: 37 additions & 1 deletion app/models/task.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.orm import Mapped, mapped_column, relationship
from sqlalchemy import ForeignKey
from typing import Optional
from ..db import db
from datetime import datetime

class Task(db.Model):
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
title: Mapped[str]
description: Mapped[str]
completed_at: Mapped[datetime | None]
goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")


def to_dict(self):
if not self.goal_id:
return {
"id": self.id,
"title": self.title,
"description": self.description,
"is_complete":self.completed_at if self.completed_at else False
}
else:
return {
"id": self.id,
"title": self.title,
"description": self.description,
"is_complete":self.completed_at if self.completed_at else False,
"goal_id" : self.goal_id
}

@classmethod
def from_dict(cls, task_data):
new_task = cls(title=task_data["title"],
description= task_data["description"],
completed_at = None if not task_data.get("is_complete") else task_data.get("is_complete"))
return new_task



87 changes: 86 additions & 1 deletion app/routes/goal_routes.py
Original file line number Diff line number Diff line change
@@ -1 +1,86 @@
from flask import Blueprint
from flask import Blueprint, make_response, request, Response
from app.models.goal import Goal
from ..db import db
from app.routes.route_utilities import validate_model, create_model
from ..models.task import Task

bp = Blueprint("goals_bp", __name__, url_prefix="/goals")

@bp.post("")
def create_goal():
request_body = request.get_json()
return create_model(Goal, request_body)

@bp.get("")
def get_all_goals():
query = db.select(Goal).order_by(Goal.id)
goals = db.session.scalars(query)

goals_response = []
for goal in goals:
goals_response.append(goal.to_dict())
return goals_response


@bp.get("/<goal_id>")
def get_one_goal(goal_id):
goal = validate_model(Goal, goal_id)
return goal.to_dict()


@bp.put("/<goal_id>")
def update_goal(goal_id):
goal = validate_model(Goal,goal_id)
request_body = request.get_json()

goal.title = request_body["title"]
db.session.commit()


return Response(status=204, mimetype="application/json")

@bp.delete("/<goal_id>")
def delete_goal(goal_id):
goal= validate_model(Goal,goal_id)
db.session.delete(goal)
db.session.commit()

return Response(status=204, mimetype="application/json")



@bp.post("/<goal_id>/tasks")
def create_task_with_goal(goal_id):
goal = validate_model(Goal, goal_id)

#clear
goal.tasks.clear()

request_body = request.get_json()
new_tasks_ids= request_body["task_ids"]

for new_id in new_tasks_ids:
task = validate_model(Task,new_id)
goal.tasks.append(task)

db.session.commit()
response_body = {
"id":int(goal_id),
"task_ids": [task.id for task in goal.tasks]
}
return make_response(response_body,200)


@bp.get("/<goal_id>/tasks")
def get_all_task_with_goal(goal_id):

goal = validate_model(Goal, goal_id)

task_list = []
for task in goal.tasks:
each_task_info = task.to_dict()
task_list.append(each_task_info)

response = goal.to_dict()
response["tasks"] = task_list
return make_response(response,200)
31 changes: 31 additions & 0 deletions app/routes/route_utilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
from flask import abort, make_response
from ..db import db

def validate_model(cls, model_id):
try:
model_id = int(model_id)
except:
response = {"message": f"{cls.__name__} {model_id} invalid"}
abort(make_response(response , 400))

query = db.select(cls).where(cls.id == model_id)
model = db.session.scalar(query)

if not model:
response = {"message": f"{cls.__name__} {model_id} not found"}
abort(make_response(response, 404))

return model

def create_model(cls, model_data):
try:
new_model = cls.from_dict(model_data)

except KeyError as error:
response = {"details": "Invalid data"}
abort(make_response(response, 400))

db.session.add(new_model)
db.session.commit()

return new_model.to_dict(), 201
87 changes: 86 additions & 1 deletion app/routes/task_routes.py
Original file line number Diff line number Diff line change
@@ -1 +1,86 @@
from flask import Blueprint

from flask import Blueprint, request, Response
from app.models.task import Task
from ..db import db
from sqlalchemy import desc
from datetime import datetime
import os
import requests
from app.routes.route_utilities import validate_model, create_model

bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")


@bp.post("")
def create_task():
request_body = request.get_json()
return create_model(Task, request_body)

@bp.get("")
def get_all_tasks():
query = db.select(Task).order_by(Task.id)
title_param = request.args.get("sort")
if title_param:
if title_param == "asc":
query = db.select(Task).order_by(Task.title)
elif title_param == "desc":
query = db.select(Task).order_by(desc(Task.title))


tasks = db.session.scalars(query)
tasks_response = []
for task in tasks:
tasks_response.append(task.to_dict())
return tasks_response

@bp.get("/<task_id>")
def get_one_task(task_id):
task = validate_model(Task, task_id)
return task.to_dict()

@bp.put("/<task_id>")
def update_task(task_id):
task = validate_model(Task,task_id)
request_body = request.get_json()

task.title = request_body["title"]
task.description = request_body["description"]
db.session.commit()

return Response(status=204, mimetype="application/json")

@bp.delete("/<task_id>")
def delete_task(task_id):
task = validate_model(Task,task_id)
db.session.delete(task)
db.session.commit()

return Response(status=204, mimetype="application/json")

@bp.patch("/<task_id>/mark_complete")
def mark_task(task_id):
task = validate_model(Task,task_id)
task.completed_at = datetime.now()
message_slack(task)
db.session.commit()
return Response(status=204, mimetype="application/json")


def message_slack(task):
slack_token = os.environ.get("SLACK_BOT_TOKEN")
body = {'token': slack_token, 'channel': '#task-notifications', 'text':f'Someone just completed the task {task.title}'}
headers = {'Authorization': slack_token}
response = requests.post("https://slack.com/api/chat.postMessage", data=body,headers=headers)
print(f"Status Code: {response.status_code}")
print(f"Response JSON: {response.json()}")


@bp.patch("/<task_id>/mark_incomplete")
def unmark_task(task_id):
task = validate_model(Task,task_id)
task.completed_at = None
db.session.commit()
return Response(status=204, mimetype="application/json")



1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Single-database configuration for Flask.
50 changes: 50 additions & 0 deletions migrations/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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,flask_migrate

[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

[logger_flask_migrate]
level = INFO
handlers =
qualname = flask_migrate

[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
Loading