PR - Bukunmi G SL

app/__init__.py

@@ -29,6 +29,10 @@ def create_app(test_config=None):
     db.init_app(app)
     migrate.init_app(app, db)
 
-    # Register Blueprints here
+    # Register Blueprints here -- Reminder to self alwaus update when you add a new route
+    from.routes.task import tasks_bp
+    app.register_blueprint(tasks_bp)
+    from .routes.goal import goals_bp
+    app.register_blueprint(goals_bp)
 
     return app

app/models/goal.py

@@ -3,3 +3,20 @@
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", back_populates="goal")
+
+    def to_dict(self, tasks=False):
+        goal_as_dict = {
+            "id": self.goal_id,
+            "title": self.title,
+        }
+        if tasks:
+            goal_as_dict["tasks"] = [task.to_dict() for task in self.tasks]
+        return goal_as_dict
+
+
+    @classmethod
+    def from_dict(cls, task_data):
+        new_goal = cls(title=task_data["title"],)
+        return new_goal

app/models/task.py

@@ -2,4 +2,27 @@
 
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    task_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable=True)
+    is_complete = db.Column(db.Boolean, default=False)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"))
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_dict(self):
+        task = {
+            "id": self.task_id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.is_complete
+        }
+        if self.goal_id:
+            task["goal_id"] = self.goal_id
+        return task 
+
+    @classmethod
+    def from_dict(cls,task_data):
+        new_task = cls(title=task_data["title"],
+        description=task_data["description"],)
+        return new_task 

app/routes/goal.py

@@ -0,0 +1,78 @@
+from app import db 
+from app.models.goal import Goal
+from app.models.task import Task 
+from flask import Flask, Blueprint, jsonify, make_response, request, abort, render_template, redirect, url_for
+from datetime import datetime as dt
+from app.routes.task import validate_model
+
+
+goals_bp = Blueprint("goal_bp", __name__, url_prefix="/goals")
+
+#purpose: create goal.reminder to refactor
+@goals_bp.route("", methods=["POST"])
+def create_goal():
+    try:
+        request_body = request.get_json()
+        new_goal = Goal.from_dict(request_body)
+
+        db.session.add(new_goal)
+        db.session.commit()
+
+        goal_dict = new_goal.to_dict()
+
+        return make_response(jsonify({
+            "goal":goal_dict }), 201)
+    except:
+        abort(make_response({"details": "Invalid data"}, 400))
+
+#purpose: get saved goals
+@goals_bp.route("", methods=["GET"])
+def retrieve_goals():
+    goals = Goal.query.all()
+    goals_response = [goal.to_dict() for goal in goals]
+    return jsonify(goals_response), 200 
+
+@goals_bp.route("<goal_id>", methods=["GET"])
+def read_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    return make_response(jsonify({
+        "goal": goal.to_dict()
+    }))
+
+@goals_bp.route("<goal_id>", methods=["PUT"])
+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 make_response(jsonify({
+        "goal":goal.to_dict()
+    })), 200
+
+@goals_bp.route("<goal_id>", methods=["DELETE"])
+def delete_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+    return make_response(jsonify({
+        "details": f'Goal {goal_id} "{goal.title}" successfully deleted'
+    }))
+
+@goals_bp.route("<goal_id>/tasks", methods=["POST"])
+def add_task(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+
+    goal.tasks += Task.query.filter(Task.task_id.in_(request_body["task_ids"])).all()
+    db.session.commit()
+
+    return make_response (jsonify({
+        "id": goal.goal_id,
+        "task_ids": request_body["task_ids"]
+    }))
+
+@goals_bp.route("<goal_id>/tasks", methods=["GET"])
+def get_tasks(goal_id):
+    goal = validate_model(Goal, goal_id)
+    return make_response(jsonify(goal.to_dict(tasks=True)))

app/routes/task.py

@@ -0,0 +1,119 @@
+from app import db 
+from app.models.task import Task 
+from flask import Flask, Blueprint, jsonify, make_response, request, abort
+from datetime import datetime as dt
+
+
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except:
+        abort(make_response({"details":f"{cls.__name__} {model_id} invalid"}, 400))
+
+    model = cls.query.get(model_id)
+    if not model:
+        abort(make_response({"details": f"{cls.__name__} {model_id} not found"}, 404)) 
+    return model
+
+
+@tasks_bp.route("", methods=["POST"])
+def create_task():
+    try:
+        request_body = request.get_json()
+        new_task = Task.from_dict(request_body)
+
+
+        db.session.add(new_task)
+        db.session.commit()
+
+        task_dict = new_task.to_dict()
+        return make_response(jsonify({"task": task_dict}), 201)
+    except KeyError: 
+        return (make_response(jsonify({"details": "Invalid data"})), 400)
+
+
+# @tasks_bp.route("", methods=["GET"])
+# def no_saved_tasks():
+#     tasks_response = []
+#     return jsonify(tasks_response) 
+
+@tasks_bp.route("", methods=["GET"])
+def get_saved_tasks():
+    sort_query = request.args.get("sort")
+    task_query = Task.query
+
+    if sort_query =="asc":
+        task_query = Task.query.order_by(Task.title.asc())
+    if sort_query == "desc":
+        task_query = Task.query.order_by(Task.title.desc())
+    tasks = task_query.all()
+
+    tasks_response = [task.to_dict() for task in tasks]
+    return jsonify(tasks_response), 200
+
+
+@tasks_bp.route("/<task_id>", methods=["GET"])
+def get_one_saved_tasks(task_id):
+    # task_response = []
+    # id_query = request.args.get("id")
+    # if id_query:
+    #     task = Task.query.filter_by(task_id=id)
+    #     print(task,"test")
+    #     task_response.append(task)
+    # return jsonify(task_response)
+
+    task = validate_model(Task, task_id)
+    return {"task": task.to_dict()}, 200
+    # return make_response(jsonify({
+    #     "task": task.to_dict()
+    # }))
+
+@tasks_bp.route("/<task_id>", methods=["PUT"])
+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 make_response(jsonify({
+        "task": task.to_dict()
+    }))
+
+@tasks_bp.route("/<task_id>", methods=["DELETE"])
+def delete_task(task_id):
+    task = validate_model(Task, task_id)
+
+    db.session.delete(task)
+    db.session.commit()
+
+    return make_response(jsonify({"details": f'Task {task_id} "{task.title}" successfully deleted'}))
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def update_task_to_complete(task_id):
+    task = validate_model(Task, task_id)
+
+    task.completed_at = dt.utcnow()
+    task.is_complete = True
+
+    db.session.commit()
+    return make_response(jsonify({
+        "task": task.to_dict()})), 200
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def change_task_incomplete(task_id):
+    task = validate_model(Task, task_id)
+
+    task.completed_at = None
+    task.is_complete = False
+
+    db.session.commit()
+    return make_response(jsonify({
+        "task": task.to_dict()
+    }))
+
+

migrations/README

@@ -0,0 +1 @@
+Generic single-database configuration.

migrations/alembic.ini

@@ -0,0 +1,45 @@
+# 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
+
+[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
+
+[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