Possum - Mumina A.

app/__init__.py

@@ -1,7 +1,8 @@
 from flask import Flask
 from .db import db, migrate
-from .models import task, goal
 import os
+from .routes.task_routes import bp as tasks_bp
+from .routes.goal_routes import bp as goals_bp
 
 def create_app(config=None):
     app = Flask(__name__)
@@ -18,5 +19,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,26 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
+from typing import List
 
 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")
+
+    from typing import TYPE_CHECKING
+    if TYPE_CHECKING:
+        from .task import Task
+
+    @classmethod
+    def from_dict(cls, data):
+
+        return cls(
+            title = data['title'],
+        )
+
+    def to_dict(self):
+
+        return {
+            'id': self.id,
+            'title': self.title,
+        }

app/models/task.py

@@ -1,5 +1,73 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
+from datetime import datetime, timezone
+from sqlalchemy import ForeignKey
+from typing import Optional
 
 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(nullable=True)
+    # completed_at: Mapped[Optional[datetime]] = mapped_column()
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
+
+    from typing import TYPE_CHECKING
+    if TYPE_CHECKING:
+        from .goal import Goal
+
+    # Create a new Task object from data we received in a JSON request
+    @classmethod
+    def from_dict(cls, data):
+        title = data["title"]
+        description = data["description"]
+
+        # is_complete may or may not be in data
+        is_complete = data.get("is_complete", False)
+
+        completed_at = (
+        datetime.now(timezone.utc) if is_complete else None
+    )
+
+        return cls(
+            title = data['title'],
+            description = data['description'],
+            completed_at = data.get('completed_at'),
+            goal_id=data.get("goal_id", None)
+        )
+
+    # Turn this Task object into a dictionary so we can send it as JSON in a response
+    def to_dict(self, include_goal: Optional[bool] = None):
+        """Return a dict representation of the Task.
+
+        By default (include_goal is None) this will include the task's
+        `goal_id` when the task belongs to a goal. Callers can override
+        this by passing True/False explicitly for include_goal.
+        """
+
+        # If caller didn't specify, include goal_id when it's present on the task
+        if include_goal is None:
+            include_goal = self.goal_id is not None
+
+        base = {
+            'id': self.id,
+            'title': self.title,
+            'description': self.description,
+            'is_complete': bool(self.completed_at),
+        }
+
+        if include_goal:
+            base['goal_id'] = self.goal_id
+
+        return base
+
+
+# tasks = [
+#     Task(id=1, title='assignment', description='complete assignment for wave 1'),
+#     Task(id=2, title='gym', description='go to the gym'),
+#     Task(id=3, title='errands', description='run errands'),
+#     Task(id=4, title='groceries', description='buy groceries'),
+# ]
+
+

app/routes/goal_routes.py

@@ -1 +1,86 @@
-from flask import Blueprint
+from flask import Blueprint, request, Response
+from .route_utilities import create_model, validate_model
+from app.models.goal import Goal
+from app.db import db
+from app.models.task import Task
+
+bp = Blueprint('goals_bp', __name__, url_prefix='/goals')
+
+@bp.post('')
+def create_goal():
+    request_body = request.get_json()
+    return create_model(Goal, request_body)
+
+@bp.get('')
+def get_all_goals():
+    query = db.select(Goal)
+
+    query = query.order_by(Goal.id)
+
+    goals = db.session.scalars(query)
+
+    goal_response = []
+
+    for goal in goals:
+        goal_response.append(goal.to_dict())
+
+    return goal_response
+
+@bp.get("/<goal_id>")
+def get_goal_by_id(goal_id):
+    goal = validate_model(Goal, goal_id)
+    return goal.to_dict()
+
+@bp.put('/<goal_id>')
+def update_one_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')
+
+@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')
+
+@bp.post('/<goal_id>/tasks')
+def create_task_with_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    # Get the list of task IDs from the request body
+    task_ids = request_body.get("task_ids")
+
+    if not task_ids or not isinstance(task_ids, list):
+        return {"details": "Invalid data"}, 400
+
+    # remove all current tasks from this goal
+    for task in goal.tasks:
+        task.goal_id = None
+
+    # For each task ID, find the task and associate it with the goal
+    for task_id in task_ids:
+        task = validate_model(Task, task_id)
+        task.goal_id = goal.id
+
+    db.session.commit()
+
+    return {
+        "id": goal.id,
+        "task_ids": task_ids
+    }, 200
+
+@bp.get('/<goal_id>/tasks')
+def get_task_for_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    tasks = [task.to_dict() for task in goal.tasks]
+    response = goal.to_dict()
+    response["tasks"] = tasks
+    return response

app/routes/route_utilities.py

@@ -0,0 +1,53 @@
+from flask import abort, make_response
+from ..db import db
+
+# Get a Task by ID, validate the ID, and return 404 if not found
+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
+
+# Create a new Task from a dictionary (like JSON data)
+def create_model(cls, model_data):
+    try:
+        new_model = cls.from_dict(model_data)
+
+    except KeyError as error:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+
+    db.session.add(new_model)
+    db.session.commit()
+
+    return new_model.to_dict(), 201
+
+def get_model_with_filters(model, filters=None, sort_by=None, sort_order=None):
+    query = db.select(model)
+
+    # Apply filters (partial match using ilike)
+    if filters:
+        for attr, value in filters.items():
+            if value is not None:
+                column = getattr(model, attr)
+                query = query.where(column.ilike(f"%{value}%"))
+
+    # Apply sorting
+    sort_by = sort_by or "id"
+    column = getattr(model, sort_by)
+    if sort_order == "desc":
+        query = query.order_by(column.desc())
+    else:
+        query = query.order_by(column.asc())
+
+    return db.session.scalars(query)

app/routes/task_routes.py

@@ -1 +1,93 @@
-from flask import Blueprint
+from flask import Blueprint, request, Response
+from app.models.task import Task
+from app.routes.route_utilities import validate_model, create_model, get_model_with_filters
+from app.db import db
+from datetime import datetime, timezone
+import os
+import requests
+
+bp = Blueprint('tasks_bp', __name__, url_prefix='/tasks')
+
+@bp.post('')
+def create_task():
+    request_body = request.get_json()
+    return create_model(Task, request_body)
+
+@bp.get('')
+def get_all_tasks():
+    title_param = request.args.get('title')
+    description_param = request.args.get('description')
+    sort = request.args.get('sort')
+
+    filters = {
+        "title": title_param,
+        "description": description_param
+    }
+
+    sort_by = "title" if sort in ["asc", "desc"] else "id"
+    sort_order = sort if sort in ["asc", "desc"] else "asc"
+
+    tasks = get_model_with_filters(Task, filters=filters, sort_by=sort_by, sort_order=sort_order)
+
+    return [task.to_dict() for task in tasks]
+
+@bp.get('/<task_id>')
+def get_one_task(task_id):
+    task = validate_model(Task, task_id)
+    return task.to_dict()
+
+@bp.put('/<task_id>')
+def update_one_task(task_id):
+    task = validate_model(Task, task_id)
+    request_body = request.get_json()
+
+    task.title = request_body['title']
+    task.description = request_body['description']
+    task.completed_at = request_body.get('completed_at')
+    db.session.commit()
+
+    return Response(status=204, mimetype='application/json')
+
+@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')
+
+@bp.patch('/<task_id>/mark_complete')
+def mark_complete_task(task_id):
+    task = validate_model(Task, task_id)
+    url = 'https://slack.com/api/chat.postMessage' # Slack API endpoint
+
+    task.completed_at = datetime.now(timezone.utc) # Mark task as completed
+
+    db.session.commit()
+
+    # Set headers for the Slack API request
+    headers = {
+        "Authorization": f"Bearer {os.environ.get('SLACK_API')}", # Slack token
+        "Content-Type": "application/json" # Sending JSON data
+    }
+
+    # Prepare the data payload for Slack
+    data = {
+        "channel": "task-notifications", # Slack channel to post message
+        "text": f"Someone just completed the task {task.title}" # Message content
+    }
+
+    requests.post(url, headers=headers, json=data) # Send notification to Slack
+
+    return Response(status=204, mimetype='application/json')
+
+@bp.patch('/<task_id>/mark_incomplete')
+def mark_incomplete_task(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.