have gotten all tests up until the final two tests in wave 6 complete. Currently working on getting correct response body for the final two tests in wave 6

Author: MBsea21

app/models/goal.py

@@ -1,32 +1,44 @@
-from sqlalchemy.orm import Mapped, mapped_column
-from ..db import db
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from datetime import datetime
 from app.routes.utilities_routes import create_model, validate_model, check_for_completion
 from typing import Optional
+from sqlalchemy import ForeignKey
+# from app.models.task import Task
+from ..db import db
 
 class Goal(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     title: Mapped[str]
+    tasks: Mapped[list["Task"]] = relationship("Task",back_populates="goal", lazy=True)
     # description=Mapped[str]
     # completed_at: Mapped[Optional[datetime]]=mapped_column(nullable = True)
 
 
     def to_dict(self):
-        task_as_dict = {}
-        task_as_dict["id"] = self.id
-        task_as_dict["title"] = self.title
+        goal_as_dict = {}
+        goal_as_dict["id"] = self.id
+        goal_as_dict["title"] = self.title
+        if self.tasks:
+            task_ids=[]
+            task_dictionaries = [task.to_dict() for task in self.tasks]
+            for task in task_dictionaries: 
+                task_id = task.get("id")
+                task_ids.append(task_id)
+            goal_as_dict["task_ids"] = task_ids
+        else: 
+            goal_as_dict["task_ids"] = []
         # task_as_dict["description"] = self.description
         # task_as_dict["is_complete"] = check_for_completion(Goal,self)
 
-        return task_as_dict
+        return goal_as_dict
 
 
 
     @classmethod
     def from_dict(cls, goal_data):
-        new_task = cls(
+        new_goal = cls(
             title=goal_data["title"],
             # description=goal_data["description"],
             # completed_at=goal_data["completed_at"]
         )
-        return new_task
+        return new_goal

app/models/task.py

@@ -1,29 +1,37 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
 from datetime import datetime
 from app.routes.utilities_routes import create_model, validate_model, check_for_completion
 from typing import Optional
+from sqlalchemy import ForeignKey
 
 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]]= mapped_column(nullable = True)
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True)
+    goal: Mapped["Goal"] = relationship("Goal", back_populates="tasks")
 
     def to_dict(self):
         task_as_dict = {}
         task_as_dict["id"] = self.id
         task_as_dict["title"] = self.title
         task_as_dict["description"] = self.description
         task_as_dict["is_complete"] = check_for_completion(Task,self)
+        if self.goal_id:
+            task_as_dict["goal"] = self.goal_id
 
         return task_as_dict
 
 
     @classmethod
     def from_dict(cls, task_data):
+        goal_id = task_data.get("goal_id")
+        
         new_task = cls(
             title=task_data["title"],
             description=task_data["description"],
+            goal_id = goal_id
         )
         return new_task

app/routes/goal_routes.py

@@ -1,19 +1,48 @@
 from flask import Blueprint, abort, make_response, request, Response
+
+from app.models.goal import Goal
 from app.models.task import Task
 from ..db import db
 from datetime import datetime
 from app.routes.utilities_routes import create_model, validate_model, get_models_with_filters, check_for_completion, delete_model
-from app.models.goal import Goal
+
 import requests
 
 goals_bp = Blueprint("goals_bp",__name__, url_prefix= "/goals")
 
 
+####################################################################
+######################### Create FUNCTIONS #########################
+####################################################################
 @goals_bp.post("")
 def create_goal():
     request_body = request.get_json()
     return create_model(Goal,request_body)
 
+@goals_bp.post("/<goal_id>/tasks")
+def post_task_ids_to_goal(goal_id):
+    request_body = request.get_json() 
+    goal = validate_model(Goal, goal_id)
+
+    task_ids = request_body.get("task_ids", [])
+    for task_id in task_ids:
+        task = validate_model(Task, task_id)
+        if task:
+            goal.tasks.append(task)
+    
+    db.session.commit()
+    goal = goal.to_dict()
+    response_body = {
+        "id": goal.get("id"),
+        "task_ids": goal.get("task_ids")
+    }
+
+    return response_body, 200
+
+
+####################################################################
+######################### READ FUNCTIONS #########################
+####################################################################
 @goals_bp.get("")
 def get_goals():
     request_arguements = request.args
@@ -25,6 +54,24 @@ def get_one_goal(goal_id):
     response = {"goal": goal.to_dict()}
     return make_response(response, 200)
 
+@goals_bp.get("/<goal_id>/tasks")
+def get_tasks_for_specific_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    goal_as_dict = goal.to_dict()
+    print(goal_as_dict)
+    request_arguement = {"Goal_Id": goal_id}
+    filtered_result_body= get_models_with_filters(Task, request_arguement)
+    
+    response_body = {
+        "id": goal_as_dict.get("id"),
+        "title": goal_as_dict.get("title"),
+        "tasks": (filtered_result_body)}
+
+    return response_body, 200
+    
+####################################################################
+######################### UPDATE FUNCTIONS #########################
+####################################################################
 @goals_bp.put("/<goal_id>")
 def update_goal(goal_id):
     goal = validate_model(Goal, goal_id)
@@ -36,7 +83,11 @@ def update_goal(goal_id):
     response_body = {"message": f"Goal #{goal_id} succesfully updated"}
     return make_response(response_body, 200)
 
+
+####################################################################
+######################### DELETE FUNCTIONS #########################
+####################################################################
 @goals_bp.delete("/<goal_id>")
 def delete_goal(goal_id):
     goal = validate_model(Goal, goal_id)
-    return delete_model(Goal, goal)
+    return delete_model(Goal, goal)

tests/test_wave_03.py

@@ -127,7 +127,7 @@ def test_mark_complete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
-    assert response_body == {"details": f"task 1 not found"}
+    assert response_body == {"error": f"Task 1 not found"}
 
 ## @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_missing_task(client):
@@ -137,4 +137,4 @@ def test_mark_incomplete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
-    assert response_body == {"details": f"task 1 not found"}
+    assert response_body == {"error": f"Task 1 not found"}

tests/test_wave_05.py

@@ -24,7 +24,8 @@ def test_get_goals_one_saved_goal(client, one_goal):
     assert response_body == [
         {
             "id": 1,
-            "title": "Build a habit of going outside daily"
+            "title": "Build a habit of going outside daily",
+            "task_ids": []
         }
     ]
 
@@ -41,7 +42,8 @@ def test_get_goal(client, one_goal):
     assert response_body == {
         "goal": {
             "id": 1,
-            "title": "Build a habit of going outside daily"
+            "title": "Build a habit of going outside daily",
+            "task_ids": []
         }
     }
 
@@ -54,7 +56,7 @@ def test_get_goal_not_found(client):
     response_body = response.get_json()
 
     assert response.status_code == 404
-    assert response_body == {"message": "Goal 1 not found"}
+    assert response_body == {"error": "Goal 1 not found"}
 
 
 # @pytest.mark.skip(reason="No way to test this feature yet")
@@ -71,7 +73,8 @@ def test_create_goal(client):
     assert response_body == {
         "goal": {
             "id": 1,
-            "title": "My New Goal"
+            "title": "My New Goal",
+            "task_ids": []
         }
     }
 

tests/test_wave_06.py

@@ -121,8 +121,13 @@ def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
     print({
         "task": {
             "id": 1,
+<<<<<<< HEAD
             "goal_id": 1,m
             "title": "Go on y daily walk 🏞",
+=======
+            "goal_id": 1,
+            "title": "Go on my daily walk 🏞",
+>>>>>>> a3849fc (have gotten all tests up until the final two tests in wave 6 complete. Currently working on getting correct response body for the final two tests in wave 6)
             "description": "Notice something new every day",
             "is_complete": False
         }