Tigers- Lindsey B.

Procfile

@@ -0,0 +1 @@
+web: gunicorn 'app:create_app()'

app/__init__.py

@@ -1,3 +1,4 @@
+from dotenv import load_dotenv
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
@@ -29,6 +30,13 @@ def create_app(test_config=None):
     db.init_app(app)
     migrate.init_app(app, db)
 
+
     # Register Blueprints here
+    from app.models.task import Task
+    from .routes.routes import task_bp, goals_bp
+
+    app.register_blueprint(task_bp)
+    app.register_blueprint(goals_bp)
+
 
     return app

app/models/goal.py

@@ -1,5 +1,36 @@
 from app import db
+from flask import Blueprint, make_response, request, jsonify, abort, request
+
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", back_populates="goal")
+
+    def to_dict(self):
+        return {
+            "title": self.title,
+            "id": self.goal_id
+        }
+
+    @classmethod
+    def from_json(cls, req_body):
+        return cls(
+            title=req_body['title']
+        )
+
+    def update(self,req_body):
+        try:
+            self.title = req_body["title"]
+        except KeyError as error:
+            abort(make_response({'message': f"Missing attribute: {error}"}))
+
+    def to_new_dict(self):
+        return {
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.completed_at != None,
+            "id": self.task_id,
+            "goal_id": self.goal_id
+        }

app/models/task.py

@@ -1,5 +1,50 @@
 from app import db
+from flask import Blueprint, make_response, request, jsonify, abort, request
 
 
 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, default=None)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'))
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_dict(self):
+        return {
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.completed_at != None,
+            "id": self.task_id
+        }
+
+    @classmethod
+    def from_json(cls, req_body):
+        return cls(
+            title=req_body['title'],
+            description=req_body['description'],
+            #TODO completed_at=req_body['completed_at']
+        )
+
+    def update(self,req_body):
+        try:
+            self.title = req_body["title"]
+            self.description = req_body["description"]
+            self.completed_at = req_body["completed_at"]
+        except KeyError as error:
+            abort(make_response({'message': f"Missing attribute: {error}"}))
+
+    def __str__(self):
+        return "Task"
+
+    def __repr__(self):
+        return "Task"
+
+    def to_new_dict(self):
+        return {
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.completed_at != None,
+            "id": self.task_id,
+            "goal_id": self.goal_id
+        }

app/routes/routes.py

@@ -0,0 +1,237 @@
+from flask import Blueprint, make_response, request, jsonify, abort
+from app import db
+from app.models.task import Task
+from datetime import datetime
+from app.models.goal import Goal
+import os, requests
+
+#VALIDATE ID
+def validate_id(class_obj,id):
+    try:
+        id = int(id)
+    except:
+        abort(make_response({"message":f"{id} is an invalid id"}, 400))
+    query_result = class_obj.query.get(id)
+    if not query_result:
+        abort(make_response({"message":f"{id} not found"}, 404))
+
+    return query_result
+
+#CREATE TASK
+task_bp = Blueprint("Task", __name__, url_prefix="/tasks")
+@task_bp.route("", methods=["POST"])
+def create_task():
+    request_body = request.get_json()
+    if "title" not in request_body or "description" not in request_body:
+        #TODO later wave will need 'or "completed_at" not in request_body', add above
+        return make_response({"details": "Invalid data"}, 400)
+
+    new_task = Task.from_json(request_body)
+
+    # abort(make_response)  
+    db.session.add(new_task)
+    db.session.commit()
+    response_body = {
+        "task": new_task.to_dict()
+        }
+    return make_response(response_body, 201)
+
+# @task_bp.route("", methods=["GET"])
+# def read_all_task():
+#     tasks_response = []
+#     tasks = Task.query.all()
+#     for task in tasks:
+#         tasks_response.append(task.to_dict())
+#     return jsonify(tasks_response)
+##GET ALL TASKS AND SORT TASKS BY ASC & DESC
+
+@task_bp.route("", methods=["GET"])
+def read_all_task():
+    title_sort_query = request.args.get("sort")
+    if title_sort_query == "asc":
+        tasks = Task.query.order_by(Task.title.asc())
+    elif title_sort_query == "desc":
+        tasks = Task.query.order_by(Task.title.desc())
+    else:
+        tasks = Task.query.all()
+
+    response = []
+    for task in tasks:
+        response.append(task.to_dict())
+    return jsonify(response)
+
+#GET ONE TASK
+@task_bp.route("/<task_id>", methods=["GET"])
+def get_one_task(task_id):
+    task = validate_id(Task, task_id)
+    if task.goal_id is None:
+        return {"task": task.to_dict()}
+    else:
+        return {"task": task.to_new_dict()}
+    # response_body = {
+    #     "task": task.to_dict()
+    # }
+    # return response_body
+
+#UPDATE TASK
+@task_bp.route("/<task_id>", methods=["PUT"])
+def update_task(task_id):
+    task = validate_id(Task, task_id)
+    request_body = request.get_json() 
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+    # TODO task.completed_at = request_body["completed_at"] #include later
+    # task.update(request_body)
+    db.session.commit()
+    response_body =  {
+        "task": task.to_dict()
+        }
+    return make_response(response_body, 200)
+
+#DELETE ONE TASK
+@task_bp.route("/<task_id>", methods=["DELETE"])
+def delete_task(task_id):
+    task = validate_id(Task, task_id)
+
+    task_dict = task.to_dict()
+
+    db.session.delete(task)
+    db.session.commit()
+
+    return {
+        "details": f'Task {task_id} "{task_dict["title"]}" successfully deleted'}
+
+#MARK COMPLETE
+#MODIFY MARK COMPLETE TO CALL SLACK API
+@task_bp.route("/<task_id>/mark_complete", methods=["PATCH"]) #custom endpoint mark task complete
+def mark_complete(task_id):
+    task = validate_id(Task, task_id)
+    task.completed_at = datetime.utcnow()
+
+    db.session.commit()
+    response = {
+        "task": task.to_dict()
+    }
+    slack_key = os.environ.get("SLACKBOT_API_KEY")
+    path = "https://slack.com/api/chat.postMessage"
+    data = {
+        "channel": "task-notifications",
+        "text": f"Someone just completed the task {task.title}"
+    }
+    headers = {
+        "authorization":f"Bearer {slack_key}"
+    }
+    return jsonify(response)
+
+
+#MARK INCOMPLETE
+@task_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_incomplete(task_id):
+    task = validate_id(Task, task_id)
+    task.completed_at = None
+
+    db.session.commit()
+    response = {
+        "task": task.to_dict()
+    }
+
+    return jsonify(response)
+
+### GOAL ROUTES
+#POST/CREATE A GOAL
+goals_bp = Blueprint("Goal", __name__, url_prefix="/goals")
+@goals_bp.route("", methods=["POST"])
+def create_goal():
+    request_body = request.get_json()
+    if "title" not in request_body:
+        return make_response({"details": "Invalid data"}, 400)
+
+    new_goal = Goal(title=request_body["title"])
+
+    #abort(make_response)  
+    db.session.add(new_goal)
+    db.session.commit()
+
+    response_body = {
+        "goal": new_goal.to_dict()
+        }
+    return make_response(response_body), 201
+
+#POST # 
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def post_tasks_to_goal(goal_id):
+    goal = validate_id(Goal, goal_id)
+
+    request_body = request.get_json()
+    task_ids = []
+
+    for task_id in request_body["task_ids"]:
+        task = validate_id(Task, task_id)
+
+        goal.tasks.append(task) 
+        task_ids.append(task_id)
+
+    db.session.commit()
+
+    return {"id": goal.goal_id, "task_ids": task_ids}
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])   
+def get_tasks_with_goal(goal_id):
+    goal = validate_id(Goal, goal_id)
+
+    response = []
+
+    for task in goal.tasks:
+        response.append(task.to_new_dict())
+
+    return {"id": goal.goal_id, "title": goal.title, "tasks": response}
+
+
+
+
+
+## GET ALL GOALS
+@goals_bp.route("", methods=["GET"])
+def get_all_goals():
+    goals = Goal.query.all()
+    response = []
+
+    for goal in goals:
+        response.append(goal.to_dict())
+    return jsonify(response), 200
+
+#GET ONE GOAL
+@goals_bp.route("/<goal_id>", methods=["GET"])
+def get_one_goal(goal_id):
+    goal = validate_id(Goal, goal_id) #id instead of goal_id
+    response_body = {
+        "goal": goal.to_dict()
+    }
+    return response_body
+
+#UPDATE GOAL
+@goals_bp.route("/<goal_id>", methods=["PUT"])
+def update_goal(goal_id):
+    goal = validate_id(Goal, goal_id)
+    request_body = request.get_json() 
+    goal.title = request_body["title"]
+
+    db.session.commit()
+    response_body =  {
+        "goal": goal.to_dict()
+        }
+    return make_response(response_body, 200)
+
+#DELETE ONE GOAL
+@goals_bp.route("/<goal_id>", methods=["DELETE"])
+def delete_goal(goal_id):
+    goal = validate_id(Goal, goal_id)
+
+    goal_dict = goal.to_dict()
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return {
+        "details": f'Goal {goal_id} "{goal_dict["title"]}" successfully deleted'}
+

migrations/README

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