Lilian Mora tigers

Procfile

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

app/__init__.py

@@ -9,7 +9,6 @@
 migrate = Migrate()
 load_dotenv()
 
-
 def create_app(test_config=None):
     app = Flask(__name__)
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False

app/models/__init__.py

@@ -0,0 +1,30 @@
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
+import os
+from dotenv import load_dotenv
+db = SQLAlchemy()
+migrate = Migrate()
+load_dotenv()
+
+
+def create_app(test_config=None):
+    app = Flask(__name__)
+    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+    if test_config == None:
+        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI")
+    else:
+        app.config["TESTING"] = True
+        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI")
+    from app.models.task import Task
+    from app.models.goal import Goal
+
+    db.init_app(app)
+    migrate.init_app(app, db)
+
+    from .routes import tasks_bp, goals_bp
+    from .routes import tasks_bp
+    from .routes import goals_bp
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+    return app

app/models/goal.py

@@ -1,5 +1,24 @@
 from app import db
+from flask import current_app, jsonify
+from sqlalchemy.orm import backref
 
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", backref= "goal")
+
+    def goal_dict(self):
+        return{
+            "id":self.goal_id,
+            "title":self.title
+        }
+    @classmethod
+    def goal_arguments(cls,title_from_url):
+        if title_from_url:
+            goals = Goal.query.filter_by(title=title_from_url).all()
+            if not goals:
+                goals = Goal.query.filter(Goal.title.contains(title_from_url))
+            else:
+                goals = Goal.query.all()
+        return goals

app/models/task.py

@@ -1,5 +1,19 @@
 from app import db
+from flask import current_app,request
+from sqlalchemy import desc,asc
+from dotenv import load_dotenv
 
 
 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)
+
+    def task_dict(self):
+        task_dict = {"id": self.task_id, "title": self.title, "description": self.description, "is_complete": False if self.completed_at != None else True}
+
+        return task_dict
+
+

app/routes.py

@@ -1 +1,190 @@
-from flask import Blueprint
+from flask import Blueprint, request, jsonify, make_response, abort
+from app.models.task import Task
+from app import db
+from app.models.goal import Goal
+from sqlalchemy import desc
+from datetime import datetime
+import requests
+import os
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+@tasks_bp.route("", methods=["POST"])
+def new_task():
+
+    request_body = request.get_json()
+    if 'title' not in request_body or 'description' \
+not in request_body or 'completed_at' not in request_body:
+        return make_response({"details": "Invalid data"}, 400)
+    else:
+
+        new_task = Task(title=request_body["title"],
+                        description=request_body["description"],
+                        completed_at=request_body["completed_at"])
+        db.session.add(new_task)
+        db.session.commit()
+        is_complete = new_task.completed_at !=  None
+        return make_response({"task": {"id": new_task.task_id, "title": new_task.title, "description": new_task.description, "is_complete": is_complete}}, 201)
+
+@tasks_bp.route("", methods=["GET"])
+def all_tasks():
+    title_query = request.args.get('title')
+    order_by_query = request.args.get('sort')
+    if title_query:
+        tasks = Task.query.filter_by(title = title_query)
+    elif order_by_query == 'asc':
+        tasks = Task.query.order_by(Task.title).all()
+
+    elif order_by_query == 'desc':
+        tasks = Task.query.order_by(desc(Task.title)).all()
+    else:
+        tasks = Task.query.order_by(Task.title).all()
+
+    task_response = []
+    for task in tasks:
+        is_complete = task.completed_at != None
+        task_response.append({'id': task.task_id, 'title': task.title, 'description': task.description,'is_complete': is_complete})
+
+    return jsonify(task_response), 200
+
+@tasks_bp.route("/<task_id>", methods=["GET", "PUT", "DELETE", "PATCH"])
+def one_task(task_id):
+    task = Task.query.get(task_id)
+    if task == None:
+        abort(404) 
+    is_complete = task.completed_at != None
+    if request.method == "GET":
+        if task.goal_id:
+            return make_response({"task": {"id": task.task_id,"title": task.title, "description": task.description, "goal_id": task.goal_id, "is_complete": is_complete}}, 200)
+        else:
+            return make_response({"task": {"id": task.task_id, "title": task.title, "description": task.description, "is_complete": is_complete}}, 200)
+    elif request.method == "PUT":
+        form_data = request.get_json()
+        task.title = form_data["title"]
+        task.description = form_data["description"]
+        task.completed_at = task.completed_at
+
+        db.session.commit()
+
+        return make_response({"task": {"id": task.task_id, "title": task.title, "description": task.description, "is_complete": is_complete}}, 200)
+
+    elif request.method == "PATCH":
+        form_data = request.get_json()
+        if "title" in form_data:
+            task.title = form_data["title"]
+        if "description" in form_data:
+            task.description = form_data["description"]
+
+        db.session.commit()
+        return make_response({"task": {"id": task.task_id, "title": task.title, "description": task.description, "is_complete": is_complete}}, 200)
+    elif request.method == "DELETE":
+        db.session.delete(task)
+        db.session.commit()
+        return make_response({'details':f'Task {task.task_id} "{task.title}" successfully deleted'}, 200)
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def task_complete(task_id):
+
+    time_stamp = datetime.now()
+    task = Task.query.get(task_id)
+    if task == None:
+        abort(404) 
+    else:
+        task.completed_at = time_stamp
+    db.session.commit()
+    is_complete = task.completed_at != None
+
+    try:
+        header= {"Authorization"}
+        post_body = requests.post(header)
+    except TypeError:
+        pass
+    return make_response({"task": {"id": task.task_id, "title": task.title, "description": task.description, "is_complete": is_complete}}, 200)
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def task_not_complete(task_id):
+    task = Task.query.get(task_id)
+    if task == None:
+        abort(404) 
+    else:
+        task.completed_at = None
+    db.session.commit()
+    is_complete = task.completed_at != None
+    return make_response({"task": {"id": task.task_id, "title": task.title, "description": task.description, "is_complete": is_complete}}, 200)  
+
+@goals_bp.route("", methods=["POST"])
+def post_goal():
+    request_body = request.get_json()
+    if 'title' not in request_body :
+        return make_response({"details": "Invalid data"}, 400)
+    else:
+        new_goal = Goal(title=request_body["title"])
+
+        db.session.add(new_goal)
+        db.session.commit()
+        return make_response({"goal": {"id": new_goal.goal_id, "title": new_goal.title}}, 201)
+
+@goals_bp.route("", methods=["GET"])
+def all_goals():
+    title_query = request.args.get('title')
+    order_by_query = request.args.get('sort')
+    if title_query:
+        goals = Goal.query.filter_by(title = title_query)
+    elif order_by_query == 'asc':
+        goals = Goal.query.order_by(Goal.title).all()
+    elif order_by_query == 'desc':   
+        goals = Goal.query.order_by(desc(Goal.title)).all()
+    else:
+        goals = Goal.query.order_by(Goal.title).all()
+
+    goal_response = []
+    for goal in goals:
+        goal_response.append({'id': goal.goal_id, 'title': goal.title})
+    return jsonify(goal_response), 200    
+
+@goals_bp.route("/<goal_id>", methods=["GET", "PUT", "DELETE"])
+def one_goal(goal_id):
+    goal = Goal.query.get(goal_id) 
+    if goal == None:
+        abort(404) 
+    if request.method == "GET":
+        return make_response({"goal": {"id": goal.goal_id, "title": goal.title}}, 200)
+    elif request.method == "PUT":
+        form_data = request.get_json()
+        goal.title = form_data["title"]
+        db.session.commit()
+
+        return make_response({"goal": {"id": goal.goal_id, "title": goal.title}}, 200)
+    elif request.method == "DELETE":
+        db.session.delete(goal)
+        db.session.commit()
+        return make_response({'details': 
+        f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}, 200)
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST", "GET"]) 
+def task_and_goal(goal_id):
+    request_body = request.get_json()
+    tasks = Task.query.all()
+    goal = Goal.query.get(goal_id) 
+    if goal == None:
+        abort(404) 
+    if request.method == "POST":
+        for task in tasks:
+            if task.task_id in request_body["task_ids"]:
+                task.goal_id = int(goal_id)
+            db.session.commit()
+        return make_response({"id": int(goal_id), "task_ids": request_body["task_ids"]}, 200)   
+    elif request.method == "GET":
+        goals_tasks = Goal.query.get(goal_id).tasks
+
+        task_response = []
+        for task in goals_tasks:
+            is_complete = task.completed_at != None
+            task_response.append({'id': task.task_id,
+'goal_id': task.goal_id,
+            'title': task.title,
+            'description': task.description,
+            'is_complete': is_complete})
+
+        return make_response({"id": goal.goal_id, "title": goal.title, "tasks": task_response}, 200)

requirements.txt

@@ -1,34 +1,21 @@
-alembic==1.5.4
-attrs==20.3.0
-autopep8==1.5.5
-blinker==1.4
-certifi==2020.12.5
-chardet==4.0.0
-click==7.1.2
-Flask==1.1.2
-Flask-Migrate==2.6.0
-Flask-SQLAlchemy==2.4.4
+alembic==1.8.1
+attrs==21.4.0
+click==8.1.3
+Flask==2.2.2
+Flask-Migrate==4.0.0
+Flask-SQLAlchemy==3.0.2
 gunicorn==20.1.0
-idna==2.10
 iniconfig==1.1.1
-itsdangerous==1.1.0
-Jinja2==2.11.3
-Mako==1.1.4
-MarkupSafe==1.1.1
-packaging==20.9
-pluggy==0.13.1
-psycopg2-binary==2.9.4
-py==1.10.0
-pycodestyle==2.6.0
-pyparsing==2.4.7
+itsdangerous==2.1.2
+Jinja2==3.1.2
+Mako==1.2.3
+MarkupSafe==2.1.1
+packaging==21.3
+pluggy==1.0.0
+py==1.11.0
+pyparsing==3.0.7
 pytest==7.1.1
-pytest-cov==2.12.1
-python-dateutil==2.8.1
-python-dotenv==0.15.0
-python-editor==1.0.4
-requests==2.25.1
-six==1.15.0
-SQLAlchemy==1.3.23
-toml==0.10.2
-urllib3==1.26.5
-Werkzeug==1.0.1
+python-dotenv==0.21.0
+SQLAlchemy==1.4.44
+tomli==2.0.1
+Werkzeug==2.2.2