Pull Request for Project

app/__init__.py

@@ -1,7 +1,10 @@
+from .models import task, goal
 from flask import Flask
 from .db import db, migrate
-from .models import task, goal
 import os
+from app.routes.task_routes import bp as task_bp
+from app.routes.goal_routes import bp as goal_bp
+
 
 def create_app(config=None):
     app = Flask(__name__)
@@ -18,5 +21,9 @@ def create_app(config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from app.routes.task_routes import bp as task_bp
+    from app.routes.goal_routes import bp as goal_bp
+    app.register_blueprint(task_bp)
+    app.register_blueprint(goal_bp)
 
     return app

app/models/goal.py

@@ -1,5 +1,21 @@
-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] = mapped_column(db.String, 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):
+        return cls(title=data["title"])
+
+

app/models/task.py

@@ -1,5 +1,41 @@
-from sqlalchemy.orm import Mapped, mapped_column
 from ..db import db
+from datetime import datetime
+from typing import Optional
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+
 
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(db.String, nullable=False)
+    description: Mapped[str] = mapped_column(db.String)
+    completed_at: Mapped[Optional[datetime]] = mapped_column(db.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.is_complete
+        }
+        if self.goal_id:
+            task_dict["goal_id"] = self.goal_id
+        return task_dict
+
+
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            title=data["title"],
+            description=data["description"],
+            completed_at=None
+        )
+
+    @property
+    def is_complete(self):
+        return self.completed_at is not None

app/routes/goal_routes.py

@@ -1 +1,95 @@
-from flask import Blueprint
+from flask import Blueprint, request, jsonify, Response
+from app.models.goal import Goal
+from ..db import db
+from app.models.task import Task
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@bp.post("/<goal_id>/tasks")
+def assign_tasks_to_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    request_body = request.get_json()
+    task_ids = request_body.get("task_ids", [])
+
+    goal.tasks = [] 
+    for task_id in task_ids:
+        task = db.session.get(Task, task_id)
+        if task:
+            goal.tasks.append(task)
+
+    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 = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    goal_dict = goal.to_dict()
+    goal_dict["tasks"] = [task.to_dict() for task in goal.tasks]
+
+    return jsonify(goal_dict), 200
+
+# CREATE a goal
+@bp.post("")
+def create_goal():
+    data = request.get_json()
+
+    if "title" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    new_goal = Goal.from_dict(data)
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return jsonify({"goal": new_goal.to_dict()}), 201
+
+# GET all goals
+@bp.get("")
+def get_goals():
+    goals = db.session.scalars(db.select(Goal)).all()
+    return jsonify([goal.to_dict() for goal in goals])
+
+# GET one goal
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    return jsonify({"goal": goal.to_dict()})
+
+# UPDATE a goal
+@bp.put("/<goal_id>")
+def update_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    data = request.get_json()
+    if "title" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    goal.title = data["title"]
+    db.session.commit()
+    return jsonify({"goal": goal.to_dict()})
+
+# DELETE a goal
+@bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    db.session.delete(goal)
+    db.session.commit()
+    return Response(status=204, mimetype="application/json")
+

app/routes/task_routes.py

@@ -1 +1,143 @@
-from flask import Blueprint
+from flask import Blueprint, request, jsonify, Response
+from app.models.task import Task
+from ..db import db
+from datetime import datetime, UTC
+from app.slack_helper import post_to_slack
+#from dotenv import load_dotenv
+
+
+import os
+import requests
+#load_dotenv()
+
+
+
+bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+# Helper: safely get a task by ID or return a 404 JSON response
+def get_task_or_abort(task_id):
+    try:
+        task_id = int(task_id)
+    except ValueError:
+        return jsonify({"message": "Invalid ID"}), 400
+
+    task = db.session.get(Task, task_id)
+    if not task:
+        return jsonify({"message": f"No task with ID {task_id} found"}), 404
+
+    return task
+
+# CREATE: POST /tasks
+@bp.post("")
+def create_task():
+    data = request.get_json()
+
+    if "title" not in data or "description" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    new_task = Task.from_dict(data)
+    db.session.add(new_task)
+    db.session.commit()
+
+    return jsonify({"task": new_task.to_dict()}), 201
+
+# READ ALL: GET /tasks
+@bp.get("")
+def get_all_tasks():
+    sort_order = request.args.get("sort")
+    title_filter = request.args.get("title")
+
+    stmt = db.select(Task)
+
+    if title_filter:
+        stmt = stmt.where(Task.title.ilike(f"%{title_filter}%"))
+
+    if sort_order == "asc":
+        stmt = stmt.order_by(Task.title.asc())
+    elif sort_order == "desc":
+        stmt = stmt.order_by(Task.title.desc())
+    else:
+        stmt = stmt.order_by(Task.id.asc())  # fallback sort
+
+    tasks = db.session.scalars(stmt).all()
+
+    return jsonify([task.to_dict() for task in tasks])
+
+
+# READ ONE: GET /tasks/<task_id>
+@bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = get_task_or_abort(task_id)
+    if not isinstance(task, Task):
+        return task  # return 404 or 400 response
+    return jsonify({"task": task.to_dict()})
+
+# UPDATE: PUT /tasks/<task_id>
+@bp.put("/<task_id>")
+def update_task(task_id):
+    task = get_task_or_abort(task_id)
+    if not isinstance(task, Task):
+        return task
+
+    data = request.get_json()
+    if "title" not in data or "description" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    task.title = data["title"]
+    task.description = data["description"]
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
+
+# DELETE: DELETE /tasks/<task_id>
+@bp.delete("/<task_id>")
+def delete_task(task_id):
+    task = get_task_or_abort(task_id)
+    if not isinstance(task, Task):
+        return task
+
+    db.session.delete(task)
+    db.session.commit()
+    return Response(status=204, mimetype="application/json")
+
+# PATCH /tasks/<task_id>/mark_complete
+@bp.patch("/<task_id>/mark_complete")
+def mark_task_complete(task_id):
+    try:
+        task_id = int(task_id)
+    except ValueError:
+        return {"message": "Invalid task ID"}, 400
+    task = db.session.get(Task, task_id)
+    if not task:
+        return {"message": f"No task with ID {task_id} found"}, 404
+
+    task.completed_at = datetime.now(UTC)
+    db.session.commit()
+
+    # Send Slack message
+    post_to_slack(f"Someone just completed the task: {task.title}")
+    return Response(status=204, mimetype="application/json")
+
+
+    #slack_url = os.environ.get("SLACK_WEBHOOK_URL")
+    #if slack_url:
+      #  slack_message = {"text": f"Someone just completed the task: {task.title}"}
+       # requests.post(slack_url, json=slack_message)
+
+
+# PATCH /tasks/<task_id>/mark_incomplete
+@bp.patch("/<task_id>/mark_incomplete")
+def mark_task_incomplete(task_id):
+    try:
+        task_id = int(task_id)
+    except ValueError:
+        return {"message": "Invalid task ID"}, 400
+    task = db.session.get(Task, task_id)
+    if not task:
+        return {"message": f"No task with ID {task_id} found"}, 404
+
+
+    task.completed_at = None
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")

app/slack_helper.py

@@ -0,0 +1,23 @@
+import os
+import requests
+
+def post_to_slack(message):
+    slack_token = os.environ.get("SLACK_BOT_TOKEN")
+    slack_channel = os.environ.get("SLACK_CHANNEL_ID")
+
+    if not slack_token or not slack_channel:
+        return
+
+    headers = {
+        "Authorization": f"Bearer {slack_token}",
+        "Content-Type": "application/json"
+    }
+
+    slack_message = {
+        "channel": slack_channel,
+        "text": message
+    }
+
+    response = requests.post("https://slack.com/api/chat.postMessage", json=slack_message, headers=headers)
+    print("Slack response status:", response.status_code)
+    print("Slack response body:", response.text)

migrations/README

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