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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.vscode
.DS_Store
.env

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
Binary file added ada-project-docs/assets/lexy-slackbot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions ada-project-docs/wave_04.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,11 @@ Send `PATCH` requests to `localhost:5000/tasks/<task_id>/mark_complete` (use the
![](assets/postman_patch.png)

![](assets/slack_notification_feature.png)



The result show as below
![](assets/lexy-slackbot.png)



8 changes: 8 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
from flask import Flask
from .db import db, migrate
from .models import task, goal
from app.routes.task_routes import bp as tasks_bp
from app.routes.goal_routes import bp as goals_bp
import os

from dotenv import load_dotenv
load_dotenv()

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

Expand All @@ -18,5 +23,8 @@ 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
22 changes: 21 additions & 1 deletion app/models/goal.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.orm import Mapped, mapped_column,relationship
from ..db import db
from sqlalchemy import String
#from sqlalchemy import Date


class Goal(db.Model):

id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
title: Mapped[str] = mapped_column(String(100), nullable=False)
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_dict):
if "title" not in data_dict:
raise KeyError("title")
return cls(title=data_dict["title"])
48 changes: 47 additions & 1 deletion app/models/task.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,51 @@
from sqlalchemy.orm import Mapped, mapped_column
from flask_sqlalchemy import SQLAlchemy
from sqlalchemy.orm import Mapped, mapped_column,relationship
from sqlalchemy import ForeignKey
from ..db import db
from sqlalchemy import String, Date
from datetime import datetime
from flask import Blueprint, abort, make_response, request, Response,jsonify
from typing import Optional

class Task(db.Model):
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
title: Mapped[str] = mapped_column(String(100), nullable=False)
description: Mapped[str] = mapped_column(String(255))
completed_at:Mapped[datetime.date] = mapped_column(Date, nullable=True)

goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")

def to_dict(self): # json


task_dict = {"id": self.id,
"title":self.title,
"description":self.description,
#"is_complete":self.completed_at if self.completed_at else False
"is_complete": self.completed_at is not None}

if self.goal_id is not None:
task_dict["goal_id"] = self.goal_id


return task_dict



@classmethod
def from_dict(cls, data_dict):
if "title" not in data_dict:

raise KeyError("title")
if "description" not in data_dict:
#abort(make_response({"details": "Invalid data"}, 400))
raise KeyError("description")
return cls(
title=data_dict["title"],
description=data_dict["description"],
completed_at=None # default to None when creating
)



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


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



@bp.post("")
def create_goal():
request_body = request.get_json()
try:
new_goal = Goal.from_dict(request_body)
except KeyError:
return jsonify({"details": "Invalid data"}), 400

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

return jsonify(new_goal.to_dict()), 201


@bp.get("")
def get_all_goals():
goals = Goal.query.order_by(Goal.id).all()
return jsonify([goal.to_dict() for goal in goals]), 200


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




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

goal.title = request_body["title"]

db.session.commit()
return jsonify(goal.to_dict()), 200



@bp.delete("/<id>")
def delete_goal(id):
goal = validate_model(Goal, id)

db.session.delete(goal)
db.session.commit()

return jsonify({"message": f'Goal {goal.id} successfully deleted'}), 204


#nested
@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", [])

for task in goal.tasks:
task.goal_id = None



for task_id in task_ids:
task = validate_model(Task, task_id)
task.goal_id = goal.id

db.session.commit()

return jsonify({
"id": goal.id,
"task_ids": task_ids
}), 200



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

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

goal_dict = goal.to_dict()
goal_dict["tasks"] = tasks_response

return jsonify(goal_dict), 200



44 changes: 44 additions & 0 deletions app/routes/route_utilities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
from flask import abort, make_response
from ..db import db

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

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

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

return model


def create_model(cls, model_data):
try:
new_model = cls.from_dict(model_data)
except KeyError as e:
#response = {"message": f"Invalid request: missing {e.args[0]}"}
#abort(make_response(response, 400))
abort(make_response({"details": "Invalid data"}, 400))

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

return new_model.to_dict(), 201

def get_models_with_filters(cls, filters=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}%"))

models = db.session.scalars(query.order_by(cls.id))
models_response = [model.to_dict() for model in models]
return models_response
Loading