Sapphire - Linh H.

app/__init__.py

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

app/goal_routes.py

@@ -0,0 +1,93 @@
+from app import db
+from app.models.goal import Goal
+from app.models.task import Task
+from app.helper_functions import validate_model
+from flask import Blueprint, jsonify, make_response, request
+from sqlalchemy import asc, desc
+
+
+goals_bp = Blueprint("goal_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()
+
+    return make_response({"goal": new_goal.to_dict()}, 201)
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def create_tasks_under_one_goal(goal_id):
+    request_body = request.get_json()
+    goal = validate_model(Goal, goal_id)
+
+    task_list = []
+    for task_id in request_body["task_ids"]:
+        task = validate_model(Task, task_id)
+        task.goal = goal
+        task_list.append(task_id)
+
+    db.session.commit()
+
+    return make_response({"id": goal.goal_id, "task_ids": task_list}, 200)
+
+
+@goals_bp.route("", methods=["GET"])
+def read_all_goals():
+    sort_query = request.args.get("sort")
+    if sort_query:
+        if sort_query == "asc":
+            goals = Goal.query.order_by(Goal.title.asc()).all()
+        elif sort_query == "desc":
+            goals = Goal.query.order_by(Goal.title.desc()).all()
+    else:
+        goals = Goal.query.all()
+
+    all_goals = [goal.to_dict() for goal in goals]
+
+    return jsonify(all_goals), 200
+
+
+@goals_bp.route("/<goal_id>", methods=["GET"])
+def read_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    return make_response({"goal": goal.to_dict()}, 200)
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def read_tasks_under_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    goal_task_list = [task.to_dict() for task in goal.tasks]
+
+    return make_response({"id": goal.goal_id, "title": goal.title, "tasks": goal_task_list}, 200)
+
+
+@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({"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({"details":f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}), 200

app/helper_functions.py

@@ -0,0 +1,29 @@
+from app import db
+from flask import make_response, abort
+import os, requests
+
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except:
+        abort(make_response({"message": f"{cls.__name__} {model_id} is 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 slack_bot_message(message):
+    slack_api_key = os.environ.get("SLACK_BOT_TOKEN")
+    slack_url = "https://slack.com/api/chat.postMessage"
+    header = {"Authorization": slack_api_key}
+
+    slack_query_params = {
+        "channel": "task-notifications",
+        "text": message
+    }
+    print(slack_api_key)
+    requests.post(url=slack_url, data=slack_query_params, headers=header)

app/models/goal.py

@@ -3,3 +3,29 @@
 
 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", lazy=True)
+
+    def to_dict(self):
+        return dict(
+            id=self.goal_id,
+            title=self.title
+        )
+
+    @classmethod
+    def from_dict(cls, goal_data):
+        new_goal = Goal(title=goal_data["title"])
+        return new_goal
+
+
+# _______________ 
+# |             |
+# |    Thank    |
+# |   you for   |
+# |  reviewing  |
+# |   my code!  | 
+# |_____________|  
+#       || 
+# (\__/)|| 
+# (•ㅅ•) || 
+# / 　 >||

app/models/task.py

@@ -2,4 +2,43 @@
 
 
 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, nullable=False)
+    description = db.Column(db.String, nullable=False)
+    completed_at = db.Column(db.DateTime, nullable=True)
+    is_complete = db.Column(db.Boolean)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True)
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_dict(self):
+        if self.completed_at:
+            return dict(
+                id=self.task_id,
+                title=self.title,
+                description=self.description,
+                is_complete=True
+            )
+
+        if self.goal_id and not self.completed_at:
+            return dict(
+                id=self.task_id,
+                goal_id=self.goal_id,
+                title=self.title,
+                description=self.description,
+                is_complete=False
+            )
+        else:
+            return dict(
+                id=self.task_id,
+                title=self.title,
+                description=self.description,
+                is_complete=False
+        )
+
+    @classmethod
+    def from_dict(cls, task_data):
+        new_task = Task(
+            title=task_data["title"], 
+            description=task_data["description"]
+            )
+        return new_task

app/task_routes.py

@@ -0,0 +1,92 @@
+from app import db
+from app.models.task import Task
+from app.helper_functions import validate_model, slack_bot_message
+from flask import Blueprint, jsonify, make_response, request, abort
+from sqlalchemy import asc, desc
+from datetime import datetime
+
+
+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()
+
+    return make_response({"task": new_task.to_dict()}, 201)
+
+
+@tasks_bp.route("", methods=["GET"])
+def read_all_tasks():
+    sort_query = request.args.get("sort")
+    if sort_query:
+        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()
+    else:
+        tasks = Task.query.all()
+
+    all_tasks = [task.to_dict() for task in tasks]
+
+    return jsonify(all_tasks), 200
+
+
+@tasks_bp.route("/<task_id>", methods=["GET"])
+def read_one_task(task_id):
+    task = validate_model(Task, task_id)
+
+    return make_response({"task": task.to_dict()}, 200)
+
+
+@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({"task": task.to_dict()}, 200)
+
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def mark_task_complete(task_id):
+    task = validate_model(Task, task_id)
+
+    task.completed_at = datetime.utcnow()
+    db.session.commit()
+
+    slack_bot_message(f"Someone just completed the task {task.title}")
+
+    return make_response({"task": task.to_dict()}, 200)
+
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_task_incomplete(task_id):
+    task = validate_model(Task, task_id)
+
+    task.completed_at = None
+    db.session.commit()
+
+    return make_response({"task": task.to_dict()}, 200)
+
+
+@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({"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"}), 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