Panthers - Kallie and Billie resubmission

Procfile

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

app/__init__.py

@@ -1,7 +1,7 @@
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
-import os
+import os 
 from dotenv import load_dotenv
 
 
@@ -30,5 +30,10 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .tasks_routes import tasks_bp
+    app.register_blueprint(tasks_bp)
+
+    from .goals_routes import goals_bp
+    app.register_blueprint(goals_bp)
 
     return app

app/goals_routes.py

@@ -0,0 +1,110 @@
+from app import db
+from app.models.goal import Goal
+from flask import Blueprint,jsonify,abort,make_response,request
+from app.models.task import Task
+
+goals_bp = Blueprint('goals_bp', __name__, url_prefix='/goals')
+GOAL_ID_PREFIX = '/<goal_id>'
+
+def validate_goal(goal_id):
+    try:
+        goal_id = int(goal_id)
+    except:
+        abort(make_response({"message":f"Goal {goal_id} invalid"}, 400))
+
+    goal = Goal.query.get(goal_id)
+
+    if not goal:
+        abort(make_response({"message":f"Goal {goal_id} not found"}, 404))
+
+    return goal
+
+@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"])
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return make_response({"goal":new_goal.to_dict()}, 201)
+
+@goals_bp.route("", methods=["GET"])
+def get_goals():
+    goal_query = Goal.query
+    goals = goal_query.all()
+
+    goals_response = []
+    for goal in goals:
+        goals_response.append({
+            "id": goal.goal_id,
+            "title": goal.title,
+        })
+
+    return make_response(jsonify(goals_response), 200)
+@goals_bp.route(GOAL_ID_PREFIX, methods=["GET"])
+def get_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+    goal = Goal.query.get(goal_id)
+
+    return {"goal": goal.to_dict()}
+
+@goals_bp.route(GOAL_ID_PREFIX,methods=['PUT'])
+def update_task(goal_id):
+    request_body = request.get_json()
+    if "title" not in request_body:
+        return make_response("Invalid Request, Goal Must Have Title", 400)
+
+    goal = validate_goal(goal_id)
+    goal = Goal.query.get(goal_id)
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+    return make_response({"goal":goal.to_dict()}, 200)
+
+@goals_bp.route(GOAL_ID_PREFIX, methods=['DELETE'])
+def delete_goal(goal_id):
+    goal = validate_goal(goal_id)
+    goal = Goal.query.get(goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return make_response({"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}, 200)
+
+
+@goals_bp.route(GOAL_ID_PREFIX + "/tasks", methods=['GET'])
+def read_tasks (goal_id):
+    goal = validate_goal(goal_id)
+    goal = Goal.query.get(goal_id)
+
+    return_body = goal.to_dict()
+    return_body["tasks"] = [task.to_dict_in_goal() for task in goal.tasks]
+
+    return make_response(jsonify(return_body), 200)
+
+
+@goals_bp.route(GOAL_ID_PREFIX + "/tasks", methods=['POST'])
+def add_tasks_to_goal(goal_id):
+    goal = validate_goal(goal_id)
+    goal = Goal.query.get(goal_id)
+
+    request_body = request.get_json()
+    tasks_to_assign = request_body["task_ids"]
+
+    for task_id in tasks_to_assign:
+        task = Task.query.get(task_id)
+        task.goal_id = goal.goal_id
+
+    db.session.commit()
+
+    return_body = {}
+    return_body["id"] = goal.goal_id
+    return_body["task_ids"] = tasks_to_assign
+
+    return make_response(return_body, 200)

app/models/goal.py

@@ -1,5 +1,12 @@
 from app import db
 
-
 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):
+            return {
+                "id": self.goal_id,
+                "title": self.title
+            }

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_completed = db.Column(db.Boolean, default=False)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_dict(self):
+        return {
+            "id": self.task_id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.is_completed
+        }
+
+    def to_dict_in_goal(self):
+        return {
+            "id": self.task_id,
+            "goal_id": self.goal_id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.is_completed
+        }

app/tasks_routes.py

@@ -0,0 +1,172 @@
+import datetime
+from app import db
+from app.models.task import Task
+from flask import Blueprint,jsonify,abort,make_response,request
+import requests
+from datetime import datetime
+import os
+from dotenv import load_dotenv
+
+tasks_bp = Blueprint('tasks_bp', __name__, url_prefix='/tasks')
+TASK_ID_PREFIX = '/<task_id>'
+
+def validate_task(task_id):
+    try:
+        task_id = int(task_id)
+    except:
+        abort(make_response({"message":f"Task {task_id} invalid"}, 400))
+
+    task = Task.query.get(task_id)
+
+    if not task:
+        abort(make_response({"message":f"Task {task_id} not found"}, 404))
+
+    return task
+
+@tasks_bp.route("", methods=["POST"])
+def create_task():
+    request_body = request.get_json()
+
+    if "title" not in request_body or "description" not in request_body:
+        return make_response({"details": "Invalid data"}, 400)
+
+    new_task = Task(
+        title = request_body["title"],
+        description = request_body["description"],
+    )
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    return make_response({"task":new_task.to_dict()}, 201)
+
+@tasks_bp.route(TASK_ID_PREFIX,methods=['PUT'])
+def update_task(task_id):
+    request_body = request.get_json()
+    if "title" not in request_body or "description" not in request_body:
+        return make_response("Invalid Request, Title & Description Can't Be Empty", 400)
+
+    task = validate_task(task_id)
+    task = Task.query.get(task_id)
+
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+
+    db.session.commit()
+    return make_response({"task":task.to_dict()}, 200)
+
+
+@tasks_bp.route(TASK_ID_PREFIX, methods=["GET"])
+# GET /task/id
+def handle_task(task_id):
+    # Query our db to grab the task that has the id we want:
+    task = validate_task(task_id)
+    task = Task.query.get(task_id)
+
+    if task.goal_id is not None:
+        return{"task": task.to_dict_in_goal()}
+    else:
+        return {"task": task.to_dict()}
+
+
+@tasks_bp.route('',methods=['GET'])
+def get_task():
+    task_query = Task.query
+
+    sort_query = request.args.get("sort")
+    if sort_query:
+        task_response = []
+        tasks = task_query.all()
+        for task in tasks:
+            task_response.append(task.to_dict())
+
+        task_titles = []
+
+        for task in task_response:
+            for key, value in task.items():
+                if key == "title":
+                    task_titles.append(value)
+
+        response_body = []
+        if sort_query == "asc":
+            sorted_tasks = sorted(task_titles)
+        if sort_query == "desc":
+            sorted_tasks = sorted(task_titles, reverse=True)
+        while len(response_body) < len(task_titles):
+            for task in task_response:
+                if len(sorted_tasks) == 0:
+                    break
+                if task["title"] == sorted_tasks[0]:
+                    response_body.append(task)
+                    sorted_tasks.pop(0)
+        return make_response(jsonify(response_body), 200)
+
+    descripiton_query = request.args.get("description")
+    if descripiton_query:
+        task_query = task_query.filter_by(description = descripiton_query)
+
+    title_query = request.args.get("title")
+    if title_query:
+        task_query = task_query.filter_by(name = title_query)
+
+    is_complete_query = request.args.get("is_completed")
+    if is_complete_query:
+        task_query = task_query.filter_by(is_completed= is_complete_query)
+
+    tasks = task_query.all()
+
+    tasks_response = []
+    for task in tasks:
+        tasks_response.append({
+            "id": task.task_id,
+            "title": task.title,
+            "is_complete": task.is_completed,
+            "description": task.description
+        })
+
+    return jsonify(tasks_response)
+
+@tasks_bp.route(TASK_ID_PREFIX,methods=['DELETE'])
+def delete_task(task_id):
+    task = validate_task(task_id)
+    task = Task.query.get(task_id)
+
+    db.session.delete(task)
+    db.session.commit()
+
+    return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200)
+
+@tasks_bp.route(TASK_ID_PREFIX + '/mark_complete', methods=['PATCH'])
+def update_task_complete(task_id):
+    task = validate_task(task_id)
+    date_time_assign = datetime.now()
+    if task.is_completed == False:
+        task.completed_at = date_time_assign
+        task.is_completed = True
+    task_response = {"task": task.to_dict()}
+    db.session.commit()
+    load_dotenv()
+
+    URL = "https://slack.com/api/chat.postMessage"
+
+    payload={"channel":"slack-bot-test-channel",
+            "text": f"Someone just completed the task {task.title}"}
+
+    headers = {
+    "Authorization": os.environ.get('SLACK_TOKEN')
+    }
+
+
+    requests.post(URL, data=payload, headers=headers)
+    return jsonify(task_response),200
+
+@tasks_bp.route(TASK_ID_PREFIX + '/mark_incomplete', methods=['PATCH'])
+def update_task_incomplete(task_id):
+    task = validate_task(task_id)
+    task = Task.query.get(task_id)
+
+    task.is_completed= False
+    task.completed_at = None
+
+    db.session.commit()
+    return make_response({"task":task.to_dict()}, 200)

migrations/README

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