Bumblebee - Aigerim Kalygulova C23

app/__init__.py

@@ -1,6 +1,8 @@
 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):
@@ -18,5 +20,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

app/models/goal.py

@@ -1,5 +1,22 @@
-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):
+        return cls(
+            title=goal_data["title"]
+        )
+
+    def to_dict(self, include_tasks=False):
+        goal_dict = {
+            "id": self.id,
+            "title": self.title
+        }
+        # # Add list of tasks only if requested
+        if include_tasks:
+            goal_dict["tasks"] = [task.to_dict(include_goal_id=True) for task in self.tasks]
+        return goal_dict

app/models/task.py

@@ -1,5 +1,35 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import ForeignKey
 from ..db import db
+from typing import Optional
+from sqlalchemy import DateTime
+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(DateTime, nullable=True)
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
+
+    @classmethod
+    def from_dict(cls, task_data):
+        return cls(
+            title=task_data["title"],
+            description=task_data["description"],
+            completed_at=task_data.get("completed_at") # True if task is done
+        )
+
+    def to_dict(self, include_goal_id=False):
+        task_dict = {
+            "id": self.id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.completed_at is not None
+        }
+
+        # Only include goal_id if requested
+        if include_goal_id:
+            task_dict["goal_id"] = self.goal_id
+        return task_dict

app/routes/goal_routes.py

@@ -1 +1,73 @@
-from flask import Blueprint
+from flask import Blueprint, request, Response
+from app.models.task import Task
+from app.models.goal import Goal
+from app import db
+from .route_utilities import validate_model, get_models_with_filters, create_model_from_dict, assign_tasks
+import requests
+import os
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+# create goal
+@bp.post("")
+def create_goal():
+    goal_data = request.get_json()
+    return create_model_from_dict(Goal, goal_data)
+
+# get all goals
+@bp.get("")
+def get_all_goals():
+    return get_models_with_filters(Goal, request.args)
+
+# get one goal
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    return {"goal": goal.to_dict()}
+
+# update goal
+@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")
+
+# delete goal
+@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")
+
+# nested routes
+@bp.post("/<goal_id>/tasks")
+def assign_tasks_to_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    task_ids = request_body.get("task_ids", [])
+
+    tasks = assign_tasks(goal, task_ids)
+    db.session.commit()
+
+    return {
+        "id": goal.id,
+        "task_ids": [task.id for task in tasks]
+    }, 200
+
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_by_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    return {
+        "id": goal.id,
+        "title": goal.title,
+        "tasks": [task.to_dict(include_goal_id=True) for task in goal.tasks]
+    }, 200

app/routes/route_utilities.py

@@ -0,0 +1,72 @@
+from ..db import db
+from flask import abort, make_response
+from app.models.task import Task
+
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except ValueError:
+        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_from_dict(cls, task_data):
+    try: 
+        new_instance = cls.from_dict(task_data)
+    except KeyError as error:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+    db.session.add(new_instance)
+    db.session.commit()
+    model_name = cls.__name__.lower() 
+
+    return {model_name: new_instance.to_dict()}, 201
+
+
+def get_models_with_filters(cls, filters=None):
+    query = db.select(cls)
+
+    sort_order = None
+    if filters:
+        # Pull out 'sort' and prevent it from becoming a filter
+        sort_order = filters.get("sort", None)
+
+        # Apply other filters
+        for attribute, value in filters.items():
+            if hasattr(cls, attribute):
+                query = query.where(getattr(cls, attribute).ilike(f"%{value}%"))
+
+    # Apply sorting
+    if sort_order == "asc":
+        query = query.order_by(cls.title.asc())
+    elif sort_order == "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 assign_tasks(goal, task_ids):
+    # Clear current tasks
+    for task in goal.tasks:
+        task.goal_id = None
+
+    tasks = []
+    for task_id in task_ids:
+        task = validate_model(Task, task_id)
+        task.goal_id = goal.id
+        tasks.append(task)
+
+    return tasks

app/routes/task_routes.py

@@ -1 +1,90 @@
-from flask import Blueprint
+from flask import Blueprint, abort, make_response, request, Response
+from app.models.task import Task
+from app import db
+from .route_utilities import create_model_from_dict
+from .route_utilities import validate_model, get_models_with_filters
+from datetime import datetime, UTC
+from dotenv import load_dotenv
+import requests
+import os
+
+load_dotenv()
+
+
+bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") # main rout
+
+# create task
+@bp.post("")
+def create_task():
+    task_data = request.get_json()  
+    return create_model_from_dict(Task, task_data)
+
+# get all tasks
+@bp.get("")
+def get_all_tasks():
+    return get_models_with_filters(Task, request.args)
+
+# get one task
+@bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = validate_model(Task, task_id)
+    return {"task": task.to_dict(include_goal_id=(task.goal_id is not None))}
+
+# update task
+@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")
+
+# delete task
+@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")
+
+SLACK_TOKEN = os.environ.get("SLACK_BOT_TOKEN")
+SLACK_CHANNEL = os.environ.get("SLACK_CHANNEL")
+
+# Sends a Slack message when a task marked completed
+def notify_slack(task_title):
+    headers = {
+        "Authorization": f"Bearer {SLACK_TOKEN}",
+        "Content-Type": "application/json"
+    }
+    payload = {
+        "channel": SLACK_CHANNEL,
+        "text": f"Someone just completed the task {task_title}"
+    }
+    response = requests.post("https://slack.com/api/chat.postMessage", headers=headers, json=payload)
+    return response.json()
+
+# partially update mark complete
+@bp.patch("/<task_id>/mark_complete")
+def mark_complete(task_id):
+    task = validate_model(Task, task_id)
+
+    if task.completed_at is None:
+        task.completed_at = datetime.now(UTC)
+        db.session.commit()
+        notify_slack(task.title)
+
+    return Response(status=204, mimetype="application/json")
+
+# partially update incompleted
+@bp.patch("/<task_id>/mark_incomplete")
+def mark_task_incomplete(task_id):
+    task = validate_model(Task, task_id)
+    task.completed_at = None
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")

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