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
6 changes: 6 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from flask import Flask
from .db import db, migrate
from .models import task, goal
from .routes.task_routes import bp as tasks_bp
from .routes.goal_routes import bp as goals_bp
import os

def create_app(config=None):
app = Flask(__name__)


# use os because it is from .env
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')

Expand All @@ -18,5 +22,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
19 changes: 18 additions & 1 deletion app/models/goal.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.orm import Mapped, mapped_column, relationship
from typing import Optional
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):
goal_as_dict = {
"id" : self.id,
"title": self.title
}

return goal_as_dict

@classmethod
def from_dict(cls, goal_data):
new_goal = cls(title=goal_data["title"])
return new_goal
43 changes: 42 additions & 1 deletion app/models/task.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,46 @@
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[Optional[datetime]] = mapped_column(nullable=True, default=None)
goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")




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

if self.goal_id:
result.update({
"goal_id": self.goal.id
})

return result



@classmethod
def from_dict(cls, task_data):

goal_id = task_data.get("goal_id")

new_task = cls(
title=task_data["title"],
description=task_data["description"],
goal_id=goal_id
)

return new_task
105 changes: 104 additions & 1 deletion app/routes/goal_routes.py
Original file line number Diff line number Diff line change
@@ -1 +1,104 @@
from flask import Blueprint
from flask import Blueprint, abort, request, Response
from app.models.goal import Goal
from app.models.task import Task
from .route_utilities import create_model, validate_model, get_models_with_filters
from ..db import db
from datetime import datetime
import os
import requests

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

@bp.post("")
def create_goal():
request_body = request.get_json()
# called the function inside route_utilities
return create_model(Goal, request_body)

@bp.get("")
def get_goal():
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.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") # 204 means No Content

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

# called the function inside route_utilities
# the create_author function called route_utilities

#wave 6
@bp.post("/<goal_id>/tasks")
def post_task_ids_to_goal(goal_id):
goal = validate_model(Goal, goal_id)

request_body = request.get_json()
task_ids = request_body.get("task_ids", [])

# use query to get all the tasks that is related to this one goal
# goal.id is inside class Task Model
tasks_assign_to_goal = Task.query.filter_by(goal_id=goal.id).all()

# setting the goal_id to none
# so now the goal does not have the task(s)
for task in tasks_assign_to_goal:
task.goal_id = None

# use of foreign key to connecting the two
for task_id in task_ids:
task = validate_model(Task, task_id)
task.goal_id = goal.id

db.session.commit()

return {
"id": goal.id,
"task_ids": task_ids,
}, 200


# another approach
# @bp.get("/<goal_id>/tasks")
# def get_tasks_for_specific_goal(goal_id):
# goal = validate_model(Goal, goal_id)

# tasks_list = [task.to_dict() for task in goal.tasks]

# return {
# "id": goal.id,
# "title": goal.title,
# "tasks": tasks_list
# }, 200


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

tasks_assign_to_goal = Task.query.filter_by(goal_id=goal.id).all()

tasks_list = [task.to_dict() for task in tasks_assign_to_goal]

return {
"id": goal.id,
"title": goal.title,
"tasks": tasks_list
}, 200
54 changes: 54 additions & 0 deletions app/routes/route_utilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
from flask import abort, make_response
from ..db import db

# just get one model with id
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

# get models with some same attribute/s
def get_models_with_filters(cls, filters=None, sort_parameter=None):
query = db.select(cls)

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

# wave 2 sorting
if sort_parameter == "asc":
query = query.order_by(cls.title.asc())
elif sort_parameter == "desc":
query = query.order_by(cls.title.desc())
else:
query = query.order_by(cls.id)

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

return models_response
84 changes: 83 additions & 1 deletion app/routes/task_routes.py
Original file line number Diff line number Diff line change
@@ -1 +1,83 @@
from flask import Blueprint
from flask import Blueprint, abort, request, Response
from app.models.task import Task
from .route_utilities import create_model, validate_model, get_models_with_filters
from ..db import db
from datetime import datetime
import os
import requests

# so we do not need to rewrite tasks_bp all the time
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_task():
sort_parameter = request.args.get("sort")
return get_models_with_filters(Task, request.args, sort_parameter)


@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"]
task.completed_at = None
db.session.commit()

return Response(status=204, mimetype="application/json") # 204 means No Content

@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 patch_task_mark_complete_with_timestamp(task_id):
task = validate_model(Task, task_id)

task.completed_at = datetime.now()
db.session.commit()

SLACK_BOT_TOKEN = os.environ.get("SLACK_BOT_TOKEN")

if SLACK_BOT_TOKEN:
url = "https://slack.com/api/chat.postMessage"
headers = {
"Authorization": f"Bearer {SLACK_BOT_TOKEN}",
"Content-Type": "application/json"
}

data = {
"channel": "slack-api-testing",
"text": f"Someone just completed the task {task.title}"
}
requests.post(url, headers=headers, json=data)

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


@bp.patch("/<task_id>/mark_incomplete")
def patch_task_mark_incomplete(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