Sphinx C22 - Aleida V

app/__init__.py

@@ -1,22 +1,33 @@
 from flask import Flask
 from .db import db, migrate
 from .models import task, goal
+from app.routes.task_routes import bp as tasks_bp
+from app.routes.goal_routes import bp as goals_bp
+from dotenv import load_dotenv
+from flask_cors import CORS
 import os
 
-def create_app(config=None):
+load_dotenv()
+
+def create_app(test_config=None):
     app = Flask(__name__)
+    CORS(app)
+    app.config['CORS_HEADERS'] = 'Content-Type'
 
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
 
-    if config:
+    if test_config:
         # Merge `config` into the app's configuration
         # to override the app's default settings for testing
-        app.config.update(config)
+        app.config.update(test_config)
 
+    # Initialize app with SQLAlchemy and Migrate
     db.init_app(app)
     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,38 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship # type: ignore
 from ..db import db
+from ..routes.task_routes import validate_task
+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 check_goal_tasks(self):
+        tasks_assigned  = []
+        if self.tasks:
+            for task in self.tasks:
+                task = validate_task(task.id)
+                tasks_assigned.append(task.to_nested_dict())
+
+        return tasks_assigned
+
+    def to_dict(self):
+        goal_to_dict = {}
+        goal_to_dict["id"] = self.id
+        goal_to_dict["title"] = self.title
+        return goal_to_dict
+
+    def to_nested_dict(self):
+        goal_to_dict = {}
+        goal_to_dict["id"] = self.id
+        goal_to_dict["title"] = self.title
+        if not self.check_goal_tasks():
+            goal_to_dict["tasks"] = []
+        else:
+            goal_to_dict["tasks"] = self.check_goal_tasks()
+
+        return goal_to_dict

app/models/task.py

@@ -1,5 +1,55 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship # type: ignore
 from ..db import db
+from datetime import datetime
+from sqlalchemy import ForeignKey # type: ignore
+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]] # = completed_at if completed_at is not None
+
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") 
+
+
+    def to_dict(self):
+        if not self.completed_at:
+            is_complete = False
+        else:
+            is_complete = True
+
+        return dict(
+            id=self.id,
+            title=self.title,
+            description=self.description,
+            is_complete=is_complete
+            )
+
+    def to_nested_dict(self):
+        if not self.completed_at:
+            is_complete = False
+        else:
+            is_complete = True
+
+        task_dictionary = dict(
+            id=self.id,
+            title=self.title,
+            description=self.description,
+            is_complete=is_complete
+            )
+
+        if self.goal_id:
+            task_dictionary["goal_id"] = self.goal_id
+
+        return task_dictionary
+
+
+
+

app/routes/goal_routes.py

@@ -1 +1,120 @@
-from flask import Blueprint
+from flask import Blueprint, abort, jsonify, make_response, request
+from app.db import db
+from ..models.goal import Goal
+import requests
+# from .route_utilities import validate_model, create_model, validate_task, validate_goal
+from app.models.task import Task
+from ..routes.task_routes import validate_task
+
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@bp.post("")
+def create_goal():
+
+    try:
+        request_body = request.get_json()
+        title = request_body["title"]
+
+        new_goal = Goal(title=title)
+
+        db.session.add(new_goal)
+        db.session.commit()
+
+        return {"goal": new_goal.to_dict()}, 201
+
+    except KeyError as error:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+
+@bp.get("")
+def get_all_goals():
+
+    query = db.select(Goal).order_by(Goal.id)
+    goals = db.session.scalars(query)
+
+    goals_response = [goal.to_dict() for goal in goals]
+
+    return goals_response
+
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+    response = {"goal": goal.to_dict()}
+    return response
+
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_by_goal(goal_id):
+    goal = validate_goal(goal_id)
+    response = goal.to_nested_dict()
+    return response
+
+# @bp.get("/<goal_id>/tasks")
+# def get_tasks_for_one_goal(goal_id):
+#     goal = validate_goal(goal_id)
+#     return goal.to_nested_dict()
+
+
+
+@bp.post("/<goal_id>/tasks")
+def create_new_tasks_for_goal(goal_id):
+
+    current_goal = validate_goal(goal_id)
+    request_body = request.get_json()
+
+
+    current_goal_tasks = request_body["task_ids"]
+
+    for task in current_goal_tasks:
+        current_task = validate_task(task)
+        # query = db.select(Task).where(current_task.goal_id == goal_id)
+        current_task.goal_id = goal_id
+
+    db.session.commit()
+
+    return {"id": current_goal.id,
+            "task_ids": current_goal_tasks
+        }
+
+
+@bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+
+    goal = validate_goal(goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    response = {"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}
+    return jsonify(response)
+
+
+@bp.put("/<goal_id>")
+def update_goal(goal_id):
+    goal = validate_goal(goal_id)
+    request_body = request.get_json()
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    return {"goal": goal.to_dict()}
+
+
+def validate_goal(goal_id):
+    try:
+        goal_id = int(goal_id)
+
+    except:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+
+    query = db.select(Goal).where(Goal.id == goal_id)
+    goal = db.session.scalar(query)
+
+    if not goal:
+        response = {"details": f"Goal {goal_id} not found"}
+        abort(make_response(response, 404))
+
+    return goal