Shark - Ying

Procfile

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

app/__init__.py

@@ -12,6 +12,9 @@
 
 def create_app(test_config=None):
     app = Flask(__name__)
+
+    # app.config["SLACK_TOKEN"] = os.environ.get("SLACK_API_KEY")
+
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
     if test_config is None:
@@ -30,5 +33,10 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from app.routes.routes import tasks_bp
+    app.register_blueprint(tasks_bp)
+    from app.routes.goal_routes import goals_bp
+    app.register_blueprint(goals_bp)
 
     return app
+

app/models/goal.py

@@ -2,4 +2,21 @@
 
 
 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_json(self):
+        return {
+            "id": self.goal_id,
+            "title": self.title
+        }
+
+    @classmethod
+    def create_goal(cls, req_body):
+        new_goal = cls(
+            title = req_body["title"],
+        )
+        return new_goal

app/models/task.py

@@ -1,5 +1,58 @@
 from app import db
-
+from datetime import datetime
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True,    )
+    title = db.Column(db.String)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, default = None)
+    # (- Nullable=True is default)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"))
+    goal = db.relationship("Goal", back_populates="tasks")
+
+
+
+    def to_json(self):
+
+            to_json_dict = {
+                "id": self.id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": True if self.completed_at else False
+            }
+            if self.goal_id:
+                to_json_dict["goal_id"] =self.goal_id
+
+            return to_json_dict
+
+    @classmethod
+    def create(cls, req_body):
+        if not "completed_at" in req_body:
+            completed_at_status = None
+        else:
+            completed_at_status = req_body["completed_at"]
+
+        new_task = cls(
+            title = req_body["title"],
+            description = req_body["description"],
+            completed_at = completed_at_status
+
+        )
+        return new_task
+
+
+    def update(self, req_body):
+
+        if not "completed_at" in req_body:
+            completed_at_status = None
+        else:
+            completed_at_status = req_body["completed_at"]
+
+
+        self.title = req_body["title"],
+        self.description = req_body["description"],
+        self.completed_at = completed_at_status
+
+
+
+

app/routes/goal_routes.py

@@ -0,0 +1,136 @@
+from pydoc import describe
+from urllib import response
+from flask import Blueprint, jsonify, request, make_response,abort
+from app import db
+from app.models.goal import Goal
+from app.models.task import Task
+from .helper import goal_validate_client_requests, validate_goal, validate_task
+
+goals_bp = Blueprint("goals", __name__,url_prefix="/goals" )
+
+#GET all
+@goals_bp.route("", methods = ["GET"])
+def get_all_goals():
+    goals = Goal.query.all()
+
+    goals_response = []
+    for goal in goals:
+        goals_response.append(goal.to_json())
+
+    return jsonify(goals_response),200
+
+
+#GET one
+@goals_bp.route("/<goal_id>", methods = ["GET"])
+def get_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    return {"goal": goal.to_json()},200
+
+
+#CREATE one
+@goals_bp.route("", methods = ["POST"])
+def create_one_goal():
+
+    request_body = request.get_json()
+    if "title" in request_body:
+    # new_goal = goal_validate_client_requests(request_body)
+
+    #?????? why below does not work
+    # new_goal = Goal(title = request_body["title"])
+        new_goal = Goal.create_goal(request_body)
+        db.session.add(new_goal)
+        db.session.commit()
+
+        return {"goal": new_goal.to_json()}, 201   
+    else:
+        return  {"details": "Invalid data"}, 400
+
+
+
+
+
+#UPDATE one goal 
+@goals_bp.route("/<goal_id>", methods = ["PUT"])
+def update_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    request_body = request.get_json()
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    return make_response(jsonify({"goal": goal.to_json()}), 200)
+
+
+#DELETE 
+@goals_bp.route("/<goal_id>", methods = ["DELETE"])
+def delete_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return {"details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}, 200
+
+
+
+# Sending a List of Task IDs to a Goal
+@goals_bp.route("/<goal_id>/tasks", methods = ["POST"])
+def create_tasks(goal_id):
+#1 get goal for adding tasks:
+    goal = validate_goal(goal_id)
+
+#2 get tasks that need to add to goal
+    #  2.a get task ids from client
+    request_body = request.get_json()
+    #  2.b get tasks by ids from DB and connect with FK
+    for id in request_body["task_ids"]:
+        task = validate_task(id)
+        task.goal_id = goal_id
+        # or   -  add a list of tasks to goal
+        # goal.tasks.append(task)
+        # or   -  assign goal to task.goal
+        # task.goal = goal
+
+    db.session.commit()
+
+#3 create respons body and return it
+    tasks_id_list =[]
+    for task in goal.tasks:
+        tasks_id_list.append(task.id)
+    response_body = {
+        "id": goal.goal_id,
+        "task_ids": tasks_id_list
+    }
+    return make_response(jsonify(response_body), 200)
+
+
+#GET task from specific goal
+@goals_bp.route("/<goal_id>/tasks", methods = ["GET"])
+def get_task_from_specific_goal(goal_id):
+    #get target goal
+    goal = validate_goal(goal_id)
+
+
+    tasks_list = []
+    for task in goal.tasks:
+        tasks_list.append( task.to_json())
+
+    response_boday = {
+        "id": goal.goal_id,
+        "title": goal.title,
+        "tasks": tasks_list
+    }
+
+
+    return response_boday, 200
+
+#Get a specific Task under given Goal
+@goals_bp.route("/tasks/<id>", methods = ["GET"])
+def get_task_under_specific_goal(id):
+    task = validate_task(id)
+    goal_id = task.goal_id
+
+    response_body = task.to_json()
+    return response_body, 200

app/routes/helper.py

@@ -0,0 +1,48 @@
+from app.models.task import Task
+from app.models.goal import Goal
+from flask import abort, make_response,request
+
+
+def validate_task(id):
+    try:
+        id = int(id)
+    except:
+        abort(make_response({"message": f"Task{id} is invalid"}, 400))
+
+    task = Task.query.get(id)
+    if not task:
+        abort(make_response({"message": f"Task{id} not found"}, 404))
+
+    return task
+
+
+def validate_client_requests(request_body):
+    try:
+        new_task = Task.create(request_body)
+    except KeyError:
+        abort(make_response({"details": "Invalid data"},400))
+
+    return new_task
+
+
+def validate_goal(id):
+    try:
+        id = int(id)
+    except:
+        abort(make_response({"message": f"Goal{id} is invalid"}, 400))
+
+    goal = Goal.query.get(id)
+    if not goal:
+        abort(make_response({"message": f"Goal{id} not found"}, 404))
+
+    return goal
+
+def goal_validate_client_requests(request_body):
+    try:
+        new_goal = Goal.create(request_body)
+    except KeyError:
+        abort(make_response({"details": "Invalid data"},400))
+
+    return new_goal
+
+