wave5-7

Author: xixilele1990

app/__init__.py

@@ -2,6 +2,7 @@
 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
 import os
 
 def create_app(config=None):
@@ -20,5 +21,7 @@ def create_app(config=None):
 
     # Register Blueprints here
     app.register_blueprint(tasks_bp)
+    
+    app.register_blueprint(goals_bp)
 
     return app

app/models/goal.py

@@ -1,8 +1,25 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column,relationship
 from ..db import db
+from sqlalchemy import String
 #from sqlalchemy import Date
 
 
 class Goal(db.Model):
+
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    
+    title: Mapped[str] = mapped_column(String(100), nullable=False)
+    tasks: Mapped[list["Task"]] = relationship(
+        back_populates="goal")
+
+    
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "title": self.title
+        }
+
+    @classmethod
+    def from_dict(cls, data_dict):
+        if "title" not in data_dict:
+            raise KeyError("title")
+        return cls(title=data_dict["title"])

app/models/task.py

@@ -1,32 +1,42 @@
 from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column,relationship
+from sqlalchemy import ForeignKey
 from ..db import db
 from sqlalchemy import String, Date
 from datetime import datetime
 from flask import Blueprint, abort, make_response, request, Response,jsonify
+from typing import Optional
 
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     title: Mapped[str] = mapped_column(String(100), nullable=False)
     description: Mapped[str] = mapped_column(String(255))
     completed_at:Mapped[datetime.date] = mapped_column(Date, nullable=True)
 
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
 
     def to_dict(self): # json
 
 
-        return {"id": self.id,
+        task_dict = {"id": self.id,
                 "title":self.title,
                 "description":self.description,
                 #"is_complete":self.completed_at if self.completed_at else False
                 "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, data_dict):
         if "title" not in data_dict:
-            #abort(make_response({"details": "Invalid data"}, 400))
+           
             raise KeyError("title")
         if "description" not in data_dict:
             #abort(make_response({"details": "Invalid data"}, 400))

app/routes/goal_routes.py

@@ -1 +1,100 @@
-from flask import Blueprint
+from flask import Blueprint, jsonify, request, abort, make_response
+from ..db import db
+from ..models.goal import Goal
+from ..models.task import Task
+from .route_utilities import validate_model
+
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+
+
+@bp.post("")
+def create_goal():
+    request_body = request.get_json()
+    try:
+        new_goal = Goal.from_dict(request_body)
+    except KeyError:
+        return jsonify({"details": "Invalid data"}), 400
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return jsonify(new_goal.to_dict()), 201
+
+
+@bp.get("")
+def get_all_goals():
+    goals = Goal.query.order_by(Goal.id).all()
+    return jsonify([goal.to_dict() for goal in goals]), 200
+
+
+@bp.get("/<id>")
+def get_one_goal(id):
+    goal = validate_model(Goal, id)
+    return jsonify(goal.to_dict()), 200
+
+
+
+
+@bp.put("/<id>")
+def update_goal(id):
+    goal = validate_model(Goal, id)
+    request_body = request.get_json()
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+    return jsonify(goal.to_dict()), 200
+
+
+
+@bp.delete("/<id>")
+def delete_goal(id):
+    goal = validate_model(Goal, id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return jsonify({"message": f'Goal {goal.id} successfully deleted'}), 204
+
+
+#nested
+@bp.post("/<goal_id>/tasks")
+def add_tasks_to_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
+
+
+
+    for task_id in task_ids:
+        task = validate_model(Task, task_id)
+        task.goal_id = goal.id
+
+    db.session.commit()
+
+    return jsonify({
+        "id": goal.id,
+        "task_ids": task_ids
+    }), 200
+    
+    
+    
+@bp.get("/<goal_id>/tasks")
+def get_tasks_for_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    tasks_response = [task.to_dict() for task in goal.tasks]
+
+    goal_dict = goal.to_dict()
+    goal_dict["tasks"] = tasks_response
+
+    return jsonify(goal_dict), 200
+
+    
+    

app/routes/routes_utilities.py app/routes/route_utilities.pyapp/routes/routes_utilities.py renamed to app/routes/route_utilities.py

@@ -22,8 +22,9 @@ def create_model(cls, model_data):
     try:
         new_model = cls.from_dict(model_data)
     except KeyError as e:
-        response = {"message": f"Invalid request: missing {e.args[0]}"}
-        abort(make_response(response, 400))
+        #response = {"message": f"Invalid request: missing {e.args[0]}"}
+        #abort(make_response(response, 400))
+        abort(make_response({"details": "Invalid data"}, 400))
 
     db.session.add(new_model)
     db.session.commit()

app/routes/task_routes.py

@@ -1,7 +1,7 @@
 from ..models.task import Task
 from flask import Blueprint, abort, make_response, request, Response,jsonify
 from ..db import db
-from .routes_utilities import validate_model,create_model,get_models_with_filters
+from .route_utilities import validate_model,create_model,get_models_with_filters
 from datetime import datetime
 
 bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
@@ -14,7 +14,8 @@ def create_task():
     try:
         new_task = Task.from_dict(request_body)
     except KeyError:
-        return jsonify({"details": "Invalid data"}), 400
+        #return jsonify({"details": "Invalid data"}), 400
+        abort(make_response({"details": "Invalid data"}, 400))
 
     db.session.add(new_task)
     db.session.commit()

migrations/versions/52388701adf4_.py

@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: 52388701adf4
+Revises: b73fa682b647
+Create Date: 2025-11-05 16:55:55.917780
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '52388701adf4'
+down_revision = 'b73fa682b647'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.drop_constraint(None, type_='foreignkey')
+        batch_op.drop_column('goal_id')
+
+    # ### end Alembic commands ###

migrations/versions/b73fa682b647_.py

@@ -0,0 +1,42 @@
+"""empty message
+
+Revision ID: b73fa682b647
+Revises: af48238dc931
+Create Date: 2025-11-05 16:50:04.362330
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'b73fa682b647'
+down_revision = 'af48238dc931'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('goal', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('title', sa.String(length=100), nullable=False))
+
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('title', sa.String(length=100), nullable=False))
+        batch_op.add_column(sa.Column('description', sa.String(length=255), nullable=False))
+        batch_op.add_column(sa.Column('completed_at', sa.Date(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.drop_column('completed_at')
+        batch_op.drop_column('description')
+        batch_op.drop_column('title')
+
+    with op.batch_alter_table('goal', schema=None) as batch_op:
+        batch_op.drop_column('title')
+
+    # ### end Alembic commands ###