Zoisite - Jackie A.

app/__init__.py

@@ -16,7 +16,7 @@ def create_app(test_config=None):
 
     if test_config is None:
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
-            "SQLALCHEMY_DATABASE_URI")
+            "RENDER_DATABASE_URI")
     else:
         app.config["TESTING"] = True
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
@@ -30,5 +30,11 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .routes.task_routes import tasks_bp
+    app.register_blueprint(tasks_bp)
+
+    from .routes.goal_routes import goals_bp
+    app.register_blueprint(goals_bp)
+
 
     return app

app/models/goal.py

@@ -2,4 +2,19 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", back_populates="goal", lazy=True)
+
+    def to_dict(self):
+        goal_as_dict = {}
+        goal_as_dict["id"] = self.id
+        goal_as_dict["title"] = self.title
+
+        return goal_as_dict
+
+    @classmethod
+    def from_dict(cls, goal_data):
+        new_goal = Goal(title=goal_data["title"])
+
+        return new_goal

app/models/task.py

@@ -2,4 +2,25 @@
 
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    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)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.id"), nullable=True)
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_dict(self):
+        task_as_dict = {}
+        task_as_dict["id"] = self.id
+        task_as_dict["title"] = self.title
+        task_as_dict["description"] = self.description
+        task_as_dict["is_complete"] = False
+
+        return task_as_dict
+
+    @classmethod
+    def from_dict(cls, task_data):
+        new_task = Task(title=task_data["title"],
+                        description=task_data["description"],
+                        completed_at=None)
+        return new_task

app/routes/goal_routes.py

@@ -0,0 +1,113 @@
+from app import db
+from flask import Blueprint, jsonify, request, make_response, abort
+from app.models.task import Task
+from app.models.goal import Goal
+from app.routes.helper_functions import validate_model
+from sqlalchemy import text
+import datetime
+import requests
+import os
+
+goals_bp = Blueprint("goals_bp", __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.from_dict(request_body)
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    response = {"goal" : new_goal.to_dict()}
+
+    return make_response(jsonify(response), 201)
+
+@goals_bp.route("", methods = ["GET"])
+def read_all_goals():
+    goals = Goal.query.all()
+
+    goals_response = []
+    if not goals:
+        return jsonify(goals_response)
+    for goal in goals:
+        goals_response.append(
+            {
+            "id": goal.id,
+            "title": goal.title,
+            }
+            )
+    return jsonify(goals_response)
+
+
+@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):
+    request_body = request.get_json()
+    goal = validate_model(Goal, goal_id)
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    return make_response(jsonify({"goal" : goal.to_dict()}))
+
+
+@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()
+
+    response= (f"Goal {goal_id} \"{goal.title}\" successfully deleted")
+
+    return make_response(jsonify({"details": response}))
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def add_tasks_to_goal(goal_id):
+    request_body = request.get_json()
+    task_ids = request_body["task_ids"]
+
+    goal = validate_model(Goal, goal_id)
+
+    for task_id in task_ids:
+        task = Task.query.get(task_id)
+        task.goal_id = goal.id
+
+    db.session.commit()
+
+    response_message = {"id": int(goal_id), "task_ids": task_ids}
+
+    return make_response(jsonify(response_message))
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_all_tasks_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    response_message = goal.to_dict()
+    tasks = Task.query.filter_by(goal=goal)
+    tasks_response = []
+
+    if tasks:
+        for task in tasks:
+            task_dict = task.to_dict()
+            task_dict["goal_id"] = int(goal_id)
+            tasks_response.append(task_dict)
+
+    response_message["tasks"] = tasks_response
+
+    return make_response(jsonify(response_message))
+
+

app/routes/helper_functions.py

@@ -0,0 +1,33 @@
+from flask import Blueprint, jsonify, request, make_response, abort
+from app.models.task import Task
+from app.models.goal import Goal
+import requests
+import os
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except:
+        abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400))
+
+    model = cls.query.get(model_id)
+
+    if not model:
+        abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404))
+
+    return model
+
+
+def post_slack_message(task_title):
+    slack_url = "https://slack.com/api/chat.postMessage"
+    channel_id = "task-notifications"
+    slack_message = f"Someone just completed the task {task_title}"
+    headers = dict(
+        Authorization = os.environ.get("SLACK_AUTH")
+    )
+    data = dict(
+        channel = channel_id,
+        text = slack_message
+    )
+    response = requests.post(slack_url, headers=headers, data=data)
+    return response

app/routes/task_routes.py

@@ -0,0 +1,119 @@
+from app import db
+from flask import Blueprint, jsonify, request, make_response, abort
+from app.models.task import Task
+from app.models.goal import Goal
+from app.routes.helper_functions import validate_model, post_slack_message
+from sqlalchemy import text
+import datetime
+import requests
+import os
+
+
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+
+@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.from_dict(request_body)
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    response = {"task" : new_task.to_dict()}
+
+    return make_response(jsonify(response), 201)
+
+
+@tasks_bp.route("", methods = ["GET"])
+def read_all_tasks():
+    tasks = Task.query.all()
+
+    sort_query = request.args.get("sort")
+    if sort_query == "asc":
+        tasks = Task.query.order_by(Task.title.asc()).all()
+    elif sort_query == "desc":
+        tasks = Task.query.order_by(Task.title.desc()).all()
+
+    tasks_response = []
+    if not tasks:
+        return jsonify(tasks_response)
+    for task in tasks:
+        tasks_response.append(
+            {
+            "id": task.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": False
+            }
+            )
+    return jsonify(tasks_response)
+
+
+@tasks_bp.route("/<task_id>", methods =["GET"])
+def read_one_task(task_id):
+    task = validate_model(Task, task_id)
+    task_dict = task.to_dict()
+    if task.goal_id:
+        task_dict["goal_id"] = int(task.goal_id)
+
+    return make_response(jsonify({"task" : task_dict}))
+
+
+@tasks_bp.route("/<task_id>", methods=["PUT"])
+def update_task(task_id):
+    request_body = request.get_json()
+
+    task = validate_model(Task, task_id)  
+
+    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()
+
+    response= (f"Task {task_id} \"{task.title}\" successfully deleted")
+
+    return make_response(jsonify({"details": response}))
+
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def mark_complete(task_id):
+    task = validate_model(Task, task_id)    
+
+    task.completed_at = datetime.datetime.today()
+    task_dict = task.to_dict()
+    task_dict["is_complete"] = True
+
+    db.session.commit()
+
+    post_slack_message(task.title)
+
+    return make_response(jsonify({"task" : task_dict}))
+
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_incomplete_incomplete(task_id): 
+    request_body = request.get_json()
+    task = validate_model(Task, task_id)
+
+    task.completed_at = None
+
+    db.session.commit()
+
+    task_dict = task.to_dict()
+    task_dict["is_complete"] = False
+
+    return make_response(jsonify({"task" : task_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