Possum - Jesica G

app/__init__.py

@@ -1,6 +1,8 @@
 from flask import Flask
 from .db import db, migrate
-from .models import task, goal
+#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):
@@ -18,5 +20,7 @@ def create_app(config=None):
     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,25 @@
-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
+        }
+        if self.tasks:
+            goal_dict["tasks"] = [task.to_dict() for task in self.tasks]
+        return goal_dict
+
+    @classmethod
+    def from_dict(cls, goal_data):
+        new_goal = cls(title=goal_data["title"])
+        return new_goal

app/models/task.py

@@ -1,5 +1,47 @@
-from sqlalchemy.orm import Mapped, mapped_column
-from ..db import db
+from sqlalchemy.orm import Mapped, mapped_column,relationship
+from app.db import db
+from sqlalchemy import ForeignKey
+from datetime import datetime
+from typing import Optional
+from typing import TYPE_CHECKING
+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_id is not None:
+            task_dict["goal_id"] = self.goal_id
+
+        return task_dict
+
+    @classmethod
+    def from_dict(cls, task_data):
+
+        is_complete = task_data.get("is_complete", False)
+
+        if is_complete:
+            completed_at = datetime.now()
+        else:
+            completed_at = None
+
+        new_task = cls(title=task_data["title"],
+                       description=task_data["description"],
+                       completed_at=completed_at)
+        return new_task
+
+
+

app/routes/goal_routes.py

@@ -1 +1,76 @@
-from flask import Blueprint
+from flask import Blueprint, abort, make_response, Response, request
+from app.db import db
+from app.models.goal import Goal
+from app.models.task import Task
+from .route_utilities import create_model, get_models_with_filters, validate_model
+
+
+bp = Blueprint("goal_bp", __name__, url_prefix= "/goals")
+
+@bp.post("")
+def create_new_goal():
+    request_body = request.get_json()
+    if not "title" in request_body:
+        return {
+        "details": "Invalid data"
+    }, 400
+
+    return create_model(Goal, request_body)
+
+@bp.get("")
+def get_all_goals():
+    return get_models_with_filters(Goal, request.args)
+
+@bp.get("/<goal_id>")
+def get_one_saved_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_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_tasks_with_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    task_ids = request_body.get("task_ids", [])
+
+    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)
+
+    db.session.commit()
+
+    response = {
+        "id": goal.id,
+        "task_ids": [task.id for task in tasks]
+    }
+    return response, 200
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_for_missing_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    response = goal.to_dict()
+
+    if not goal.tasks:
+        response["tasks"] = []
+    return response, 200
+

app/routes/route_utilities.py

@@ -0,0 +1,45 @@
+from flask import abort, make_response
+from ..db import db
+
+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__} with id({model_id}) not found."}
+        abort(make_response(response, 404))
+    return model
+
+def create_model(cls, model_data, status_code=201):
+    try:
+        new_model = cls.from_dict(model_data)
+
+    except KeyError as error:
+        response = {"details": "Invalid data"}
+        abort(make_response(response, 400))
+
+    db.session.add(new_model)
+    db.session.commit()
+    return new_model.to_dict(), status_code
+
+def get_models_with_filters(cls, filters=None, sort=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 sort == "desc":
+        query = query.order_by(cls.title.desc())
+    else:
+        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,81 @@
-from flask import Blueprint
+from flask import Blueprint, abort, make_response, Response, request
+from app.db import db
+from datetime import datetime
+from app.models.task import Task
+import requests
+import os
+from .route_utilities import create_model, get_models_with_filters, validate_model
+
+bp = Blueprint("task_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():
+    filters = {}
+    title = request.args.get("title")
+    description = request.args.get("description")
+    sort = request.args.get("sort", "asc")
+
+    if title:
+        filters["title"] = title
+    if description:
+        filters["description"] = description
+
+    return get_models_with_filters(Task, filters, sort)
+
+@bp.get("/<task_id>")
+def get_one_saved_task(task_id):
+    task = validate_model(Task,task_id)
+    return task.to_dict()
+@bp.put("/<task_id>")
+def update_a_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.delete("/<id>")
+def delete_task(id):
+    task = validate_model(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_id):
+    task = validate_model(Task, task_id)
+    # response = task.to_dict()
+
+    if task.completed_at is None:
+        task.completed_at = datetime.now()
+
+    db.session.commit()
+    json_payload = {
+                    'channel': 'task-notifications', 
+                    'text':f"Someone just completed the task, {task.title}",
+                    'Content-Type':'application/json; charset=utf-8'
+                    }
+    requests.post('https://slack.com/api/chat.postMessage', 
+                  json=json_payload,
+                  headers={'Authorization': 'Bearer ' + os.environ.get('SLACK_TOKEN')})
+
+    return Response(status=204, mimetype="application/json")
+
+@bp.patch("/<task_id>/mark_incomplete")
+def mark_incomplete(task_id):
+    task = validate_model(Task, task_id)
+
+    if task.completed_at is not None:
+        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