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
13 changes: 10 additions & 3 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import os

from flask import Flask

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__)

app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI")

if config:
# Merge `config` into the app's configuration
Expand All @@ -18,5 +23,7 @@ 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
4 changes: 3 additions & 1 deletion app/db.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate

from .models.base import Base


db = SQLAlchemy(model_class=Base)
migrate = Migrate()
migrate = Migrate()
3 changes: 2 additions & 1 deletion app/models/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from sqlalchemy.orm import DeclarativeBase


class Base(DeclarativeBase):
pass
pass
15 changes: 14 additions & 1 deletion app/models/goal.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
from sqlalchemy.orm import Mapped, mapped_column
from typing import List

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")

def to_dict(self):
return {"id": self.id, "title": self.title}

@classmethod
def from_dict(cls, data):
return cls(title=data["title"])
33 changes: 32 additions & 1 deletion app/models/task.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
from sqlalchemy.orm import Mapped, mapped_column
from datetime import datetime
from typing import Optional

from sqlalchemy.orm import Mapped, mapped_column, relationship

from ..db import db


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

def to_dict(self):
task_dict = {
"id": self.id,
"title": self.title,
"description": self.description,
"is_complete": self.completed_at is not None,
}

if self.goal_id:
task_dict["goal_id"] = self.goal_id

return task_dict

@classmethod
def from_dict(cls, task_data):
return cls(
title=task_data["title"],
description=task_data["description"],
completed_at=task_data.get("completed_at"),
)
69 changes: 68 additions & 1 deletion app/routes/goal_routes.py
Original file line number Diff line number Diff line change
@@ -1 +1,68 @@
from flask import Blueprint
from flask import Blueprint, request, Response

from app.models.goal import Goal
from app.models.task import Task
from .. import db
from .route_utilities import validate_model, create_model, get_models_with_filters

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.post("/<goal_id>/tasks")
def add_tasks_to_goal(goal_id):
goal = validate_model(Goal, goal_id)
request_body = request.get_json()
task_ids = request_body.get("task_ids", [])
goal.tasks = []

for task_id in task_ids:
task = validate_model(Task, task_id)
goal.tasks.append(task)

db.session.commit()
return {"id": goal.id, "task_ids": task_ids}


@bp.get("/<goal_id>/tasks")
def get_tasks_of_goal(goal_id):
goal = validate_model(Goal, goal_id)
tasks = [task.to_dict() for task in goal.tasks]
return {"id": goal.id, "title": goal.title, "tasks": tasks}


@bp.get("")
def get_all_goals():
return get_models_with_filters(Goal, request.args)


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


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

if "title" not in request_body:
return {"details": "Invalid data. 'title' is required."}, 400

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")
75 changes: 75 additions & 0 deletions app/routes/route_utilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import os, requests
from flask import abort, make_response

from ..db import db


def validate_model(cls, model_id):
try:
model_id = int(model_id)
except:
response = {"details": f"{cls.__name__} id {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 = {"details": f"{cls.__name__} id {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 ({cls.__name__.lower(): new_model.to_dict()}), 201


def get_models_with_filters(cls, filters=None):
query = db.select(cls)
sort_param = None

if filters:
filters_dict = dict(filters)
sort_param = filters_dict.pop("sort", None)

for attribute, value in filters_dict.items():
if hasattr(cls, attribute):
query = query.where(getattr(cls, attribute).ilike(f"%{value}%"))

if sort_param == "asc":
query = query.order_by(cls.title.asc())
elif sort_param == "desc":
query = query.order_by(cls.title.desc())
else:
query = query.order_by(cls.id)

models = db.session.scalars(query)
return [model.to_dict() for model in models]


def call_slack_api(task):
slack_url = "https://slack.com/api/chat.postMessage"
slack_token = os.environ.get("SLACKBOT_TOKEN")

headers = {
"Authorization": f"Bearer {slack_token}",
"Content-Type": "application/json",
}

data = {
"channel": "test-slack-api",
"text": f"Someone just completed the task {task.title}",
}

responce = requests.post(slack_url, headers=headers, json=data)
return responce
74 changes: 73 additions & 1 deletion app/routes/task_routes.py
Original file line number Diff line number Diff line change
@@ -1 +1,73 @@
from flask import Blueprint
from datetime import datetime

from flask import Blueprint, request, Response, make_response

from app.models.task import Task
from .route_utilities import (
validate_model,
create_model,
get_models_with_filters,
call_slack_api,
)
from ..db import db


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():
return get_models_with_filters(Task, request.args)


@bp.patch("/<task_id>/mark_complete")
def mark_complete(task_id):
task = validate_model(Task, task_id)
task.completed_at = datetime.today()
db.session.commit()

call_slack_api(task)
return make_response(task.to_dict(), 204)


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


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


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

if "title" not in request_body or "description" not in request_body:
return make_response({"details": "Invalid data"}, 400)

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")
Loading