From 91fd8d2760e896c651ddfca5448812042f1dabea Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Thu, 6 May 2021 10:50:36 -0700
Subject: [PATCH 01/28] completes initial setup

---
 migrations/README         |  1 +
 migrations/alembic.ini    | 45 ++++++++++++++++++
 migrations/env.py         | 96 +++++++++++++++++++++++++++++++++++++++
 migrations/script.py.mako | 24 ++++++++++
 4 files changed, 166 insertions(+)
 create mode 100644 migrations/README
 create mode 100644 migrations/alembic.ini
 create mode 100644 migrations/env.py
 create mode 100644 migrations/script.py.mako

diff --git a/migrations/README b/migrations/README
new file mode 100644
index 000000000..98e4f9c44
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Generic single-database configuration.
\ No newline at end of file
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 000000000..f8ed4801f
--- /dev/null
+++ b/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
diff --git a/migrations/env.py b/migrations/env.py
new file mode 100644
index 000000000..8b3fb3353
--- /dev/null
+++ b/migrations/env.py
@@ -0,0 +1,96 @@
+from __future__ import with_statement
+
+import logging
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+from flask import current_app
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
+target_metadata = current_app.extensions['migrate'].db.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix='sqlalchemy.',
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/migrations/script.py.mako b/migrations/script.py.mako
new file mode 100644
index 000000000..2c0156303
--- /dev/null
+++ b/migrations/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}

From a61ec7774256dc55f7683463c92ed14cb203172e Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Thu, 6 May 2021 11:15:12 -0700
Subject: [PATCH 02/28] updates task.py

---
 app/models/task.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..640e723e2 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,6 +1,18 @@
 from flask import current_app
 from app import db
+from sqlalchemy 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)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable=True)
+
+    def to_json(self):
+        return {
+            "task_id": self.task_id,
+            "title": self.title,
+            "description": self.description,
+            "completed at": self.completed_at
+        }

From e71bdca34797580fc90b5f8adee9f8956484e8df Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Thu, 6 May 2021 11:16:59 -0700
Subject: [PATCH 03/28] runs migrations

---
 migrations/versions/457499966ae6_.py | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 migrations/versions/457499966ae6_.py

diff --git a/migrations/versions/457499966ae6_.py b/migrations/versions/457499966ae6_.py
new file mode 100644
index 000000000..b5def2780
--- /dev/null
+++ b/migrations/versions/457499966ae6_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 457499966ae6
+Revises: 
+Create Date: 2021-05-06 11:07:38.693370
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '457499966ae6'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goal',
+    sa.Column('goal_id', sa.Integer(), nullable=False),
+    sa.PrimaryKeyConstraint('goal_id')
+    )
+    op.create_table('task',
+    sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.String(), nullable=True),
+    sa.Column('description', sa.String(), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('task_id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###

From 3f8ff6ca9a1e68d9d2810f7f19032cdca0327fec Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Thu, 6 May 2021 11:27:05 -0700
Subject: [PATCH 04/28] initializes blueprint registers it in __init__.py

---
 app/__init__.py | 3 +++
 app/routes.py   | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..b476fa781 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -28,7 +28,10 @@ def create_app(test_config=None):
 
     db.init_app(app)
     migrate.init_app(app, db)
+    load_dotenv()
 
     # Register Blueprints here
+    from .routes import tasks_bp
+    app.register_blueprint(tasks_bp)
 
     return app
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..b7ce1e27d 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,7 @@
-from flask import Blueprint
+from flask import Blueprint, request, jsonify
+from app import db
+from flask.helpers import make_response
+from app.models.task import Task
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
 

From 7eadf3cf304efd561b9d81d609e2f66c734def7b Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Sun, 9 May 2021 00:09:55 -0700
Subject: [PATCH 05/28] changes to routes & task class

---
 app/models/task.py |  3 +--
 app/routes.py      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index 640e723e2..2c3220f60 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -13,6 +13,5 @@ def to_json(self):
         return {
             "task_id": self.task_id,
             "title": self.title,
-            "description": self.description,
-            "completed at": self.completed_at
+            "description": self.description
         }
diff --git a/app/routes.py b/app/routes.py
index b7ce1e27d..e95fae4f1 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -5,3 +5,18 @@
 
 tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
 
+@tasks_bp.route("", methods=["POST"], strict_slashes=False)
+def tasks():
+    request_body = request.get_json()
+    new_task = Task(title=request_body["title"],
+                    description=request_body["description"]
+                    )
+    db.session.add(new_task)
+    db.session.commit()
+
+    return{
+        "success": True, 
+        "message": f"A new task : '{new_task.title}' has been successfully created"
+    }
+
+

From 8938edf85744f2badea97bbad0c5189a56cbf283 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Sun, 9 May 2021 00:11:24 -0700
Subject: [PATCH 06/28] adds Procfile file for heroku deployment

---
 Procfile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Procfile

diff --git a/Procfile b/Procfile
new file mode 100644
index 000000000..62e430aca
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: gunicorn 'app:create_app()'
\ No newline at end of file

From b96337916704b773c333811654c0f6a8a54f0466 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Sun, 9 May 2021 17:07:55 -0700
Subject: [PATCH 07/28] changes " to ' in __init__ file & adds comment

---
 app/__init__.py    | 12 ++++++------
 app/models/task.py |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index b476fa781..c901d9f75 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -12,15 +12,15 @@
 
 def create_app(test_config=None):
     app = Flask(__name__)
-    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+    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')
     else:
-        app.config["TESTING"] = True
-        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
-            "SQLALCHEMY_TEST_DATABASE_URI")
+        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
diff --git a/app/models/task.py b/app/models/task.py
index 2c3220f60..baa9198ee 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -9,6 +9,7 @@ class Task(db.Model):
     description = db.Column(db.String)
     completed_at = db.Column(db.DateTime, nullable=True)
 
+    # creates a dictionary of key-value pairs describing the given task
     def to_json(self):
         return {
             "task_id": self.task_id,

From ab16820220167a4f2a9bb2a87c96ebd7ed2a74a4 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Mon, 10 May 2021 16:33:45 -0700
Subject: [PATCH 08/28] refactors GET & POST methods

---
 app/__init__.py |  2 --
 app/routes.py   | 46 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index c901d9f75..8ce4cbecb 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,12 +4,10 @@
 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
diff --git a/app/routes.py b/app/routes.py
index e95fae4f1..625194bc0 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -5,18 +5,40 @@
 
 tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
 
-@tasks_bp.route("", methods=["POST"], strict_slashes=False)
-def tasks():
-    request_body = request.get_json()
-    new_task = Task(title=request_body["title"],
-                    description=request_body["description"]
-                    )
-    db.session.add(new_task)
-    db.session.commit()
+@tasks_bp.route("", methods=["GET","POST"], strict_slashes=False)
+def handle_tasks():
+    if request.method == "POST":
+        # try and except block for KeyError
+        try:
+            request_body = request.get_json()
 
-    return{
-        "success": True, 
-        "message": f"A new task : '{new_task.title}' has been successfully created"
-    }
+            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()
 
+            return {
+                "task": new_task.build_dict()
+            }, 201
+        
+        except KeyError:
+            return{"details": "Invalid data"}, 400
+
+    elif request.method == "GET":
+        task_title_from_url = request.args.get("title")
+        # search for task by title
+        if task_title_from_url:
+            tasks = Task.query.filter_by(title=task_title_from_url)
+        # all tasks
+        else:
+            tasks = Task.query.all()
+    
+            tasks_response = []
+
+            for task in tasks:
+                tasks_response.append(task.to_json())
+    
+            return jsonify(tasks_response), 200

From 4e07c82391cb28e2d55542621f86e656c2bd3f9b Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Mon, 10 May 2021 17:38:10 -0700
Subject: [PATCH 09/28] adds is_complete function & improves "POST" method

---
 app/models/task.py | 11 ++++++++++-
 app/routes.py      |  6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index baa9198ee..1c3913f5e 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -9,10 +9,19 @@ class Task(db.Model):
     description = db.Column(db.String)
     completed_at = db.Column(db.DateTime, nullable=True)
 
+    # populates is_complete value depending on completed_at value
+    def is_complete(self):
+        if self.completed_at == None:
+            return False
+        else:
+            return True
+
     # creates a dictionary of key-value pairs describing the given task
     def to_json(self):
         return {
             "task_id": self.task_id,
             "title": self.title,
-            "description": self.description
+            "description": self.description,
+            "completed_at": self.completed_at,
+            "is_complete": self.is_complete
         }
diff --git a/app/routes.py b/app/routes.py
index 625194bc0..627406d0e 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -21,7 +21,11 @@ def handle_tasks():
             db.session.commit()
 
             return {
-                "task": new_task.build_dict()
+                "task": {
+                    "title": new_task.title,
+                    "description": new_task.description,
+                    "is_complete": new_task.is_complete
+                }
             }, 201
         
         except KeyError:

From aa9d1743bad6c305ad79246ae3735be2b7e0b533 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Mon, 10 May 2021 22:51:39 -0700
Subject: [PATCH 10/28] refactors to_json funciton & moves "GET" logic

---
 app/models/task.py | 12 ++----------
 app/routes.py      | 42 +++++++++++++++++++-----------------------
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index 1c3913f5e..0a3e8d599 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -9,19 +9,11 @@ class Task(db.Model):
     description = db.Column(db.String)
     completed_at = db.Column(db.DateTime, nullable=True)
 
-    # populates is_complete value depending on completed_at value
-    def is_complete(self):
-        if self.completed_at == None:
-            return False
-        else:
-            return True
-
     # creates a dictionary of key-value pairs describing the given task
     def to_json(self):
         return {
-            "task_id": self.task_id,
+            "id": self.task_id,
             "title": self.title,
             "description": self.description,
-            "completed_at": self.completed_at,
-            "is_complete": self.is_complete
+            "is_complete": False if self.completed_at is None else True
         }
diff --git a/app/routes.py b/app/routes.py
index 627406d0e..813b44f1f 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -7,7 +7,23 @@
 
 @tasks_bp.route("", methods=["GET","POST"], strict_slashes=False)
 def handle_tasks():
-    if request.method == "POST":
+    if request.method == "GET":
+        task_title_from_url = request.args.get("title")
+        # search for task by title
+        if task_title_from_url:
+            tasks = Task.query.filter_by(title=task_title_from_url)
+        # all tasks
+        else:
+            tasks = Task.query.all()
+    
+        tasks_response = []
+
+        for task in tasks:
+            tasks_response.append(task.to_json())
+
+        return jsonify(tasks_response), 200
+
+    elif request.method == "POST":
         # try and except block for KeyError
         try:
             request_body = request.get_json()
@@ -21,28 +37,8 @@ def handle_tasks():
             db.session.commit()
 
             return {
-                "task": {
-                    "title": new_task.title,
-                    "description": new_task.description,
-                    "is_complete": new_task.is_complete
-                }
+                "task": new_task.to_json()
             }, 201
         
         except KeyError:
-            return{"details": "Invalid data"}, 400
-
-    elif request.method == "GET":
-        task_title_from_url = request.args.get("title")
-        # search for task by title
-        if task_title_from_url:
-            tasks = Task.query.filter_by(title=task_title_from_url)
-        # all tasks
-        else:
-            tasks = Task.query.all()
-    
-            tasks_response = []
-
-            for task in tasks:
-                tasks_response.append(task.to_json())
-    
-            return jsonify(tasks_response), 200
+            return{"details": "Invalid data"}, 400
\ No newline at end of file

From 14c6110d6d4e579a0bf80eed0c96c744b658ae02 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 00:47:01 -0700
Subject: [PATCH 11/28] sets up route for task_id & creates "GET"

---
 app/routes.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/routes.py b/app/routes.py
index 813b44f1f..560ac98ca 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,10 +1,12 @@
 from flask import Blueprint, request, jsonify
+from werkzeug.wrappers import PlainRequest
 from app import db
 from flask.helpers import make_response
 from app.models.task import Task
 
 tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
 
+# come back and refactor into task_index & independent POST function
 @tasks_bp.route("", methods=["GET","POST"], strict_slashes=False)
 def handle_tasks():
     if request.method == "GET":
@@ -41,4 +43,28 @@ def handle_tasks():
             }, 201
         
         except KeyError:
-            return{"details": "Invalid data"}, 400
\ No newline at end of file
+            return{"details": "Invalid data"}, 400
+
+def is_int(value):
+    try:
+        return int(value)
+    except ValueError:
+        return False
+
+@tasks_bp.route("/<task_id>", methods=["GET"], strict_slashes=False)
+def get_one_task(task_id):
+    if not is_int(task_id):
+        return{
+            "message": f"ID {task_id} must be an integer",
+            "success": False
+        }, 400
+    
+    task = Task.query.get(task_id)
+
+    if task is None:
+        return make_response("", 404)
+    
+    else:
+        return {
+            "task": task.to_json()
+        }, 200
\ No newline at end of file

From 3e89ff4c6393310ad9c93034955bbfde783d36c4 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 01:29:14 -0700
Subject: [PATCH 12/28] adds DELETE logic & adds function comments

---
 app/models/task.py |  2 +-
 app/routes.py      | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index 0a3e8d599..46cf5b7f7 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -16,4 +16,4 @@ def to_json(self):
             "title": self.title,
             "description": self.description,
             "is_complete": False if self.completed_at is None else True
-        }
+        }
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 560ac98ca..432ecea9a 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -51,6 +51,7 @@ def is_int(value):
     except ValueError:
         return False
 
+# Handles GET requests for 1 method with the provided task id. 
 @tasks_bp.route("/<task_id>", methods=["GET"], strict_slashes=False)
 def get_one_task(task_id):
     if not is_int(task_id):
@@ -63,8 +64,26 @@ def get_one_task(task_id):
 
     if task is None:
         return make_response("", 404)
-    
     else:
         return {
             "task": task.to_json()
-        }, 200
\ No newline at end of file
+        }, 200
+
+# @tasks_bp.route("/<task_id>", methods=["PUT"], strict_slashes=False)
+# def update_task():
+
+
+@tasks_bp.route("/<task_id>", methods=["DELETE"], strict_slashes=False)
+def delete_task(task_id):
+
+    task = Task.query.get(task_id)
+
+    if task is None:
+        return make_response("", 404)
+    else:
+        db.session.delete(task)
+        db.session.commit()
+
+        return {
+            "details": f'Task {task.task_id} "{task.title}" successfully deleted'
+        }

From c9cbd2f05efe05f9d254a3b544b5bda99622be2b Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 01:48:47 -0700
Subject: [PATCH 13/28] adds PUT logic & completes Wave 1

---
 app/models/task.py |  9 +++++++++
 app/routes.py      | 21 +++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index 46cf5b7f7..4d22260b6 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -11,6 +11,15 @@ class Task(db.Model):
 
     # creates a dictionary of key-value pairs describing the given task
     def to_json(self):
+        return {
+            "id": self.task_id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": False if self.completed_at is None else True
+        }
+    
+    # base function for task UPDATE calls
+    def update_json(self):
         return {
             "id": self.task_id,
             "title": self.title,
diff --git a/app/routes.py b/app/routes.py
index 432ecea9a..e8f8c60ae 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -69,9 +69,26 @@ def get_one_task(task_id):
             "task": task.to_json()
         }, 200
 
-# @tasks_bp.route("/<task_id>", methods=["PUT"], strict_slashes=False)
-# def update_task():
+@tasks_bp.route("/<task_id>", methods=["PUT"], strict_slashes=False)
+def update_task(task_id):
 
+    task = Task.query.get(task_id)
+
+    if task:
+
+        task_data = request.get_json()
+
+        task.title = task_data["title"]
+        task.description = task_data["description"]
+
+        db.session.commit()
+
+        return{
+            "task": task.update_json()
+        }, 200
+    
+    else:
+        return make_response("", 404)
 
 @tasks_bp.route("/<task_id>", methods=["DELETE"], strict_slashes=False)
 def delete_task(task_id):

From 32c1dbdcada86abe87871d9d766a4830b9d598b8 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 11:39:33 -0700
Subject: [PATCH 14/28] adds sort logic for ascending (by title)

---
 app/__init__.py    | 2 +-
 app/models/task.py | 1 -
 app/routes.py      | 6 +++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 8ce4cbecb..d8fb4340b 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -31,5 +31,5 @@ def create_app(test_config=None):
     # Register Blueprints here
     from .routes import tasks_bp
     app.register_blueprint(tasks_bp)
-
+    
     return app
diff --git a/app/models/task.py b/app/models/task.py
index 4d22260b6..de31d4cfa 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -2,7 +2,6 @@
 from app import db
 from sqlalchemy import DateTime
 
-
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String)
diff --git a/app/routes.py b/app/routes.py
index e8f8c60ae..edcd9c0b3 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -22,7 +22,11 @@ def handle_tasks():
 
         for task in tasks:
             tasks_response.append(task.to_json())
-
+        
+        if "asc" in request.full_path:
+            sorted_ascending = sorted(tasks_response, key=lambda x: x.get("title"))
+            return jsonify(sorted_ascending)
+        
         return jsonify(tasks_response), 200
 
     elif request.method == "POST":

From e07e578a4ec757b76169c051a6632af1c1bb467f Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 11:43:12 -0700
Subject: [PATCH 15/28] adds sort logic for descending (by title)

---
 app/routes.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/routes.py b/app/routes.py
index edcd9c0b3..fc368f5fe 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -27,6 +27,10 @@ def handle_tasks():
             sorted_ascending = sorted(tasks_response, key=lambda x: x.get("title"))
             return jsonify(sorted_ascending)
         
+        elif "desc" in request.full_path:
+            sorted_descending = sorted(tasks_response, key=lambda x: x.get("title"), reverse=True)
+            return jsonify(sorted_descending)
+
         return jsonify(tasks_response), 200
 
     elif request.method == "POST":

From a1852c2b85402666c70a7967ce5604658cfadf10 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 11:58:55 -0700
Subject: [PATCH 16/28] sets up "mark complete" logic for PATCH call

---
 app/routes.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/routes.py b/app/routes.py
index fc368f5fe..a56658155 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -112,3 +112,10 @@ def delete_task(task_id):
         return {
             "details": f'Task {task.task_id} "{task.title}" successfully deleted'
         }
+
+@tasks_bp.route("/<task_id>/marked_complete", methods=["PATCH"], strict_slashes=False)
+def mark_complete(task_id):
+
+    task = Task.query.get(task_id)
+    
+

From 2c3c6f34edce60220bab7f12c88259651f908c09 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 16:17:34 -0700
Subject: [PATCH 17/28] adds mark_complete endpoint logic

---
 app/models/task.py | 10 +---------
 app/routes.py      | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index de31d4cfa..1fdc97339 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -16,12 +16,4 @@ def to_json(self):
             "description": self.description,
             "is_complete": False if self.completed_at is None else True
         }
-    
-    # base function for task UPDATE calls
-    def update_json(self):
-        return {
-            "id": self.task_id,
-            "title": self.title,
-            "description": self.description,
-            "is_complete": False if self.completed_at is None else True
-        }
\ No newline at end of file
+
diff --git a/app/routes.py b/app/routes.py
index a56658155..c0bf6a9c5 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -3,6 +3,7 @@
 from app import db
 from flask.helpers import make_response
 from app.models.task import Task
+from datetime import date
 
 tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
 
@@ -83,7 +84,6 @@ def update_task(task_id):
     task = Task.query.get(task_id)
 
     if task:
-
         task_data = request.get_json()
 
         task.title = task_data["title"]
@@ -92,9 +92,8 @@ def update_task(task_id):
         db.session.commit()
 
         return{
-            "task": task.update_json()
+            "task": task.to_json()
         }, 200
-    
     else:
         return make_response("", 404)
 
@@ -113,9 +112,18 @@ def delete_task(task_id):
             "details": f'Task {task.task_id} "{task.title}" successfully deleted'
         }
 
-@tasks_bp.route("/<task_id>/marked_complete", methods=["PATCH"], strict_slashes=False)
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"], strict_slashes=False)
 def mark_complete(task_id):
 
     task = Task.query.get(task_id)
-    
+
+    if task is None:
+        return make_response("", 404)
+    else:
+        task.completed_at = date.today()
+        db.session.commit()
+
+        return{
+            "task": task.to_json()
+        }, 200
 

From bd3debe0e50addbcc24261dc6b3db504c287a0ad Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 16:29:43 -0700
Subject: [PATCH 18/28] adds "mark incomplete" logic

---
 app/routes.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/routes.py b/app/routes.py
index c0bf6a9c5..bed853d70 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -127,3 +127,18 @@ def mark_complete(task_id):
             "task": task.to_json()
         }, 200
 
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"], strict_slashes=False)
+def mark_incomplete(task_id):
+
+    task= Task.query.get(task_id)
+
+    if task is None:
+        return make_response("", 404)
+    else:
+        task.completed_at = None
+        db.session.commit()
+
+        return {
+            "task": task.to_json()
+        }, 200
\ No newline at end of file

From a0dabbddb52aa7494efea5dac04ae62d382effe1 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Tue, 11 May 2021 21:22:55 -0700
Subject: [PATCH 19/28] adds slack bot function

---
 app/models/task.py |  3 +--
 app/routes.py      | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index 1fdc97339..774076eee 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -15,5 +15,4 @@ def to_json(self):
             "title": self.title,
             "description": self.description,
             "is_complete": False if self.completed_at is None else True
-        }
-
+        }
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index bed853d70..720a34ede 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -4,6 +4,8 @@
 from flask.helpers import make_response
 from app.models.task import Task
 from datetime import date
+import os
+import requests
 
 tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
 
@@ -123,11 +125,12 @@ def mark_complete(task_id):
         task.completed_at = date.today()
         db.session.commit()
 
+        call_slack_bot(task)
+
         return{
             "task": task.to_json()
         }, 200
 
-
 @tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"], strict_slashes=False)
 def mark_incomplete(task_id):
 
@@ -141,4 +144,17 @@ def mark_incomplete(task_id):
 
         return {
             "task": task.to_json()
-        }, 200
\ No newline at end of file
+        }, 200
+
+# separate function that sends a POST request to the slack bot
+def call_slack_bot(task):
+    SLACK_API_TOKEN = os.environ.get('BOT_API_TOKEN')
+    url = "https://slack.com/api/chat.postMessage"
+    payload = {
+        "channel": "task-notifications",
+        "text": f"Someone just completed the task {task.title}"
+    }
+    headers = {
+        "Authorization": f"Bearer {SLACK_API_TOKEN}",
+    }
+    return requests.request("POST", url, data=payload, headers=headers)
\ No newline at end of file

From 99bac133dc9671f51e484a28dad8dd140077180b Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 17:30:31 -0700
Subject: [PATCH 20/28] adds column 'title' to goal and runs migrations

---
 app/models/goal.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..0bdc1731d 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -4,3 +4,4 @@
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)

From 4144db2288eadae8f3dece0e032c751792784518 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 18:22:40 -0700
Subject: [PATCH 21/28] sets up goals blueprint

---
 app/__init__.py    | 3 +++
 app/models/goal.py | 8 +++++++-
 app/routes.py      | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/__init__.py b/app/__init__.py
index d8fb4340b..88bc53503 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -31,5 +31,8 @@ def create_app(test_config=None):
     # Register Blueprints here
     from .routes import tasks_bp
     app.register_blueprint(tasks_bp)
+
+    from .routes import goals_bp
+    app.register_blueprint(goals_bp)
     
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 0bdc1731d..8d313ef89 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,5 +3,11 @@
 
 
 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)
+
+    def goal_json(self):
+        return {
+            "id": self.goal_id,
+            "title": self.title
+        }
diff --git a/app/routes.py b/app/routes.py
index 720a34ede..228615865 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -8,6 +8,7 @@
 import requests
 
 tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
 
 # come back and refactor into task_index & independent POST function
 @tasks_bp.route("", methods=["GET","POST"], strict_slashes=False)

From b1a06c4094a448112beaf39395f3c610ec86be38 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 18:56:56 -0700
Subject: [PATCH 22/28] adds goal routes for POST & GET calls

---
 app/routes.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/app/routes.py b/app/routes.py
index 228615865..6eb428f71 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -3,6 +3,7 @@
 from app import db
 from flask.helpers import make_response
 from app.models.task import Task
+from app.models.goal import Goal
 from datetime import date
 import os
 import requests
@@ -158,4 +159,73 @@ def call_slack_bot(task):
     headers = {
         "Authorization": f"Bearer {SLACK_API_TOKEN}",
     }
-    return requests.request("POST", url, data=payload, headers=headers)
\ No newline at end of file
+    return requests.request("POST", url, data=payload, headers=headers)
+    # 
+    # 
+    # 
+@goals_bp.route("", methods=["GET","POST"], strict_slashes=False)
+def handle_goals():
+    if request.method == "GET":
+        goal_title_from_url = request.args.get("title")
+        # search for task by title
+        if goal_title_from_url:
+            goals = Goal.query.filter_by(title=goal_title_from_url)
+        # all goals
+        else:
+            goals = Goal.query.all()
+    
+        goals_response = []
+
+        for goal in goals:
+            goals_response.append(goal.goal_json())
+        
+        if "asc" in request.full_path:
+            sorted_ascending = sorted(goals_response, key=lambda x: x.get("title"))
+            return jsonify(sorted_ascending)
+        
+        elif "desc" in request.full_path:
+            sorted_descending = sorted(goals_response, key=lambda x: x.get("title"), reverse=True)
+            return jsonify(sorted_descending)
+
+        return jsonify(goals_response), 200
+
+    elif request.method == "POST":
+        # try and except block for KeyError
+        try:
+            request_body = request.get_json()
+
+            new_goal = Goal(title=request_body["title"])
+
+            db.session.add(new_goal)
+            db.session.commit()
+
+            return {
+                "goal": new_goal.goal_json()
+            }, 201
+        
+        except KeyError:
+            return{"details": "Invalid data"}, 400
+
+def is_int(value):
+    try:
+        return int(value)
+    except ValueError:
+        return False
+
+# Handles GET requests for 1 method with the provided task id. 
+@goals_bp.route("/<goal_id>", methods=["GET"], strict_slashes=False)
+def get_one_goal(goal_id):
+    if not is_int(goal_id):
+        return{
+            "message": f"ID {goal_id} must be an integer",
+            "success": False
+        }, 400
+    
+    goal = Goal.query.get(goal_id)
+
+    if goal is None:
+        return make_response("", 404)
+    else:
+        return {
+            "goal": goal.goal_json()
+        }, 200
\ No newline at end of file

From e37df34ad8a90f1fb6dd3cbe6baee9eb55a5d103 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 19:04:23 -0700
Subject: [PATCH 23/28] adds logic for Goal DELETE & PUT calls

---
 app/routes.py | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index 6eb428f71..9e1ba2794 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -160,14 +160,13 @@ def call_slack_bot(task):
         "Authorization": f"Bearer {SLACK_API_TOKEN}",
     }
     return requests.request("POST", url, data=payload, headers=headers)
-    # 
-    # 
-    # 
+
+# wave 5 goal routes
 @goals_bp.route("", methods=["GET","POST"], strict_slashes=False)
 def handle_goals():
     if request.method == "GET":
         goal_title_from_url = request.args.get("title")
-        # search for task by title
+        # search for goal by title
         if goal_title_from_url:
             goals = Goal.query.filter_by(title=goal_title_from_url)
         # all goals
@@ -212,7 +211,7 @@ def is_int(value):
     except ValueError:
         return False
 
-# Handles GET requests for 1 method with the provided task id. 
+# Handles GET requests for 1 method with the provided goal id. 
 @goals_bp.route("/<goal_id>", methods=["GET"], strict_slashes=False)
 def get_one_goal(goal_id):
     if not is_int(goal_id):
@@ -228,4 +227,37 @@ def get_one_goal(goal_id):
     else:
         return {
             "goal": goal.goal_json()
-        }, 200
\ No newline at end of file
+        }, 200
+
+@goals_bp.route("/<goal_id>", methods=["PUT"], strict_slashes=False)
+def update_goal(goal_id):
+
+    goal = Goal.query.get(goal_id)
+
+    if goal:
+        goal_data = request.get_json()
+
+        goal.title = goal_data["title"]
+
+        db.session.commit()
+
+        return{
+            "goal": goal.goal_json()
+        }, 200
+    else:
+        return make_response("", 404)
+
+@goals_bp.route("/<goal_id>", methods=["DELETE"], strict_slashes=False)
+def delete_goal(goal_id):
+
+    goal = Goal.query.get(goal_id)
+
+    if goal is None:
+        return make_response("", 404)
+    else:
+        db.session.delete(goal)
+        db.session.commit()
+
+        return {
+            "details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'
+        }
\ No newline at end of file

From 0f42ef8285e97c1dffb160dca4a21a2ab25e6f04 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 21:01:07 -0700
Subject: [PATCH 24/28] sets up one-to-many relationship btw Goal & Task

---
 app/models/goal.py | 2 ++
 app/models/task.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/models/goal.py b/app/models/goal.py
index 8d313ef89..3705277dd 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,10 +1,12 @@
 from flask import current_app
+from sqlalchemy.orm import backref
 from app import db
 
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String)
+    task = db.relationship('Task', backref='goaltask', lazy=True)
 
     def goal_json(self):
         return {
diff --git a/app/models/task.py b/app/models/task.py
index 774076eee..5b87c5736 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,12 +1,14 @@
 from flask import current_app
 from app import db
 from sqlalchemy import DateTime
+from app.models.goal import Goal
 
 class Task(db.Model):
     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)
+    goaltask_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'))
 
     # creates a dictionary of key-value pairs describing the given task
     def to_json(self):

From eb303bdffc49642d414e35ef71f505ff1e2fec93 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 22:28:29 -0700
Subject: [PATCH 25/28] POST logic for "/<goal_id>/tasks" endpoint

---
 app/models/goal.py |  3 +--
 app/models/task.py |  2 +-
 app/routes.py      | 28 +++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/models/goal.py b/app/models/goal.py
index 3705277dd..945adcb0a 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,11 +2,10 @@
 from sqlalchemy.orm import backref
 from app import db
 
-
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String)
-    task = db.relationship('Task', backref='goaltask', lazy=True)
+    tasks = db.relationship('Task', backref='goaltask', lazy=True)
 
     def goal_json(self):
         return {
diff --git a/app/models/task.py b/app/models/task.py
index 5b87c5736..34269232c 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -8,7 +8,7 @@ class Task(db.Model):
     title = db.Column(db.String)
     description = db.Column(db.String)
     completed_at = db.Column(db.DateTime, nullable=True)
-    goaltask_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'))
+    goaltask_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
 
     # creates a dictionary of key-value pairs describing the given task
     def to_json(self):
diff --git a/app/routes.py b/app/routes.py
index 9e1ba2794..22978903a 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -260,4 +260,30 @@ def delete_goal(goal_id):
 
         return {
             "details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'
-        }
\ No newline at end of file
+        }
+# wave 6
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"], strict_slashes=False)
+def post_goal_tasks(goal_id):
+    # gets the passed in information and gives it in json format
+    request_body = request.get_json()
+    # gets the goal that is associated with the given goal_id
+    goal = Goal.query.get(goal_id)
+
+    # if no goal with the provided goal_id, returns a 404 error
+    if not goal:
+        return make_response("", 404)
+    else:
+        # iterates through the values for the "task_id" keys in request_body
+        for task_id in request_body["task_ids"]:
+            # in each iteration, gets the task that corresponds to the current task_id
+            task = Task.query.get(task_id)
+            # sets the value in the goaltask_id foreignkey column (in task table) to the corresponding goal_id
+            task.goaltask_id = goal_id
+            # commits the addition to the table to the database
+            db.session.commit()
+    # when a POST request is sent, return this in the response body
+    return {
+        "id": goal.goal_id,
+        "task_ids": request_body["task_ids"]
+    }
+

From bba404f1883ac662d9c8c6affb1fb29115498997 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 23:14:14 -0700
Subject: [PATCH 26/28] adds GET logic for one-to-many relationship

---
 app/routes.py | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index 22978903a..043768147 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -8,9 +8,12 @@
 import os
 import requests
 
+# sets up blueprints - with details
 tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
 goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
 
+# 
+# Wave 1: GET & POST functions - gets data for all tasks in table, and creates new tasks
 # come back and refactor into task_index & independent POST function
 @tasks_bp.route("", methods=["GET","POST"], strict_slashes=False)
 def handle_tasks():
@@ -27,7 +30,8 @@ def handle_tasks():
 
         for task in tasks:
             tasks_response.append(task.to_json())
-        
+
+        # Wave 2 ascending/descending logic for GET method
         if "asc" in request.full_path:
             sorted_ascending = sorted(tasks_response, key=lambda x: x.get("title"))
             return jsonify(sorted_ascending)
@@ -58,13 +62,14 @@ def handle_tasks():
         except KeyError:
             return{"details": "Invalid data"}, 400
 
+# helper function that will eventually check for task_ids being integers
 def is_int(value):
     try:
         return int(value)
     except ValueError:
         return False
 
-# Handles GET requests for 1 method with the provided task id. 
+# GET function - gets the data for the task with the specified task_id
 @tasks_bp.route("/<task_id>", methods=["GET"], strict_slashes=False)
 def get_one_task(task_id):
     if not is_int(task_id):
@@ -81,7 +86,8 @@ def get_one_task(task_id):
         return {
             "task": task.to_json()
         }, 200
-
+# PUT function - Updates either/or both title & description data 
+# for specified task (via task_id)
 @tasks_bp.route("/<task_id>", methods=["PUT"], strict_slashes=False)
 def update_task(task_id):
 
@@ -101,6 +107,7 @@ def update_task(task_id):
     else:
         return make_response("", 404)
 
+# DELETE function - deletes specified task (via task_id)
 @tasks_bp.route("/<task_id>", methods=["DELETE"], strict_slashes=False)
 def delete_task(task_id):
 
@@ -116,6 +123,7 @@ def delete_task(task_id):
             "details": f'Task {task.task_id} "{task.title}" successfully deleted'
         }
 
+# PATCH function - mark complete (includes call_slack_bot helper funciton)
 @tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"], strict_slashes=False)
 def mark_complete(task_id):
 
@@ -133,6 +141,7 @@ def mark_complete(task_id):
             "task": task.to_json()
         }, 200
 
+# PATCH function - mark_incomplete
 @tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"], strict_slashes=False)
 def mark_incomplete(task_id):
 
@@ -148,7 +157,7 @@ def mark_incomplete(task_id):
             "task": task.to_json()
         }, 200
 
-# separate function that sends a POST request to the slack bot
+# Wave 4: separate function that sends a POST request to the slack bot
 def call_slack_bot(task):
     SLACK_API_TOKEN = os.environ.get('BOT_API_TOKEN')
     url = "https://slack.com/api/chat.postMessage"
@@ -162,6 +171,7 @@ def call_slack_bot(task):
     return requests.request("POST", url, data=payload, headers=headers)
 
 # wave 5 goal routes
+# refactor into separate GET & POST functions
 @goals_bp.route("", methods=["GET","POST"], strict_slashes=False)
 def handle_goals():
     if request.method == "GET":
@@ -178,6 +188,7 @@ def handle_goals():
         for goal in goals:
             goals_response.append(goal.goal_json())
         
+        # implements Wave 2 ascending/descending sort logic
         if "asc" in request.full_path:
             sorted_ascending = sorted(goals_response, key=lambda x: x.get("title"))
             return jsonify(sorted_ascending)
@@ -262,6 +273,7 @@ def delete_goal(goal_id):
             "details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'
         }
 # wave 6
+# POST function: one(goal)-to-many(tasks) relationship
 @goals_bp.route("/<goal_id>/tasks", methods=["POST"], strict_slashes=False)
 def post_goal_tasks(goal_id):
     # gets the passed in information and gives it in json format
@@ -287,3 +299,31 @@ def post_goal_tasks(goal_id):
         "task_ids": request_body["task_ids"]
     }
 
+# GET function: one(goal)-to-many(tasks)
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"], strict_slashes=False)
+def get_goal_tasks(goal_id):
+    request_body = request.get_json()
+    goal = Goal.query.get(goal_id)
+    # sets task variable equal to the task with the corresponding goal (in foreignkey column)
+    task = Task.query.get(goal_id)
+
+    # if goal doesn't exist, return a 404 error
+    if not goal:
+        return make_response("", 404)
+    else:
+        # sets outer dictionary (named response_dict) to dictionary created in Goal
+        response_dict = goal.goal_json()
+        # if there are no tasks associated with the goal, sets "tasks" equal to empty list
+        if task == None:
+            response_dict["tasks"] = []
+        else:
+            # if task(s) associated with goal, return the task.json() 
+            # data pulled from Task function
+            task_data_dict = task.to_json()
+            # sets response_dict "tasks"  & task_data_dict "goal_id" values
+            response_dict["tasks"] = [response_dict]
+            task_data_dict["goal_id"] = goal.goal_id
+        
+        # commit changes to tables
+        db.session.commit()
+        return make_response(response_dict, 200)
\ No newline at end of file

From abad9e9acbc673508afc66b963076514e3b212a9 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Wed, 12 May 2021 23:37:45 -0700
Subject: [PATCH 27/28] adds conditional for to_json Task function

---
 app/models/goal.py                   |  2 +-
 app/models/task.py                   | 22 +++++++++++-----
 app/routes.py                        |  5 ++--
 migrations/versions/457499966ae6_.py | 39 ----------------------------
 4 files changed, 19 insertions(+), 49 deletions(-)
 delete mode 100644 migrations/versions/457499966ae6_.py

diff --git a/app/models/goal.py b/app/models/goal.py
index 945adcb0a..3d701a956 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -5,7 +5,7 @@
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String)
-    tasks = db.relationship('Task', backref='goaltask', lazy=True)
+    tasks = db.relationship('Tasks', backref='goaltask', lazy=True)
 
     def goal_json(self):
         return {
diff --git a/app/models/task.py b/app/models/task.py
index 34269232c..27b2415c4 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -12,9 +12,19 @@ class Task(db.Model):
 
     # creates a dictionary of key-value pairs describing the given task
     def to_json(self):
-        return {
-            "id": self.task_id,
-            "title": self.title,
-            "description": self.description,
-            "is_complete": False if self.completed_at is None else True
-        }
\ No newline at end of file
+        # Wave 6: need to create a conditional for "goal_id"
+        if self.goaltask_id == None:
+            return {
+                "id": self.task_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": False if self.completed_at is None else True
+            }
+        else:
+            return{
+                "id": self.task_id,
+                "goal_id": self.goaltask_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": False if self.completed_at is None else True
+            }
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 043768147..bb355c746 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -302,7 +302,6 @@ def post_goal_tasks(goal_id):
 # GET function: one(goal)-to-many(tasks)
 @goals_bp.route("/<goal_id>/tasks", methods=["GET"], strict_slashes=False)
 def get_goal_tasks(goal_id):
-    request_body = request.get_json()
     goal = Goal.query.get(goal_id)
     # sets task variable equal to the task with the corresponding goal (in foreignkey column)
     task = Task.query.get(goal_id)
@@ -321,9 +320,9 @@ def get_goal_tasks(goal_id):
             # data pulled from Task function
             task_data_dict = task.to_json()
             # sets response_dict "tasks"  & task_data_dict "goal_id" values
-            response_dict["tasks"] = [response_dict]
+            
             task_data_dict["goal_id"] = goal.goal_id
-        
+            response_dict["tasks"] = [task_data_dict]
         # commit changes to tables
         db.session.commit()
         return make_response(response_dict, 200)
\ No newline at end of file
diff --git a/migrations/versions/457499966ae6_.py b/migrations/versions/457499966ae6_.py
deleted file mode 100644
index b5def2780..000000000
--- a/migrations/versions/457499966ae6_.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""empty message
-
-Revision ID: 457499966ae6
-Revises: 
-Create Date: 2021-05-06 11:07:38.693370
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '457499966ae6'
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('goal',
-    sa.Column('goal_id', sa.Integer(), nullable=False),
-    sa.PrimaryKeyConstraint('goal_id')
-    )
-    op.create_table('task',
-    sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('title', sa.String(), nullable=True),
-    sa.Column('description', sa.String(), nullable=True),
-    sa.Column('completed_at', sa.DateTime(), nullable=True),
-    sa.PrimaryKeyConstraint('task_id')
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('task')
-    op.drop_table('goal')
-    # ### end Alembic commands ###

From 67bf8157576a7f02ff9f40be170fb26b8c845a03 Mon Sep 17 00:00:00 2001
From: Nyckolle Lucuab <66242273+NLucuab@users.noreply.github.com>
Date: Thu, 13 May 2021 00:23:15 -0700
Subject: [PATCH 28/28] fixes typo that was causing mapper error

---
 app/models/goal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/goal.py b/app/models/goal.py
index 3d701a956..945adcb0a 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -5,7 +5,7 @@
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String)
-    tasks = db.relationship('Tasks', backref='goaltask', lazy=True)
+    tasks = db.relationship('Task', backref='goaltask', lazy=True)
 
     def goal_json(self):
         return {