Rachana Bumblebee

app/__init__.py

@@ -2,6 +2,8 @@
 from .db import db, migrate
 from .models import task, goal
 import os
+from .routes.task_routes import tasks_bp
+from .routes.goal_routes import goals_bp 
 
 def create_app(config=None):
     app = Flask(__name__)
@@ -18,5 +20,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

app/models/goal.py

@@ -1,5 +1,19 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
+# from .task import Task
 
 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 = {}
+        goal_as_dict["id"] = self.id
+        goal_as_dict["title"] = self.title
+        return goal_as_dict
+
+    @classmethod
+    def from_dict(cls, goal_data):
+        new_goal = cls(title=goal_data["title"])
+        return new_goal

app/models/task.py

@@ -1,5 +1,34 @@
-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
+# from .goal import Goal
 
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]
+    description: Mapped[str]
+    completed_at: Mapped[datetime] = mapped_column(default=None, nullable=True)
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
+
+    def to_dict(self):
+        task_as_dict = {
+            "id": self.id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": True if self.completed_at else False
+        }
+        if self.completed_at:
+            task_as_dict["completed_at"] = self.completed_at
+        if self.goal_id:
+            task_as_dict["goal_id"] = self.goal_id
+        return task_as_dict
+
+
+    @classmethod
+    def from_dict(cls, task_data):
+        new_task = cls(title=task_data["title"],
+                       description=task_data["description"])
+        return new_task

app/routes/goal_routes.py

@@ -1 +1,111 @@
-from flask import Blueprint
+from flask import Blueprint, request, abort, make_response, Response
+from app.models.goal import Goal
+from ..db import db
+# from app.routes.task_routes import validate_task
+from .route_utilities import validate_model, create_model
+from app.models.task import Task
+
+
+
+goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@goals_bp.post("")
+def create_tasks():
+    request_body = request.get_json()
+    return {"goal": create_model(Goal, request_body)[0]}, 201
+    # try:
+    #     new_goal = Goal.from_dict(request_body)
+    # except KeyError as error:
+    #     response_body = {"details": "Invalid data"}
+    #     abort(make_response(response_body, 400))
+
+    # db.session.add(new_goal)
+    # db.session.commit()
+    # response = {"goal": new_goal.to_dict()}
+    # return response, 201
+
+@goals_bp.get("")
+def get_all_goals():
+    query = db.select(Goal)
+
+    # sort_param = request.args.get("sort")
+    # if sort_param == "asc":
+    #     query = query.order_by(Goal.title.asc())
+    # if sort_param == "desc":
+    #     query = query.order_by(Goal.title.desc())
+
+    # tasks = db.session.scalars(query.order_by(Task.id))
+    goals = db.session.execute(query).scalars()
+
+    goals_response = []
+    for goal in goals:
+        goals_response.append(goal.to_dict())
+    return goals_response
+
+
+
+@goals_bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    # goal = validate_goal(goal_id)
+    goal = validate_model(Goal, goal_id)
+    response = {"goal": goal.to_dict()}
+
+    return response
+
+
+
+# def validate_goal(goal_id):
+#     query = db.select(Goal).where(Goal.id == goal_id)
+#     goal = db.session.scalar(query)
+
+#     if not goal:
+#         response = {"message": f"Goal {goal_id} not found"}
+#         abort(make_response(response, 404))
+
+#     return goal 
+
+@goals_bp.put("/<goal_id>")
+def update_goal(goal_id):
+    # goal = validate_goal(goal_id)
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    goal.title = request_body["title"]
+    goal.id = request_body["id"]
+    db.session.commit()
+    return Response(status=204, mimetype="application/json")
+
+
+@goals_bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+    # goal = validate_goal(goal_id)
+    goal = validate_model(Goal, goal_id)
+    db.session.delete(goal)
+    db.session.commit()
+    return Response(status=204, mimetype="application/json")
+
+@goals_bp.get("/<goal_id>/tasks")
+def get_tasks_by_goal(goal_id):
+    # goal = validate_goal(goal_id)
+    goal = validate_model(Goal, goal_id)
+    response = goal.to_dict()
+    response["tasks"] = [task.to_dict() for task in goal.tasks]
+    return response
+
+@goals_bp.post("/<goal_id>/tasks")
+def send_tasks_to_goals(goal_id):
+    # goal = validate_goal(goal_id)
+    goal = validate_model(Goal, goal_id)
+
+    request_body = request.get_json()
+    task_list = request_body["task_ids"]
+    goal.tasks.clear() #removes existing tasks assoc w the goal
+
+    for task_id in request_body["task_ids"]:
+        new_task = validate_model(Task, task_id)
+        new_task.goal_id = goal_id
+
+    db.session.commit()
+    response = {"id": goal.id, 
+                "task_ids": request_body["task_ids"]}
+
+    return response

app/routes/route_utilities.py

@@ -0,0 +1,32 @@
+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

app/routes/task_routes.py

@@ -1 +1,97 @@
-from flask import Blueprint
+from flask import Blueprint, request, abort, make_response, Response
+from app.models.task import Task
+from ..db import db
+from datetime import datetime
+from .route_utilities import validate_model, create_model
+import os
+import requests
+
+
+
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+@tasks_bp.post("")
+def create_tasks():
+    request_body = request.get_json()
+    return {"task": create_model(Task, request_body)[0]}, 201
+
+
+@tasks_bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = validate_model(Task, task_id)
+    response = {"task": task.to_dict()}
+
+    return response
+
+
+@tasks_bp.get("")
+def get_all_tasks():
+    query = db.select(Task)
+
+    sort_param = request.args.get("sort")
+    if sort_param == "asc":
+        query = query.order_by(Task.title.asc())
+    if sort_param == "desc":
+        query = query.order_by(Task.title.desc())
+
+    # tasks = db.session.scalars(query.order_by(Task.id))
+    tasks = db.session.execute(query).scalars()
+
+    tasks_response = []
+    for task in tasks:
+        tasks_response.append(task.to_dict())
+    return tasks_response
+
+
+@tasks_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")
+
+@tasks_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")
+
+
+@tasks_bp.patch("/<task_id>/mark_complete")
+def mark_complete(task_id):
+    task = validate_model(Task, task_id)
+
+    send_msg(task)
+
+    task.completed_at = datetime.now()
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
+
+
+@tasks_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")
+
+
+def send_msg(task):
+    channel_id = os.environ.get("TESTER_CHANNEL")
+    token = os.environ.get("SLACK_BOT_TOKEN")
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Content-Type": "application/json"
+    }
+    data = {
+        "channel": channel_id,
+        "text": f"Someone just completed the task {task.title}"
+    }
+    response = requests.post("https://slack.com/api/chat.postMessage", headers=headers, data=data)
+    return response

migrations/README

@@ -0,0 +1 @@
+Single-database configuration for Flask.

migrations/alembic.ini

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