Finished Waves 1-6

app/__init__.py

@@ -30,5 +30,9 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .routes.task_routes import task_bp
+    app.register_blueprint(task_bp)
+    from .routes.goal_routes import goal_bp
+    app.register_blueprint(goal_bp)
 
     return app

app/models/goal.py

@@ -1,5 +1,37 @@
 from app import db
-
+from flask import jsonify, abort, make_response
 
 class Goal(db.Model):
+
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String, nullable = False)
+    tasks = db.relationship("Task", back_populates="goal", lazy=True)
+
+    def to_json(self):
+
+        return {
+                "id": self.goal_id,
+                "title": self.title
+        }
+
+    @classmethod
+    def validate(cls, goal_id):
+        try:
+            goal_id = int(goal_id)
+        except:
+            abort(make_response(jsonify(f"{goal_id} is not a valid goal id."),400))
+        goal = cls.query.get(goal_id)  
+        if goal:
+            return goal
+        abort(make_response(jsonify(f"Goal with id of {goal_id} was not found"),404))
+
+    @classmethod
+    def create(cls,request_body):
+        new_goal = cls(
+        title = request_body['title']
+
+    )
+        return new_goal
+
+    def update(self,request_body):
+        self.title = request_body["title"]

app/models/task.py

@@ -1,5 +1,56 @@
 from app import db
-
+from flask import jsonify, abort, make_response
 
 class Task(db.Model):
+
     task_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String, nullable = False)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime)
+    goal_id = db.Column (db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_json(self):
+        if not self.completed_at:
+            is_complete = False
+        else:
+            is_complete = True
+
+        task_dict = {
+                "id": self.task_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": is_complete
+        }
+
+        if self.goal_id:
+            task_dict["goal_id"] = self.goal_id
+
+        return task_dict
+
+
+
+    @classmethod
+    def validate(cls, task_id):
+        try:
+            task_id = int(task_id)
+        except:
+            abort(make_response(jsonify(f"{task_id} is not a valid task id."),400))
+        task = cls.query.get(task_id)  
+        if task:
+            return task
+        abort(make_response(jsonify(f"Task with id of {task_id} was not found"),404))
+
+    @classmethod
+    def create(cls,request_body):
+        new_task = cls(
+        title = request_body['title'],
+        description = request_body['description'],
+        completed_at = request_body.get('completed_at', None)
+
+    )
+        return new_task
+
+    def update(self,request_body):
+        self.title = request_body["title"]
+        self.description = request_body["description"]

app/routes/goal_routes.py

@@ -0,0 +1,113 @@
+from datetime import date
+from urllib import response
+from flask import Blueprint, jsonify, make_response, abort, request
+from app.models.goal import Goal
+from app.models.task import Task
+from app import db
+
+goal_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+@goal_bp.route("", methods = ["GET"])
+def get_all_goal():
+    goal_response_body = []
+
+    if request.args.get("sort") == "asc":
+        goals = Goal.query.order_by(Goal.title.asc())
+    elif request.args.get("sort") == "desc":
+        goals = Goal.query.order_by(Goal.title.desc())
+    else:
+        goals = Goal.query.all()
+
+    for goal in goals:
+        goal_response_body.append(goal.to_json())
+
+    return jsonify(goal_response_body), 200
+
+@goal_bp.route("", methods = ["POST"])
+def create_goal():
+    request_body = request.get_json()
+    print(request_body)
+
+    try:
+        new_goal = Goal.create(request_body)
+    except KeyError:
+        return {"details": "Invalid data"}, 400
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    response_body = {}
+    response_body["goal"] = new_goal.to_json()
+    return jsonify(response_body), 201
+
+@goal_bp.route("/<id>", methods = ["GET"])
+def get_one_goal(id):
+    one_goal = Goal.validate(id)
+    response_body = {}
+    response_body["goal"] = one_goal.to_json()
+
+    return jsonify(response_body), 200
+
+@goal_bp.route("/<id>", methods = ["PUT"])
+def update_goal(id):
+    one_goal = Goal.validate(id)
+    request_body = request.get_json()
+
+    one_goal.update(request_body)
+
+    db.session.commit()
+    response_body = {}
+    response_body["goal"] = one_goal.to_json()
+
+    return jsonify(response_body), 200
+
+
+@goal_bp.route("/<id>", methods = ["DELETE"])
+def delete_goal(id):
+    one_goal = Goal.validate(id)
+    db.session.delete(one_goal)
+    db.session.commit()
+
+    return jsonify({"details": f'Goal {one_goal.goal_id} "{one_goal.title}" successfully deleted'})
+
+@goal_bp.route("/<id>/tasks", methods = ["POST"])
+def list_of_task_to_goal(id):
+    valid_goal = Goal.validate(id)
+    request_body = request.get_json()
+
+    for task_id in request_body["task_ids"]:
+        Task.validate(task_id)
+        task = Task.query.get(task_id)
+        task.goal_id = valid_goal.goal_id
+
+    db.session.commit()
+    task_list = []
+
+    for task in valid_goal.tasks:
+        task_list.append(task.task_id)
+
+    response_body = {}
+    response_body = {
+        "id": valid_goal.goal_id,
+                    "task_ids": task_list}
+
+    return jsonify(response_body), 200
+
+@goal_bp.route("/<id>/tasks", methods = ["GET"])
+def get_task_one_goal(id):
+    valid_goal = Goal.validate(id)
+    task_list = []
+
+    for task in valid_goal.tasks:
+        task_list.append(task.to_json())
+
+    response_body = {}
+    response_body = {
+        "id": valid_goal.goal_id,
+        "title": valid_goal.title,
+        "tasks": task_list}
+
+    return jsonify(response_body), 200
+
+
+

app/routes/task_routes.py

@@ -0,0 +1,104 @@
+from datetime import date
+from urllib import response
+from flask import Blueprint, jsonify, make_response, abort, request
+from app.models.task import Task
+from app import db
+
+
+task_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+
+
+@task_bp.route("", methods=["GET"])
+def get_all_tasks():
+    task_response_body = []
+    # tasks = Task.query.all()
+
+    if request.args.get("sort") == "asc":
+        tasks = Task.query.order_by(Task.title.asc())
+    elif request.args.get("sort") == "desc":
+        tasks = Task.query.order_by(Task.title.desc())
+    else:
+        tasks = Task.query.all()
+
+    for task in tasks:
+        task_response_body.append(task.to_json())
+
+    return jsonify(task_response_body), 200
+
+@task_bp.route("", methods=["POST"])
+def create_task():
+    request_body = request.get_json()
+    print(request_body)
+
+    try:
+        new_task = Task.create(request_body)
+    except KeyError:
+        return {"details": "Invalid data"}, 400
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    response_body = {}
+    response_body["task"] = new_task.to_json()
+    return jsonify(response_body), 201
+
+
+
+@task_bp.route("/<id>", methods = ["GET"])
+def get_one_tasks(id):
+    one_task = Task.validate(id)
+    response_body = {}
+    response_body["task"] = one_task.to_json()
+
+    return jsonify(response_body), 200
+
+@task_bp.route("/<id>", methods = ["PUT"])
+def update_task(id):
+    one_task = Task.validate(id)
+    request_body = request.get_json()
+
+    one_task.update(request_body)
+
+    db.session.commit()
+    response_body = {}
+    response_body["task"] = one_task.to_json()
+
+    return jsonify(response_body), 200
+
+@task_bp.route("/<id>", methods = ["DELETE"])
+def delete_task(id):
+    one_task = Task.validate(id)
+    db.session.delete(one_task)
+    db.session.commit()
+
+    return jsonify({"details": f'Task {one_task.task_id} "{one_task.title}" successfully deleted'})
+
+
+@task_bp.route("/<id>/mark_complete", methods = ["PATCH"])
+def mark_complete(id):
+    one_task = Task.validate(id)
+
+    one_task.completed_at = date.today()
+
+    db.session.commit()
+    response_body = {}
+    response_body["task"] = one_task.to_json()
+
+    return jsonify(response_body), 200
+
+@task_bp.route("/<id>/mark_incomplete", methods = ["PATCH"])
+def mark_incomplete(id):
+    one_task = Task.validate(id)
+    one_task.completed_at = None
+
+    db.session.commit()
+    response_body = {}
+    response_body["task"] = one_task.to_json()
+
+    return jsonify(response_body), 200
+
+
+
+
+
+

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