Pull Request from Yasiel

app/__init__.py

@@ -1,22 +1,35 @@
-from flask import Flask
+from flask import Flask, request
 from .db import db, migrate
+from .routes.task_routes import bp as tasks_bp
+from .routes.goal_routes import bp as goals_bp
 from .models import task, goal
 import os
 
 def create_app(config=None):
     app = Flask(__name__)
-
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
-
+    
     if config:
-        # Merge `config` into the app's configuration
-        # to override the app's default settings for testing
         app.config.update(config)
-
+    
     db.init_app(app)
     migrate.init_app(app, db)
-
-    # Register Blueprints here
-
-    return app
+
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+
+    @app.errorhandler(404)
+    def handle_not_found(e):
+        if request.path.startswith('/goals'):
+            return {"error": "Goal not found"}, 404
+        elif request.path.startswith('/tasks'):
+            return {"error": "Task not found"}, 404
+        else:
+            return {"error": "Not found"}, 404
+
+    @app.errorhandler(400)
+    def handle_bad_request(e):
+        return {"details": "Invalid data"}, 400
+
+    return app

app/models/goal.py

@@ -1,5 +1,31 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import String
 from ..db import db
 
 class Goal(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(String(100))
+
+    tasks = relationship("Task", back_populates="goal", cascade="all, delete-orphan")
+
+    @classmethod
+    def from_dict(cls, goal_data):
+        if not goal_data.get("title"):
+            return None
+
+        return cls(
+            title=goal_data.get("title")
+        )
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "title": self.title
+        }
+
+    def to_dict_with_tasks(self):
+        goal_dict = self.to_dict()
+        goal_dict["tasks"] = [task.to_dict(include_goal_id=True) for task in self.tasks]
+        return goal_dict
+
+    #finished, i think

app/models/task.py

@@ -1,5 +1,38 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import String, Text, ForeignKey
+from datetime import datetime
+from typing import Optional
 from ..db import db
 
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(String(100))
+    description: Mapped[str] = mapped_column(Text)
+    completed_at: Mapped[Optional[datetime]]
+
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal = relationship("Goal", back_populates="tasks")
+
+    @classmethod
+    def from_dict(cls, task_data):
+        if not task_data.get("title") or not task_data.get("description"):
+            return None
+
+        return cls(
+            title=task_data.get("title"),
+            description=task_data.get("description"),
+            completed_at=task_data.get("completed_at")
+        )
+
+    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
+        }
+
+        if include_goal_id and self.goal_id is not None:
+            task_dict["goal_id"] = self.goal_id
+
+        return task_dict

app/routes/goal_routes.py

@@ -1 +1,105 @@
-from flask import Blueprint
+from flask import Blueprint, request, make_response, abort
+from ..db import db
+from ..models.goal import Goal
+from ..models.task import Task
+
+bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+def get_goal_by_id(id):
+    query = db.select(Goal).where(Goal.id == id)
+    return db.session.scalar(query)
+
+def get_task_by_id(id):
+    query = db.select(Task).where(Task.id == id)
+    return db.session.scalar(query)
+
+@bp.route("", methods=["POST"])
+def create_goal():
+    request_body = request.get_json()
+
+    new_goal = Goal.from_dict(request_body)
+
+    if not new_goal:
+        abort(400)
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return {"goal": new_goal.to_dict()}, 201
+
+@bp.route("", methods=["GET"])
+def get_all_goals():
+    goals = db.session.scalars(db.select(Goal)).all()
+    return [goal.to_dict() for goal in goals]
+
+@bp.route("/<goal_id>", methods=["GET"])
+def get_goal(goal_id):
+    goal = get_goal_by_id(goal_id)
+
+    if not goal:
+        abort(404)
+
+    return {"goal": goal.to_dict()}
+
+@bp.route("/<goal_id>", methods=["PUT"])
+def update_goal(goal_id):
+    goal = get_goal_by_id(goal_id)
+
+    if not goal:
+        abort(404)
+
+    request_body = request.get_json()
+
+    goal.title = request_body.get("title", goal.title)
+
+    db.session.commit()
+
+    response = make_response("", 204)
+    response.mimetype = "application/json"
+    return response
+
+@bp.route("/<goal_id>", methods=["DELETE"])
+def delete_goal(goal_id):
+    goal = get_goal_by_id(goal_id)
+
+    if not goal:
+        abort(404)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    response = make_response("", 204)
+    response.mimetype = "application/json"
+    return response
+
+@bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_goal_tasks(goal_id):
+    goal = get_goal_by_id(goal_id)
+
+    if not goal:
+        abort(404)
+
+    return goal.to_dict_with_tasks()
+
+@bp.route("/<goal_id>/tasks", methods=["POST"])
+def associate_tasks_with_goal(goal_id):
+    goal = get_goal_by_id(goal_id)
+
+    if not goal:
+        abort(404)
+
+    request_body = request.get_json()
+    task_ids = request_body.get("task_ids", [])
+
+    valid_tasks = [task for task in 
+                (get_task_by_id(task_id) for task_id in task_ids) 
+                if task is not None]
+
+    goal.tasks = valid_tasks
+
+    db.session.commit()
+
+    return {
+        "id": goal.id,
+        "task_ids": [task.id for task in goal.tasks]
+    }

app/routes/task_routes.py

@@ -1 +1,111 @@
-from flask import Blueprint
+from flask import Blueprint, request, make_response, abort
+from ..db import db
+from ..models.task import Task
+from datetime import datetime
+from ..services.slack_service import send_slack_notification
+
+bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+
+def get_task_by_id(id):
+    query = db.select(Task).where(Task.id == id)
+    return db.session.scalar(query)
+
+@bp.route("", methods=["POST"])
+def create_task():
+    request_body = request.get_json()
+
+    new_task = Task.from_dict(request_body)
+
+    if not new_task:
+        abort(400)
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    return {"task": new_task.to_dict()}, 201
+
+@bp.route("", methods=["GET"])
+def get_all_tasks():
+    sort_param = request.args.get("sort")
+
+    query = db.select(Task)
+
+    if sort_param == "asc":
+        query = query.order_by(Task.title.asc())
+    elif sort_param == "desc":
+        query = query.order_by(Task.title.desc())
+
+    tasks = db.session.scalars(query).all()
+
+    return [task.to_dict() for task in tasks]
+
+@bp.route("/<task_id>", methods=["GET"])
+def get_task(task_id):
+    task = get_task_by_id(task_id)
+
+    if not task:
+        abort(404)
+
+    return {"task": task.to_dict(include_goal_id=True)}
+
+@bp.route("/<task_id>", methods=["PUT"])
+def update_task(task_id):
+    task = get_task_by_id(task_id)
+
+    if not task:
+        abort(404)
+
+    request_body = request.get_json()
+
+    task.title = request_body.get("title", task.title)
+    task.description = request_body.get("description", task.description)
+
+    db.session.commit()
+
+    response = make_response("", 204)
+    response.mimetype = "application/json"
+    return response
+
+@bp.route("/<task_id>", methods=["DELETE"])
+def delete_task(task_id):
+    task = get_task_by_id(task_id)
+
+    if not task:
+        abort(404)
+
+    db.session.delete(task)
+    db.session.commit()
+
+    response = make_response("", 204)
+    response.mimetype = "application/json"
+    return response
+
+@bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def mark_task_complete(task_id):
+    task = get_task_by_id(task_id)
+
+    if not task:
+        abort(404)
+
+    task.completed_at = datetime.now()
+    db.session.commit()
+
+    send_slack_notification(f"Someone just completed the task {task.title}")
+
+    response = make_response("", 204)
+    response.mimetype = "application/json"
+    return response
+
+@bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_task_incomplete(task_id):
+    task = get_task_by_id(task_id)
+
+    if not task:
+        abort(404)
+
+    task.completed_at = None
+    db.session.commit()
+
+    response = make_response("", 204)
+    response.mimetype = "application/json"
+    return response

app/services/slack_service.py

@@ -0,0 +1,40 @@
+import os
+import requests
+from flask import current_app
+
+def send_slack_notification(message):
+    """
+    Send a notification message to Slack
+    Returns True if successful, False otherwise
+    """
+    slack_token = os.environ.get('SLACK_BOT_TOKEN')
+
+    if not slack_token:
+        return False
+
+    slack_data = {
+        'channel': 'task-notifications',
+        'text': message
+    }
+
+    headers = {
+        'Authorization': f'Bearer {slack_token}',
+        'Content-Type': 'application/json'
+    }
+
+    try:
+        slack_response = requests.post(
+            'https://slack.com/api/chat.postMessage',
+            json=slack_data,
+            headers=headers
+        )
+
+        if current_app and current_app.debug:
+            current_app.logger.debug(f"Slack API Response: {slack_response.status_code}")
+
+        return slack_response.status_code == 200
+
+    except Exception as e:
+        if current_app:
+            current_app.logger.error(f"Error sending Slack notification: {str(e)}")
+        return False