From ef2d89f96348a47cff82d47703f81a4813a74d2a Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Sat, 30 Oct 2021 12:44:33 -0700
Subject: [PATCH 01/11] test wave 01 and test wave 02 passed

---
 app/__init__.py                               |  3 +
 app/models/task.py                            | 18 +++-
 app/routes.py                                 | 66 ++++++++++++-
 migrations/README                             |  1 +
 migrations/alembic.ini                        | 45 +++++++++
 migrations/env.py                             | 96 +++++++++++++++++++
 migrations/script.py.mako                     | 24 +++++
 .../versions/72edc3bd24fa_adds_task_model.py  | 39 ++++++++
 8 files changed, 290 insertions(+), 2 deletions(-)
 create mode 100644 migrations/README
 create mode 100644 migrations/alembic.ini
 create mode 100644 migrations/env.py
 create mode 100644 migrations/script.py.mako
 create mode 100644 migrations/versions/72edc3bd24fa_adds_task_model.py

diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..89ed691aa 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -28,6 +28,9 @@ def create_app(test_config=None):
 
     db.init_app(app)
     migrate.init_app(app, db)
+    
+    from .routes import tasks_bp
+    app.register_blueprint(tasks_bp)
 
     # Register Blueprints here
 
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..7f431907f 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -3,4 +3,20 @@
 
 
 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, nullable = True)
+    
+    def check_for_completed_task(self):
+        if self.completed_at:
+            return True
+        return False 
+    
+    def to_dict(self):
+        
+        return {"id":self.id,
+                "title":self.title,
+                "description":self.description,
+                "is_complete":self.check_for_completed_task()  
+        }
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..987693172 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,66 @@
-from flask import Blueprint
+from app import db
+from app.models.task import Task
+from flask import Blueprint, jsonify,request, make_response, abort
+from datetime import date
 
+tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
+def valid_int(number,parameter_type):
+    try:
+        int(number)
+    except:
+        abort(make_response({"error":f"{parameter_type} must be an int"}, 400))
+        
+@tasks_bp.route("",methods=["GET"])
+def handle_tasks():
+    sort_query = request.args.get("sort")
+    if sort_query == "asc":
+        tasks = Task.query.order_by(Task.title.asc())
+    elif sort_query == "desc":
+        tasks = Task.query.order_by(Task.title.desc())
+    else:
+        tasks = Task.query.all()
+    tasks_response =[]
+    for task in tasks:
+        tasks_response.append(task.to_dict())
+    return jsonify(tasks_response),200
+
+@tasks_bp.route("/<task_id>",methods=["GET","put","DELETE"])
+def get_task(task_id):
+    valid_int(task_id, "task_id")
+    task = Task.query.get_or_404(task_id)
+    
+    if request.method == "GET":
+        return jsonify({"task":task.to_dict()}),200
+    elif request.method == "PUT":
+        request_body = request.get_json()
+        if "title" in request_body:
+            task.title = request_body["title"],
+        if "description" in request_body:
+            task.description = request_body["description"]
+        if "completed_at" in request_body:
+            task.completed_at = request_body["completed_at"]
+        db.session.commit()
+        return jsonify({"task":task.to_dict()}),200
+    elif request.method == "DELETE":
+        db.session.delete(task)
+        db.session.commit()
+        return jsonify({"details":f'Task {task_id} "{task.title}" successfully deleted'}),200
+
+@tasks_bp.route("",methods=["POST"])
+def create_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 jsonify({'details': "Invalid data"}),400
+    
+    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 jsonify({"task":new_task.to_dict()}),201
+    
+
+    
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"}
diff --git a/migrations/versions/72edc3bd24fa_adds_task_model.py b/migrations/versions/72edc3bd24fa_adds_task_model.py
new file mode 100644
index 000000000..e125d36ed
--- /dev/null
+++ b/migrations/versions/72edc3bd24fa_adds_task_model.py
@@ -0,0 +1,39 @@
+"""adds Task model
+
+Revision ID: 72edc3bd24fa
+Revises: 
+Create Date: 2021-10-30 11:51:30.901280
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '72edc3bd24fa'
+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('id', sa.Integer(), 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('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 12ae94715150c868e83a91673aa7ed92a35cb70d Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Sat, 30 Oct 2021 12:54:54 -0700
Subject: [PATCH 02/11] test wave 03 passed

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

diff --git a/app/routes.py b/app/routes.py
index 987693172..02ada1ebf 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -61,6 +61,21 @@ def create_task():
     db.session.add(new_task)
     db.session.commit()
     return jsonify({"task":new_task.to_dict()}),201
-    
+
+@tasks_bp.route("/<task_id>/mark_complete",methods=["PATCH"])
+def mark_complete_task(task_id):
+    valid_int(task_id, "task_id")
+    task = Task.query.get_or_404(task_id)
+    task.completed_at = date.today()
+    db.session.commit()
+    return jsonify({"task":task.to_dict()}),200
+
+@tasks_bp.route("/<task_id>/mark_incomplete",methods=["PATCH"])
+def mark_incomplete_task(task_id):
+    valid_int(task_id, "task_id")
+    task = Task.query.get_or_404(task_id)
+    task.completed_at = None 
+    db.session.commit()
+    return jsonify({"task":task.to_dict()}),200     
 
     

From 77555c6669689ec0e743b8131d6845643485d9bb Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Tue, 2 Nov 2021 09:48:35 -0700
Subject: [PATCH 03/11] adds goal model and POST routecreated

---
 app/__init__.py                               |  3 +++
 app/models/goal.py                            |  8 +++++++-
 app/play_tester.py                            |  9 +++++++++
 app/routes.py                                 | 19 +++++++++++++++++--
 ...fa_adds_task_model.py => ab57bec98a23_.py} | 13 +++++++------
 5 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 app/play_tester.py
 rename migrations/versions/{72edc3bd24fa_adds_task_model.py => ab57bec98a23_.py} (74%)

diff --git a/app/__init__.py b/app/__init__.py
index 89ed691aa..6e0611d78 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -31,6 +31,9 @@ def create_app(test_config=None):
     
     from .routes import tasks_bp
     app.register_blueprint(tasks_bp)
+    
+    from .routes import goals_bp
+    app.register_blueprint(goals_bp)
 
     # Register Blueprints here
 
diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..583810d95 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,4 +3,10 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String)
+
+    def to_dict(self):
+        return {"id":self.id,
+                "title":self.title
+                }
\ No newline at end of file
diff --git a/app/play_tester.py b/app/play_tester.py
new file mode 100644
index 000000000..976d5ed1e
--- /dev/null
+++ b/app/play_tester.py
@@ -0,0 +1,9 @@
+from app import db
+from app.models.task import Task
+from flask import Blueprint, jsonify,request, make_response
+from datetime import datetime
+import slack
+import os
+
+client = slack.webclient(token=os.environ['OAUTH_TOKENS'])
+tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 02ada1ebf..f97260f45 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -2,13 +2,14 @@
 from app.models.task import Task
 from flask import Blueprint, jsonify,request, make_response, abort
 from datetime import date
+from app.models.goal import Goal
 
 tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
 def valid_int(number,parameter_type):
     try:
         int(number)
     except:
-        abort(make_response({"error":f"{parameter_type} must be an int"}, 400))
+        abort(make_response({"error":f"{parameter_type} must be an int"},400))
         
 @tasks_bp.route("",methods=["GET"])
 def handle_tasks():
@@ -34,7 +35,7 @@ def get_task(task_id):
     elif request.method == "PUT":
         request_body = request.get_json()
         if "title" in request_body:
-            task.title = request_body["title"],
+            task.title = request_body["title"]
         if "description" in request_body:
             task.description = request_body["description"]
         if "completed_at" in request_body:
@@ -78,4 +79,18 @@ def mark_incomplete_task(task_id):
     db.session.commit()
     return jsonify({"task":task.to_dict()}),200     
 
+
+
+goals_bp = Blueprint("goals", __name__,url_prefix="/goals")
+
+@goals_bp.route("", methods=["POST"])
+def create_goal():
+    request_body = request.get_json()
+    if "title" not in request_body:
+        return jsonify({'details': "Invalid data"}),400
+    new_goal = Goal(title = request_body["title"])
+    db.session.add(new_goal)
+    db.session.commit()
+    return jsonify({"goal":new_goal.to_dict()}),201
+    
     
diff --git a/migrations/versions/72edc3bd24fa_adds_task_model.py b/migrations/versions/ab57bec98a23_.py
similarity index 74%
rename from migrations/versions/72edc3bd24fa_adds_task_model.py
rename to migrations/versions/ab57bec98a23_.py
index e125d36ed..1b557bbfb 100644
--- a/migrations/versions/72edc3bd24fa_adds_task_model.py
+++ b/migrations/versions/ab57bec98a23_.py
@@ -1,8 +1,8 @@
-"""adds Task model
+"""empty message
 
-Revision ID: 72edc3bd24fa
+Revision ID: ab57bec98a23
 Revises: 
-Create Date: 2021-10-30 11:51:30.901280
+Create Date: 2021-11-02 09:42:14.769017
 
 """
 from alembic import op
@@ -10,7 +10,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision = '72edc3bd24fa'
+revision = 'ab57bec98a23'
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -19,8 +19,9 @@
 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')
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
     )
     op.create_table('task',
     sa.Column('id', sa.Integer(), nullable=False),

From c4ea2816bc11a31d124e02c7ac5ae7d1bf441d1e Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Tue, 2 Nov 2021 21:33:33 -0700
Subject: [PATCH 04/11] test wave 05 passed

---
 app/models/goal.py                   | 20 +++++++--
 app/models/task.py                   | 19 +++++---
 app/play_tester.py                   | 20 ++++++++-
 app/routes.py                        | 35 +++++++++++++++
 migrations/versions/8424eb27fd71_.py | 30 +++++++++++++
 tests/test_wave_05.py                | 67 ++++++++++++++++------------
 6 files changed, 152 insertions(+), 39 deletions(-)
 create mode 100644 migrations/versions/8424eb27fd71_.py

diff --git a/app/models/goal.py b/app/models/goal.py
index 583810d95..e0e45242a 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,11 +2,25 @@
 from app import db
 
 
+
 class Goal(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String)
+    tasks = db.relationship("Task",backref="goal", lazy=True)
+
+    
+    def list_of_task_id(self):
+        task_ids =[task.id for task in self.tasks]
+        return task_ids
 
     def to_dict(self):
-        return {"id":self.id,
-                "title":self.title
-                }
\ No newline at end of file
+        if self.list_of_task_id():
+            
+            return {"id":self.id,
+                    "title":self.title,
+                    "task_ids":self.list_of_task_id() 
+                    }
+        else:
+            return {"id":self.id,
+                    "title":self.title,
+                    }
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 7f431907f..0de188add 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -7,6 +7,7 @@ class Task(db.Model):
     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.id'))
     
     def check_for_completed_task(self):
         if self.completed_at:
@@ -14,9 +15,17 @@ def check_for_completed_task(self):
         return False 
     
     def to_dict(self):
+        if self.goal_id is None:
         
-        return {"id":self.id,
-                "title":self.title,
-                "description":self.description,
-                "is_complete":self.check_for_completed_task()  
-        }
+            return {"id":self.id,
+                    "title":self.title,
+                    "description":self.description,
+                    "is_complete":self.check_for_completed_task()
+            }
+        else:
+            return {"id":self.id,
+                    "title":self.title,
+                    "description":self.description,
+                    "is_complete":self.check_for_completed_task(),
+                    "goal_id": self.goal_id  
+            }
diff --git a/app/play_tester.py b/app/play_tester.py
index 976d5ed1e..930680fbf 100644
--- a/app/play_tester.py
+++ b/app/play_tester.py
@@ -1,9 +1,25 @@
 from app import db
 from app.models.task import Task
+from app.models.goal import Goal
 from flask import Blueprint, jsonify,request, make_response
 from datetime import datetime
 import slack
 import os
+from tests import test_wave_06
 
-client = slack.webclient(token=os.environ['OAUTH_TOKENS'])
-tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
\ No newline at end of file
+# client = slack.webclient(token=os.environ['OAUTH_TOKENS'])
+# tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__,url_prefix="/goals")
+@goals_bp.route("/goals/1/tasks", methods=["POST"])
+def create_goal(goal_id):
+    request_body = request.get_json()
+    print(request_body)
+    # tasks = Task.query.filter_by(Task.goal_id ==1)
+   
+    goal = Goal.query.get(goal_id)
+    new_task = Task(id = request_body["id"],
+                    task_ids = request_body['task_ids']
+                    )
+    db.session.add(new_task)
+    db.session.commit()
+    return jsonify({"goal":new_goal.to_dict()}),201
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index f97260f45..5fb427948 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -93,4 +93,39 @@ def create_goal():
     db.session.commit()
     return jsonify({"goal":new_goal.to_dict()}),201
     
+@goals_bp.route("", methods=["GET"])
+def handle_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", "PUT","DELETE"])
+def get_goal(goal_id):
+    valid_int(goal_id,"goal_id")
+    goal = Goal.query.get_or_404(goal_id)
     
+    if request.method == "GET":
+        return jsonify({"goal":goal.to_dict()}),200
+    elif request.method == "DELETE":
+        db.session.delete(goal)
+        db.session.commit()
+        return jsonify({"details":f"Goal {goal_id} \"{goal.title}\" successfully deleted"})
+    elif request.method == "PUT":
+        request_body = request.get_json()
+        goal.title = request_body["title"]
+        db.session.commit()
+        return jsonify({"goal":goal.to_dict()}),200
+    
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def post_task_ids_to_goal(goal_id):
+    request_body = request.get_json()
+    
+    goal = Goal.query.get(goal_id)
+    task_ids = request_body["task_ids"]
+    for task_id in task_ids:
+        task = Task.query.get(task_id)
+        goal.tasks.append(task)
+        db.session.commit()
+    return jsonify({"id":goal.id, "task_ids": [task.id for task in goal.tasks]}),200   
\ No newline at end of file
diff --git a/migrations/versions/8424eb27fd71_.py b/migrations/versions/8424eb27fd71_.py
new file mode 100644
index 000000000..fa609a5bb
--- /dev/null
+++ b/migrations/versions/8424eb27fd71_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 8424eb27fd71
+Revises: ab57bec98a23
+Create Date: 2021-11-02 15:27:37.873070
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8424eb27fd71'
+down_revision = 'ab57bec98a23'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['id'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'task', type_='foreignkey')
+    op.drop_column('task', 'goal_id')
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 6ba60c6fa..4b3dffd00 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,4 +1,5 @@
 import pytest
+from app.models.goal import Goal
 
 def test_get_goals_no_saved_goals(client):
     # Act
@@ -41,18 +42,17 @@ def test_get_goal(client, one_goal):
         }
     }
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_get_goal_not_found(client):
-    pass
+    
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
 
     # Assert
-    # ---- Complete Test ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Test ----
+    assert response.status_code ==404
+    assert response_body == None
+    
 
 def test_create_goal(client):
     # Act
@@ -71,30 +71,37 @@ def test_create_goal(client):
         }
     }
 
-@pytest.mark.skip(reason="test to be completed by student")
+
 def test_update_goal(client, one_goal):
-    pass
+    
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1",json={
+        "title": "complete my project successfully"
+    })
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- Complete Assertions Here ----
-
-@pytest.mark.skip(reason="test to be completed by student")
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert response_body =={
+        "goal":{"id": 1,
+            "title": "complete my project successfully"}
+    }
+    goal = Goal.query.get(1)
+    assert goal.title == "complete my project successfully"
+    
 def test_update_goal_not_found(client):
-    pass
+    
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "complete my project successfully"
+    })
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 404
+    assert response_body == None
+    
 
 
 def test_delete_goal(client, one_goal):
@@ -113,18 +120,20 @@ def test_delete_goal(client, one_goal):
     response = client.get("/goals/1")
     assert response.status_code == 404
 
-@pytest.mark.skip(reason="test to be completed by student")
+
 def test_delete_goal_not_found(client):
-    pass
+    
 
     # Act
-    # ---- Complete Act Here ----
+    response = client.delete("/goals/1")
+    response_body = response.get_json()
+    
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 404
+    assert Goal.query.all() == []
+    assert response_body == None
+    
 
 
 def test_create_goal_missing_title(client):

From 348a86bc89fddba0b8ec75d5c8c5ad4be74ec567 Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Wed, 3 Nov 2021 22:27:07 -0700
Subject: [PATCH 05/11] test wave 06 passed

---
 app/__init__.py    |  3 +++
 app/models/goal.py | 10 +++++++++-
 app/models/task.py | 18 ++++++++++++++++++
 app/play_tester.py | 39 ++++++++++++++++++---------------------
 app/routes.py      | 20 +++++++++++++++++++-
 5 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 6e0611d78..72dd972a7 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -3,6 +3,9 @@
 from flask_migrate import Migrate
 import os
 from dotenv import load_dotenv
+import slack
+from slack import WebClient
+import logging
 
 
 db = SQLAlchemy()
diff --git a/app/models/goal.py b/app/models/goal.py
index e0e45242a..e9c02bdf7 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -23,4 +23,12 @@ def to_dict(self):
         else:
             return {"id":self.id,
                     "title":self.title,
-                    }
\ No newline at end of file
+                    }
+    def task_lists(self):
+        list=[]
+        for task in self.tasks:
+            list.append(task.to_dict())
+        return list
+            
+            
+            
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 0de188add..ca44641e0 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,11 @@
 from flask import current_app
 from app import db
+import slack
+import os
+from dotenv import load_dotenv
+from slack import WebClient
+from slack.errors import SlackApiError
+
 
 
 class Task(db.Model):
@@ -29,3 +35,15 @@ def to_dict(self):
                     "is_complete":self.check_for_completed_task(),
                     "goal_id": self.goal_id  
             }
+    def slack_notification(self):
+        if self.completed_at:
+            load_dotenv()
+            slack_token = os.environ["SLACK_TOKENS"]
+            client = WebClient(token=slack_token)
+            try:
+                response = client.chat_postMessage(
+                    channel ="CNEEJDLAW",
+                    text = "Task completed"
+                )
+            except SlackApiError as e:
+                return jsonify({"Error": "chanel not found"})
diff --git a/app/play_tester.py b/app/play_tester.py
index 930680fbf..bfdf36dd3 100644
--- a/app/play_tester.py
+++ b/app/play_tester.py
@@ -1,25 +1,22 @@
-from app import db
-from app.models.task import Task
-from app.models.goal import Goal
 from flask import Blueprint, jsonify,request, make_response
-from datetime import datetime
 import slack
 import os
-from tests import test_wave_06
+from dotenv import load_dotenv
+import logging
+# logging.basicConfig(level=logging.DEBUG)
+from slack import WebClient
+from slack.errors import SlackApiError
 
-# client = slack.webclient(token=os.environ['OAUTH_TOKENS'])
-# tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
-goals_bp = Blueprint("goals", __name__,url_prefix="/goals")
-@goals_bp.route("/goals/1/tasks", methods=["POST"])
-def create_goal(goal_id):
-    request_body = request.get_json()
-    print(request_body)
-    # tasks = Task.query.filter_by(Task.goal_id ==1)
-   
-    goal = Goal.query.get(goal_id)
-    new_task = Task(id = request_body["id"],
-                    task_ids = request_body['task_ids']
-                    )
-    db.session.add(new_task)
-    db.session.commit()
-    return jsonify({"goal":new_goal.to_dict()}),201
\ No newline at end of file
+# client = slack.Webclient(token=os.environ['SLACK_TOKENS'])
+# client.chat_postmessage(channel=yourchannel, text="Task completed")
+
+def slack_notification():
+    slack_token = os.environ["SLACK_TOKENS"]
+    client = WebClient(token=slack_token)
+    try:
+        response = client.chat_postMessage(
+            channel ="CNEEJDLAW",
+            text = "Task completed"
+        )
+    except SlackApiError as e:
+        return jsonify({"Error": "chanel not found"})
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 5fb427948..a869f4f9b 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -3,6 +3,11 @@
 from flask import Blueprint, jsonify,request, make_response, abort
 from datetime import date
 from app.models.goal import Goal
+import slack
+import os
+from dotenv import load_dotenv
+from slack import WebClient
+from slack.errors import SlackApiError
 
 tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
 def valid_int(number,parameter_type):
@@ -69,6 +74,8 @@ def mark_complete_task(task_id):
     task = Task.query.get_or_404(task_id)
     task.completed_at = date.today()
     db.session.commit()
+    task.slack_notification()
+    
     return jsonify({"task":task.to_dict()}),200
 
 @tasks_bp.route("/<task_id>/mark_incomplete",methods=["PATCH"])
@@ -128,4 +135,15 @@ def post_task_ids_to_goal(goal_id):
         task = Task.query.get(task_id)
         goal.tasks.append(task)
         db.session.commit()
-    return jsonify({"id":goal.id, "task_ids": [task.id for task in goal.tasks]}),200   
\ No newline at end of file
+    return jsonify({"id":goal.id, "task_ids": [task.id for task in goal.tasks]}),200 
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_tasks_for_goal(goal_id):
+    
+    goal = Goal.query.get_or_404(goal_id)
+    response_body = {"id":goal.id,
+        "title":goal.title,
+        "tasks":goal.task_lists() 
+    }
+    print(response_body)
+    return jsonify(response_body),200
\ No newline at end of file

From fd09bf0baca1d502e63c38cec0e2cf61b825f3a0 Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Thu, 4 Nov 2021 11:56:59 -0700
Subject: [PATCH 06/11] adds slack notification helper function

---
 app/__init__.py    |  9 ++-------
 app/models/task.py | 20 +-------------------
 app/play_tester.py | 22 ----------------------
 app/routes.py      | 33 ++++++++++++++++++++-------------
 4 files changed, 23 insertions(+), 61 deletions(-)
 delete mode 100644 app/play_tester.py

diff --git a/app/__init__.py b/app/__init__.py
index 72dd972a7..d337fde0d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -3,16 +3,11 @@
 from flask_migrate import Migrate
 import os
 from dotenv import load_dotenv
-import slack
-from slack import WebClient
-import logging
-
 
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
 
-
 def create_app(test_config=None):
     app = Flask(__name__)
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
@@ -32,12 +27,12 @@ def create_app(test_config=None):
     db.init_app(app)
     migrate.init_app(app, db)
     
+    # Register Blueprints here
+    
     from .routes import tasks_bp
     app.register_blueprint(tasks_bp)
     
     from .routes import goals_bp
     app.register_blueprint(goals_bp)
 
-    # Register Blueprints here
-
     return app
diff --git a/app/models/task.py b/app/models/task.py
index ca44641e0..1ce5192ac 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,12 +1,5 @@
 from flask import current_app
 from app import db
-import slack
-import os
-from dotenv import load_dotenv
-from slack import WebClient
-from slack.errors import SlackApiError
-
-
 
 class Task(db.Model):
     id = db.Column(db.Integer, primary_key=True)
@@ -35,15 +28,4 @@ def to_dict(self):
                     "is_complete":self.check_for_completed_task(),
                     "goal_id": self.goal_id  
             }
-    def slack_notification(self):
-        if self.completed_at:
-            load_dotenv()
-            slack_token = os.environ["SLACK_TOKENS"]
-            client = WebClient(token=slack_token)
-            try:
-                response = client.chat_postMessage(
-                    channel ="CNEEJDLAW",
-                    text = "Task completed"
-                )
-            except SlackApiError as e:
-                return jsonify({"Error": "chanel not found"})
+    
diff --git a/app/play_tester.py b/app/play_tester.py
deleted file mode 100644
index bfdf36dd3..000000000
--- a/app/play_tester.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from flask import Blueprint, jsonify,request, make_response
-import slack
-import os
-from dotenv import load_dotenv
-import logging
-# logging.basicConfig(level=logging.DEBUG)
-from slack import WebClient
-from slack.errors import SlackApiError
-
-# client = slack.Webclient(token=os.environ['SLACK_TOKENS'])
-# client.chat_postmessage(channel=yourchannel, text="Task completed")
-
-def slack_notification():
-    slack_token = os.environ["SLACK_TOKENS"]
-    client = WebClient(token=slack_token)
-    try:
-        response = client.chat_postMessage(
-            channel ="CNEEJDLAW",
-            text = "Task completed"
-        )
-    except SlackApiError as e:
-        return jsonify({"Error": "chanel not found"})
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index a869f4f9b..02004295f 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -3,19 +3,33 @@
 from flask import Blueprint, jsonify,request, make_response, abort
 from datetime import date
 from app.models.goal import Goal
-import slack
 import os
 from dotenv import load_dotenv
 from slack import WebClient
 from slack.errors import SlackApiError
 
-tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
+
 def valid_int(number,parameter_type):
     try:
         int(number)
     except:
         abort(make_response({"error":f"{parameter_type} must be an int"},400))
-        
+
+def slack_notification():
+    load_dotenv()
+    slack_token = os.environ["SLACK_TOKENS"]
+    client = WebClient(token=slack_token)
+    try:
+        response = client.chat_postMessage(
+            channel ="CNEEJDLAW",
+            text = "Task completed"
+        )
+    except SlackApiError as e:
+        return jsonify({"Error": "chanel not found"})
+            
+tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__,url_prefix="/goals")
+
 @tasks_bp.route("",methods=["GET"])
 def handle_tasks():
     sort_query = request.args.get("sort")
@@ -34,7 +48,6 @@ def handle_tasks():
 def get_task(task_id):
     valid_int(task_id, "task_id")
     task = Task.query.get_or_404(task_id)
-    
     if request.method == "GET":
         return jsonify({"task":task.to_dict()}),200
     elif request.method == "PUT":
@@ -74,8 +87,7 @@ def mark_complete_task(task_id):
     task = Task.query.get_or_404(task_id)
     task.completed_at = date.today()
     db.session.commit()
-    task.slack_notification()
-    
+    slack_notification()
     return jsonify({"task":task.to_dict()}),200
 
 @tasks_bp.route("/<task_id>/mark_incomplete",methods=["PATCH"])
@@ -86,10 +98,6 @@ def mark_incomplete_task(task_id):
     db.session.commit()
     return jsonify({"task":task.to_dict()}),200     
 
-
-
-goals_bp = Blueprint("goals", __name__,url_prefix="/goals")
-
 @goals_bp.route("", methods=["POST"])
 def create_goal():
     request_body = request.get_json()
@@ -112,7 +120,6 @@ def handle_goals():
 def get_goal(goal_id):
     valid_int(goal_id,"goal_id")
     goal = Goal.query.get_or_404(goal_id)
-    
     if request.method == "GET":
         return jsonify({"goal":goal.to_dict()}),200
     elif request.method == "DELETE":
@@ -127,8 +134,8 @@ def get_goal(goal_id):
     
 @goals_bp.route("/<goal_id>/tasks", methods=["POST"])
 def post_task_ids_to_goal(goal_id):
+    valid_int(goal_id,"goal_id")
     request_body = request.get_json()
-    
     goal = Goal.query.get(goal_id)
     task_ids = request_body["task_ids"]
     for task_id in task_ids:
@@ -139,7 +146,7 @@ def post_task_ids_to_goal(goal_id):
 
 @goals_bp.route("/<goal_id>/tasks", methods=["GET"])
 def get_tasks_for_goal(goal_id):
-    
+    valid_int(goal_id,"goal_id")
     goal = Goal.query.get_or_404(goal_id)
     response_body = {"id":goal.id,
         "title":goal.title,

From 70a248d57e7105aac99b1e1e139652af7915f8b0 Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Thu, 4 Nov 2021 20:55:34 -0700
Subject: [PATCH 07/11] adds slack-sdk-3.11.2 to requirement.txt

---
 app/routes.py    |  4 ++--
 requirements.txt | 32 --------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index 02004295f..1bd9810e8 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -5,8 +5,8 @@
 from app.models.goal import Goal
 import os
 from dotenv import load_dotenv
-from slack import WebClient
-from slack.errors import SlackApiError
+from slack_sdk import WebClient
+from slack_sdk.errors import SlackApiError
 
 
 def valid_int(number,parameter_type):
diff --git a/requirements.txt b/requirements.txt
index cfdf74050..e69de29bb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,32 +0,0 @@
-alembic==1.5.4
-attrs==20.3.0
-autopep8==1.5.5
-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
-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.8.6
-py==1.10.0
-pycodestyle==2.6.0
-pyparsing==2.4.7
-pytest==6.2.3
-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.4
-Werkzeug==1.0.1

From af725da57efca2c64341a0e5d9b69b357b8a033f Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Thu, 4 Nov 2021 22:02:54 -0700
Subject: [PATCH 08/11] adds procfile

---
 Procfile         | 1 +
 requirements.txt | 1 +
 2 files changed, 2 insertions(+)
 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
diff --git a/requirements.txt b/requirements.txt
index e69de29bb..9d41f264a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -0,0 +1 @@
+gunicorn==20.1.0

From a6a49985fa5ef8e55373ebf61feee20e2e8982b6 Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Thu, 4 Nov 2021 23:36:34 -0700
Subject: [PATCH 09/11] add requirements

---
 requirements.txt | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index 9d41f264a..cfdf74050 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,32 @@
+alembic==1.5.4
+attrs==20.3.0
+autopep8==1.5.5
+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
 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.8.6
+py==1.10.0
+pycodestyle==2.6.0
+pyparsing==2.4.7
+pytest==6.2.3
+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.4
+Werkzeug==1.0.1

From 2d88c08b950ebf991d7ec34fbb2acb51f2799200 Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Fri, 5 Nov 2021 00:15:27 -0700
Subject: [PATCH 10/11]  modify slack api

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

diff --git a/app/routes.py b/app/routes.py
index 1bd9810e8..dda3d7885 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,12 +1,13 @@
 from app import db
 from app.models.task import Task
-from flask import Blueprint, jsonify,request, make_response, abort
+from flask import Blueprint, jsonify,request, make_response, abort 
 from datetime import date
 from app.models.goal import Goal
 import os
+import requests
 from dotenv import load_dotenv
-from slack_sdk import WebClient
-from slack_sdk.errors import SlackApiError
+# from slack_sdk import WebClient
+# from slack_sdk.errors import SlackApiError
 
 
 def valid_int(number,parameter_type):
@@ -15,17 +16,17 @@ def valid_int(number,parameter_type):
     except:
         abort(make_response({"error":f"{parameter_type} must be an int"},400))
 
-def slack_notification():
-    load_dotenv()
-    slack_token = os.environ["SLACK_TOKENS"]
-    client = WebClient(token=slack_token)
-    try:
-        response = client.chat_postMessage(
-            channel ="CNEEJDLAW",
-            text = "Task completed"
-        )
-    except SlackApiError as e:
-        return jsonify({"Error": "chanel not found"})
+# def slack_notification():
+#     load_dotenv()
+#     slack_token = os.environ["SLACK_TOKENS"]
+#     client = WebClient(token=slack_token)
+#     try:
+#         response = client.chat_postMessage(
+#             channel ="CNEEJDLAW",
+#             text = "Task completed"
+#         )
+#     except SlackApiError as e:
+#         return jsonify({"Error": "chanel not found"})
             
 tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
 goals_bp = Blueprint("goals", __name__,url_prefix="/goals")
@@ -87,7 +88,16 @@ def mark_complete_task(task_id):
     task = Task.query.get_or_404(task_id)
     task.completed_at = date.today()
     db.session.commit()
-    slack_notification()
+    path = "https://slack.com/api/chat.postMessage"
+    SLACK_TOKENS = os.environ.get("SLACK_TOKENS")
+    query_param = {
+        "token":SLACK_TOKENS,
+        "channel":"CNEEJDLAW",
+        "text": "Task completed"
+    }
+    requests.post(path,query_param)
+    # slack_notification()
+    
     return jsonify({"task":task.to_dict()}),200
 
 @tasks_bp.route("/<task_id>/mark_incomplete",methods=["PATCH"])

From e89bb8cf704ea9e3d713619517b9e188993c23fd Mon Sep 17 00:00:00 2001
From: Tirhas Gebreyohannes <tirhastse@gmail.com>
Date: Fri, 5 Nov 2021 10:24:13 -0700
Subject: [PATCH 11/11] requirements updated

---
 app/routes.py    | 37 ++++++++++++++-----------------------
 requirements.txt |  1 +
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index dda3d7885..7dd510c4c 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -6,8 +6,8 @@
 import os
 import requests
 from dotenv import load_dotenv
-# from slack_sdk import WebClient
-# from slack_sdk.errors import SlackApiError
+from slack_sdk import WebClient
+from slack_sdk.errors import SlackApiError
 
 
 def valid_int(number,parameter_type):
@@ -16,17 +16,17 @@ def valid_int(number,parameter_type):
     except:
         abort(make_response({"error":f"{parameter_type} must be an int"},400))
 
-# def slack_notification():
-#     load_dotenv()
-#     slack_token = os.environ["SLACK_TOKENS"]
-#     client = WebClient(token=slack_token)
-#     try:
-#         response = client.chat_postMessage(
-#             channel ="CNEEJDLAW",
-#             text = "Task completed"
-#         )
-#     except SlackApiError as e:
-#         return jsonify({"Error": "chanel not found"})
+def slack_notification():
+    load_dotenv()
+    slack_token = os.environ["SLACK_TOKENS"]
+    client = WebClient(token=slack_token)
+    try:
+        response = client.chat_postMessage(
+            channel ="CNEEJDLAW",
+            text = "Task completed"
+        )
+    except SlackApiError as e:
+        return jsonify({"Error": "chanel not found"})
             
 tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks")
 goals_bp = Blueprint("goals", __name__,url_prefix="/goals")
@@ -88,16 +88,7 @@ def mark_complete_task(task_id):
     task = Task.query.get_or_404(task_id)
     task.completed_at = date.today()
     db.session.commit()
-    path = "https://slack.com/api/chat.postMessage"
-    SLACK_TOKENS = os.environ.get("SLACK_TOKENS")
-    query_param = {
-        "token":SLACK_TOKENS,
-        "channel":"CNEEJDLAW",
-        "text": "Task completed"
-    }
-    requests.post(path,query_param)
-    # slack_notification()
-    
+    slack_notification()
     return jsonify({"task":task.to_dict()}),200
 
 @tasks_bp.route("/<task_id>/mark_incomplete",methods=["PATCH"])
diff --git a/requirements.txt b/requirements.txt
index cfdf74050..e849bfb4b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,6 +26,7 @@ python-dotenv==0.15.0
 python-editor==1.0.4
 requests==2.25.1
 six==1.15.0
+slack-sdk==3.11.2
 SQLAlchemy==1.3.23
 toml==0.10.2
 urllib3==1.26.4