Amethyst - Megan G

app/__init__.py

@@ -1,8 +1,9 @@
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
-import os
 from dotenv import load_dotenv
+import os
+
 
 
 db = SQLAlchemy()
@@ -15,8 +16,9 @@ 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 +32,9 @@ 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,106 @@
+from app import db
+from app.models.goal import Goal
+from app.models.task import Task
+from flask import Blueprint, jsonify, make_response, abort, request
+import requests
+from app.task_routes import validate_model
+
+goals_bp = Blueprint("goals'", __name__, url_prefix = "/goals")
+
+@goals_bp.route("", methods=["POST"])
+def create_goal():
+    request_body = request.get_json()
+
+    if not request_body.get("title"):
+        abort(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("/<goal_id>/tasks", methods=["POST"])
+def add_task_to_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    request_body = request.get_json()
+
+    for task_id in request_body["task_ids"]:
+        task = validate_model(Task, task_id)
+        task.goal_id = goal.goal_id
+
+    db.session.commit()
+
+    return make_response(
+        {
+            "id": goal.goal_id,
+            "task_ids": request_body["task_ids"]
+        }
+    ), 200
+
+
+@goals_bp.route("", methods=["GET"])
+def read_goals():
+    goals = Goal.query.all()
+
+    goals_response = []
+    for goal in goals:
+        goals_response.append(goal.to_dict())
+
+    return jsonify(goals_response), 200
+
+@goals_bp.route("/<goal_id>", methods=["GET"])
+def read_one_saved_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    return {
+        "goal": goal.to_dict()
+    }
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_tasks_of_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    tasks_response = []
+    for task in goal.tasks:
+        tasks_response.append(task.to_dict())
+
+    return jsonify({
+            "id": goal.goal_id,
+            "title": goal.title,
+            "tasks": tasks_response
+        }), 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/models/goal.py

@@ -2,4 +2,20 @@
 
 
 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", lazy = True)
+
+    def to_dict(self):
+
+        return {
+            "id": self.goal_id,
+            "title": self.title,
+                    }
+
+    @classmethod
+    def from_dict(cls, goal_data):
+        new_goal = Goal(
+            title = goal_data["title"],
+        )
+        return new_goal

app/models/task.py

@@ -2,4 +2,36 @@
 
 
 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)
+    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.goal_id:
+            return {
+                        "id": self.task_id,
+                        "title": self.title,
+                        "goal_id": self.goal_id,
+                        "description": self.description,
+                        "is_complete": bool(self.completed_at)
+                    }
+
+        else:
+            return {
+                        "id": self.task_id,
+                        "title": self.title,
+                        "description": self.description,
+                        "is_complete": bool(self.completed_at)
+                    }
+
+    @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,134 @@
+from app import db
+from app.models.task import Task
+from app.models.goal import Goal
+from flask import Blueprint, jsonify, make_response, abort, request
+import datetime
+import requests
+import os
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix = "/tasks")
+
+###### Create Route ######
+@tasks_bp.route("", methods=["POST"])
+def create_task():
+    request_body = request.get_json()
+
+    if not request_body.get("title") or not request_body.get("description"):
+        abort(make_response(
+                {
+                    "details": "Invalid data"
+                }, 400
+            ))
+
+    task = Task.from_dict(request_body)
+
+    db.session.add(task)
+    db.session.commit()
+
+    return jsonify({"task": task.to_dict()}), 201
+
+###### Read Route ######
+
+@tasks_bp.route("", methods=["GET"])
+def read_tasks():
+
+    title_query = request.args.get("sort")
+    if title_query == "asc":
+        tasks = Task.query.order_by(Task.title).all()
+    elif title_query == "desc":
+        tasks = Task.query.order_by(Task.title.desc()).all()
+    else:
+        tasks = Task.query.all()
+
+    tasks_response = []
+    for task in tasks:
+        tasks_response.append(task.to_dict()), 200
+
+    return jsonify(tasks_response)
+
+@tasks_bp.route("/<task_id>", methods=["GET"])
+def read_one_saved_task(task_id):
+    task = validate_model(Task, task_id)
+
+    return {"task": task.to_dict()}
+
+###### Update Route ######
+@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)
+
+###### Patch Route ######
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def mark_task_complete(task_id):
+    task = validate_model(Task, task_id)
+
+    request_body = request.get_json()
+
+    task.completed_at = datetime.datetime.now()
+
+    db.session.commit()
+
+    slack_channel_id = "C0581Q2TDGQ"
+    slack_url = "https://slack.com/api/chat.postMessage"
+
+    slack_data = {
+        "channel": slack_channel_id,
+        "text": f"Someone completed the {task.title} task!"
+    }
+
+    headers= {
+        "Authorization": f"Bearer {os.environ.get('SLACK_KEY')}"
+    }
+
+    slack_request = requests.post(slack_url, headers=headers, json=slack_data)
+    print(slack_request.text)
+    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)
+
+    request_body = request.get_json()
+
+    task.completed_at = None
+
+    db.session.commit()
+
+    return make_response({"task": task.to_dict()}, 200)
+
+###### Delete Route ######
+
+@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
+    )
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except:
+        abort(make_response({"details":f"Invalid data"}, 400))
+
+    model = cls.query.get(model_id)
+
+    if not model:
+        abort(make_response({"details":f"{cls.__name__} ID not found"}, 404))
+
+    return model

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