Kunzite - Erina P.

app/__init__.py

@@ -14,21 +14,26 @@ def create_app(test_config=None):
     app = Flask(__name__)
     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("RENDER_DATABASE_URI")
+        # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
+        #     "SQLALCHEMY_TEST_DATABASE_URI")
     else:
         app.config["TESTING"] = True
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
             "SQLALCHEMY_TEST_DATABASE_URI")
 
-    # Import models here for Alembic setup
     from app.models.task import Task
     from app.models.goal import Goal
 
     db.init_app(app)
     migrate.init_app(app, db)
 
-    # Register Blueprints here
+    from .routes.task_routes import tasks_bp
+    app.register_blueprint(tasks_bp)
 
-    return app
+    from .routes.goal_routes import goals_bp
+    app.register_blueprint(goals_bp)
+
+    return app

app/models/goal.py

@@ -3,3 +3,21 @@
 
 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_dict(self, tasks=False):
+        goal_dict = {
+            "id": self.goal_id,
+            "title": self.title
+        }
+        if tasks:
+            goal_dict["tasks"] = [task.to_dict() for task in self.tasks]
+
+        return goal_dict
+
+    @classmethod
+    def from_dict(cls, goal_dict):
+        return Goal(
+            title=goal_dict["title"]
+        )

app/models/task.py

@@ -1,5 +1,30 @@
 from app import db
-
+from datetime import datetime
 
 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)
+    goal = db.relationship("Goal", back_populates="tasks")
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
+
+    def to_dict(self):
+        task_dict = {}
+        task_dict["id"] = self.task_id
+        task_dict["title"] = self.title
+        task_dict["description"] = self.description
+        task_dict["is_complete"] = self.completed_at != None
+
+        if self.goal_id:
+            task_dict["goal_id"] = self.goal_id
+
+        return task_dict
+
+    @classmethod
+    def from_dict(cls, task_dict):
+        return cls(
+            title=task_dict["title"],
+            description=task_dict["description"],
+            completed_at=task_dict.get("completed_at")
+        )

app/routes/goal_routes.py

@@ -0,0 +1,115 @@
+from app import db
+from app.models.goal import Goal
+from app.models.task import Task
+from flask import Blueprint, request, jsonify, make_response, abort 
+
+goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+
+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
+
+
+@goals_bp.route("", methods=["POST"])
+def create_goal():
+    request_body = request.get_json()
+
+    try:
+        new_goal = Goal.from_dict(request_body)
+    except KeyError as err:
+        abort(make_response({"details": "Invalid data"}, 400))
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    goal_dict = {}
+    goal_dict["goal"] = new_goal.to_dict()
+
+    return jsonify(goal_dict), 201
+
+
+@goals_bp.route("", methods=["GET"])
+def sort_by_title():
+    sort_query = request.args.get("sort")
+    if sort_query == "asc":
+        goals = Goal.query.order_by(Goal.title)
+    elif sort_query == "desc":
+        goals = Goal.query.order_by(Goal.title.desc())
+    else:
+        goals = Goal.query.all()
+
+    goal_response = [goal.to_dict() for goal in goals]
+
+    return jsonify(goal_response)
+
+
+@goals_bp.route("/<goal_id>", methods=["GET"])
+def get_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    goal_dict = {"goal": goal.to_dict()}
+
+    return jsonify(goal_dict)
+
+
+@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()
+
+    goal_dict = {"goal": goal.to_dict()}
+
+    return jsonify(goal_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()
+
+    goal_message = {"details": f'Goal {goal.goal_id} \"{goal.title}\" successfully deleted'}
+
+    return jsonify(goal_message)
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_all_tasks_for_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    goal_response = goal.to_dict(tasks=True)
+    return make_response(goal_response), 200
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def post_tasks_to_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    task_ids = request_body["task_ids"]
+
+    for task in goal.tasks:
+        task.goal_id = None
+
+
+    for task_id in task_ids:
+        task = validate_model(Task, task_id)
+        task.goal_id = goal.goal_id
+
+    goal.title = request.args.get("title", goal.title)
+
+    db.session.commit()
+
+    return make_response({"id": goal.goal_id, "task_ids": task_ids}, 200)

app/routes/task_routes.py

@@ -0,0 +1,140 @@
+from flask import Blueprint, request, jsonify, make_response, abort 
+from app import db
+from app.models.task import Task
+from datetime import datetime 
+from sqlalchemy.types import DateTime
+from sqlalchemy.sql.functions import now
+import requests, os
+
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+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
+
+
+@tasks_bp.route("", methods=["POST"])
+def create_task():
+    request_body = request.get_json()
+
+    try:
+        new_task = Task.from_dict(request_body)
+    except KeyError as err:
+        abort(make_response({"details": "Invalid data"}, 400))
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    task_message = {}
+    task_message["task"] = new_task.to_dict()
+
+    return jsonify(task_message), 201
+
+
+@tasks_bp.route("", methods=["GET"])
+def sort_by_title():
+    sort_query = request.args.get("sort")
+    if sort_query == "asc":
+        tasks = Task.query.order_by(Task.title)
+    elif sort_query == "desc":
+        tasks = Task.query.order_by(Task.title.desc())
+    else:
+        tasks = Task.query.all()
+
+    task_response = [task.to_dict() for task in tasks]
+
+    return jsonify(task_response)
+
+
+@tasks_bp.route("/<task_id>", methods=["GET"])
+def get_one_task(task_id):
+    task = validate_model(Task, task_id)
+
+    task_message = {"task": task.to_dict()}
+
+    return jsonify(task_message)
+
+
+@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()
+
+    task_message = {"task": task.to_dict()}
+
+    return jsonify(task_message)
+
+
+@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()
+
+    task_message = {"details": f'Task {task.task_id} \"{task.title}\" successfully deleted'}
+
+    return jsonify(task_message)
+
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def mark_complete(task_id):
+    task = validate_model(Task, task_id)
+
+    try:
+        task = Task.query.get(task_id)
+        task.completed_at = datetime.now()
+
+        task_message = {"task": task.to_dict()}
+
+        db.session.commit()
+        post_to_slack(task)
+        return make_response(jsonify(task_message), 200)
+
+    except:
+        abort(make_response({"message": f"{task_id} not found"}, 404)) 
+
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_incomplete(task_id):
+    task = validate_model(Task, task_id)
+
+    try:
+        task = Task.query.get(task_id)
+        task.completed_at = None
+
+        db.session.commit()
+        task_message = {"task": task.to_dict()}
+        return jsonify(task_message), 200
+
+    except:
+        abort(make_response({"message": f"{task_id} not found"}, 404)) 
+
+
+def post_to_slack(task):
+    slack_url = "https://slack.com/api/chat.postMessage"
+    token = os.environ.get("SLACK_BOT_TOKEN")
+    headers = {"Authorization": f"Bearer {token}"}
+
+    data = {
+        "channel": "api-test-channel",
+        "text": f"Someone just completed the task {task.title}"
+    }
+
+    response = requests.post(slack_url, headers=headers, data=data)
+    return response

migrations/README

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