Crow- Helen L.

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 task_bp
+from .routes.goal_routes import bp as goal_bp
 import os
 
 def create_app(config=None):
@@ -10,13 +12,13 @@ def create_app(config=None):
     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
+    app.register_blueprint(task_bp)
+    app.register_blueprint(goal_bp)
 
     return app
+

app/models/goal.py

@@ -1,5 +1,24 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    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_dict = {
+            "id": self.id,
+            "title": self.title,
+        } 
+        return goal_dict
+
+    @classmethod
+    def from_dict(cls, data):
+
+        new_goal = cls(title=data["title"])
+        return new_goal

app/models/task.py

@@ -1,5 +1,37 @@
-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, TYPE_CHECKING
+from datetime import datetime
+
+if TYPE_CHECKING:
+    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[Optional[datetime]] 
+    goal_id: Mapped[Optional[int]] = mapped_column(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.completed_at is not None
+        } 
+        if self.goal:
+            task_dict["goal_id"] = self.goal.id
+        return task_dict
+
+    @classmethod
+    def from_dict(cls, data):
+        goal_id = data.get("goal_id")
+
+        new_task = cls(
+            title=data["title"], 
+            description=data["description"], 
+            goal_id=goal_id)
+
+        return new_task

app/routes/common.py

@@ -0,0 +1,27 @@
+from flask import request
+from app.db import db
+from .route_utilities import validate_model, create_model as util_create_model
+
+def create_model_endpoint(model_cls, required_keys=("title",)):
+    body = request.get_json() or {}
+    return util_create_model(model_cls, body)
+
+def list_models_endpoint(model_cls):
+    return [m.to_dict() for m in model_cls.query.all()]
+
+def get_one_endpoint(model_cls, model_id):
+    instance = validate_model(model_cls, model_id)
+    return instance.to_dict(), 200
+
+def update_fields_endpoint(instance, fields):
+    body = request.get_json() or {}
+    for f in fields:
+        if f in body:
+            setattr(instance, f, body[f])
+    db.session.commit()
+    return instance.to_dict(), 200
+
+def delete_model_endpoint(instance, success_msg_template):
+    db.session.delete(instance)
+    db.session.commit()
+    return {"details": success_msg_template.format(id=instance.id, title=getattr(instance, "title", ""))}, 200

app/routes/goal_routes.py

@@ -1 +1,80 @@
-from flask import Blueprint
+from flask import Blueprint, request, Response
+from app.models.goal import Goal
+from app.models.task import Task
+from ..db import db
+from .route_utilities import validate_model, create_model, get_models_with_filters
+
+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.post("/<goal_id>/tasks")
+def create_task_with_goal(goal_id):
+
+    goal = validate_model(Goal, goal_id)
+
+    request_body = request.get_json() 
+    task_ids = request_body["task_ids"] 
+
+    task_list = [] 
+    for id in task_ids: 
+        task = validate_model(Task, id)
+        task_list.append(task)
+
+    goal.tasks = task_list
+    db.session.commit()
+
+    return { 
+            "id": goal.id,
+            "task_ids": task_ids
+        }, 200
+
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_by_goal(goal_id):
+
+    goal = validate_model(Goal, goal_id)
+    tasks = [task.to_dict() for task in goal.tasks]
+
+    return {
+        "id": goal.id,
+        "title": goal.title,
+        "tasks": tasks
+    }, 200
+
+
+@bp.get("")
+def get_all_goals():
+
+    return get_models_with_filters(Goal, request.args)
+
+@bp.get("<goal_id>")
+def get_one_goal(goal_id):
+
+    goal = validate_model(Goal, goal_id)
+    return goal.to_dict()
+
+
+@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")
+
+
+@bp.delete("<goal_id>")
+def delete_model(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/jason")

app/routes/route_utilities.py

@@ -0,0 +1,53 @@
+from flask import abort, make_response, request
+from ..db import db
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+
+    except ValueError:
+        response = {"message": f"{cls.__name__} {model_id} is 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": f"Invalid data"}
+        abort(make_response(response, 400))
+
+    db.session.add(new_model)
+    db.session.commit()
+
+    return new_model.to_dict(), 201
+
+
+def get_models_with_filters(cls, filters=None):
+    query = db.select(cls)
+
+    if filters:
+        for attribute, value in filters.items():
+            if hasattr(cls, attribute):
+                query = query.where(getattr(cls, attribute).ilike(f"%{value}%"))
+
+            if attribute == "sort":
+                if value == "desc":
+                    query = query.order_by(cls.title.desc())
+                elif value == "asc":
+                    query = query.order_by(cls.title.asc())    
+
+    models = db.session.scalars(query.order_by(cls.id))
+    models_response = [model.to_dict() for model in models]
+
+    return models_response

app/routes/task_routes.py

@@ -1 +1,84 @@
-from flask import Blueprint
+from flask import Blueprint, request, Response
+from app.models.task import Task
+from ..db import db
+from datetime import datetime
+import requests
+import os
+from .route_utilities import validate_model, create_model, get_models_with_filters
+
+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():
+
+    return get_models_with_filters(Task, request.args)
+
+
+@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_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")
+
+
+@bp.patch("/<task_id>/mark_complete")
+def mark_complete_task(task_id):
+    task = validate_model(Task, task_id)
+
+    task.completed_at = datetime.now()
+    db.session.commit()
+
+
+    url = "https://slack.com/api/chat.postMessage"
+    data = {
+        "text": f"Someone just completed the task {task.title}",
+        "channel": "test-slack-api"
+    }
+    headers = {
+        'Content-Type': 'application/json',
+        'Authorization': f"Bearer {os.environ.get('SLACK_BOT_TOKEN')}"
+    }
+    requests.post(url, headers=headers, json=data)
+
+
+    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")
+
+
+@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/jason")

migrations/README

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