diff --git a/ada-project-docs/wave_04.md b/ada-project-docs/wave_04.md
index 079ce6485..3e589c42b 100644
--- a/ada-project-docs/wave_04.md
+++ b/ada-project-docs/wave_04.md
@@ -98,9 +98,13 @@ Visit https://api.slack.com/methods/chat.postMessage to read about the Slack API
 Answer the following questions. These questions will help you become familiar with the API, and make working with it easier.
 
 - What is the responsibility of this endpoint?
+- ---- Allows the bot to post on channels
 - What is the URL and HTTP method for this endpoint?
+- ---- http = POST "https://slack.com/api/chat.postMessage"
 - What are the _two_ _required_ arguments for this endpoint?
+- ---- Token, channel, (attachment,block, text)
 - How does this endpoint relate to the Slackbot API key (token) we just created?
+-  ---- The token is required in the response of the request body in the JSON
 
 Now, visit https://api.slack.com/methods/chat.postMessage/test.
 
@@ -119,8 +123,11 @@ Press the "Test Method" button!
 Scroll down to see the HTTP response. Answer the following questions:
 
 - Did we get a success message? If so, did we see the message in our actual Slack workspace?
+    - We see the message in slack but no success message.
 - Did we get an error emssage? If so, why?
+  - I tested without text and we get an error message 
 - What is the shape of this JSON? Is it a JSON object or array? What keys and values are there?
+It is a nested dictionary with some keys nested with dictionaries and some nested with lists.
 
 ### Verify with Postman
 
diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..ad330854c 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -9,7 +9,6 @@
 migrate = Migrate()
 load_dotenv()
 
-
 def create_app(test_config=None):
     app = Flask(__name__)
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
@@ -28,7 +27,13 @@ def create_app(test_config=None):
 
     db.init_app(app)
     migrate.init_app(app, db)
+    from app.models.task import Task
+    from app.models.goal import Goal
 
     # Register Blueprints here
+    from .routes import task_db
+    from .routes import goal_db
+    app.register_blueprint(task_db)
+    app.register_blueprint(goal_db)
 
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..ccdeddb01 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,4 +2,37 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    goal_id = db.Column(db.Integer, primary_key=True, autoincrement = True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", back_populates="goal", lazy = True)
+
+    def goal_to_json(self):
+        json_response = {
+            "id": self.goal_id,
+            "title": self.title
+        }
+        if self.tasks:
+            json_response["tasks"]= self.title
+    
+        return json_response
+
+    def update_goal(self, request_body):
+        self.title = request_body["title"]
+    
+
+    @classmethod
+    def create_goal(cls, request_body):
+        new_goal = cls(
+        title = request_body["title"])
+            
+        return new_goal
+
+
+    def add_tasks(self, response_body):
+        if response_body["task_ids"]:
+            self.tasks = response_body["task_ids"]
+
+
+    
+
+# goal_id = goal_id,
\ No newline at end of file
diff --git a/app/models/helper.py b/app/models/helper.py
new file mode 100644
index 000000000..be227da01
--- /dev/null
+++ b/app/models/helper.py
@@ -0,0 +1,39 @@
+from .task import Task
+from .goal import Goal
+from flask import abort, make_response
+
+def validate_id(task_id):
+    try:
+        task_id = int(task_id)
+    except:
+        return abort(make_response({"message": f"Task {task_id} is not valid"}, 400))
+    task = Task.query.get(task_id)
+    if not task:
+        return abort(make_response({"message": f"Task {task_id} does not exist"}, 404))
+
+    return task
+
+
+def validate_goal_id(goal_id):
+    try:
+        goal_id = int(goal_id)
+    except:
+        return abort(make_response({"message": f"Goal {goal_id} is not valid"}, 400))
+    goal = Goal.query.get(goal_id)
+    if not goal:
+        return abort(make_response({"message": f"Goal {goal_id} does not exist"}, 404))
+
+    return goal
+
+def validate_data(request_body):
+    # return abort(make_response(f"Invalid data"),400)
+    if 'title' not in request_body:
+        return abort(make_response({"details":f"Invalid data"},400))
+    elif 'description' not in request_body:
+        return abort(make_response({"details":f"Invalid data"},400))
+    return request_body
+
+def validate_goal(request_body):
+    if 'title' not in request_body:
+        return abort(make_response({"details":f"Invalid data"},400))
+    return request_body
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..a296f484c 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,49 @@
 from app import db
+from flask import make_response
+from sqlalchemy import asc
+from datetime import datetime
+from app.models.goal import Goal
 
 
 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, default = None)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'))
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_json(self):
+        json_response = {
+            "id": self.task_id,
+            "title": self.title,
+            "description":self.description
+        }
+        if self.completed_at:
+            json_response["is_complete"] = True
+        else:
+            json_response["is_complete"] = False
+
+        if self.goal_id:
+            json_response["goal_id"] =self.goal_id
+
+        return json_response
+
+    def update_task(self, request_body):
+        self.title = request_body["title"]
+        self.description = request_body["description"]
+        if self.completed_at:
+            if self.completed_at == request_body['completed_at']:
+                self.completed_at = datetime.utcnow()
+        
+
+
+    @classmethod
+    def create_task(cls, request_body):
+
+        new_task = cls(title = request_body["title"],
+                    description = request_body["description"],
+                    completed_at = request_body.get("completed_at", None)
+            )
+        
+        return new_task
diff --git a/app/routes.py b/app/routes.py
index 3aae38d49..34fe61a99 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1 +1,175 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, jsonify, make_response, request, abort
+from requests import session
+from app.models.task import Task
+from app.models.goal import Goal
+from app.models.helper import validate_id, validate_data, validate_goal_id, validate_goal
+from app import db
+from sqlalchemy import asc, desc
+from datetime import datetime
+import requests
+import os 
+
+task_db = Blueprint("tasks",__name__, url_prefix = "/tasks")
+goal_db = Blueprint("goals", __name__, url_prefix = "/goals")
+
+# guard clause for invalid sort request 
+@task_db.route("", methods = ["GET"])
+def get_all_tasks():
+    task_response = []
+    sort_query = request.args.get("sort")
+    if not sort_query:
+        ordered_tasks = Task.query.all()
+    elif sort_query == "asc":
+        ordered_tasks = Task.query.order_by(asc(Task.title)).all()
+    elif sort_query == "desc":
+        ordered_tasks = Task.query.order_by(desc(Task.title)).all()
+    
+    for task in ordered_tasks:
+        task_response.append(task.to_json())
+    return jsonify(task_response), 200
+
+@task_db.route("/<task_id>", methods = ["GET"])
+def get_one_task(task_id):
+    task_response = []
+    task = validate_id(task_id)
+    return jsonify({"task": task.to_json()}), 200
+
+@task_db.route("", methods = ["POST"])
+def create_one_response():
+    request_body = request.get_json()
+    valid_data = validate_data(request_body)
+    new_task = Task.create_task(valid_data)
+    db.session.add(new_task)
+    db.session.commit()
+    return jsonify({"task":new_task.to_json()}), 201
+    
+
+@task_db.route("/<task_id>", methods = ["PUT"])
+def update_task(task_id):
+    task = validate_id(task_id)
+    request_body = request.get_json()
+    task.update_task(request_body)
+    
+    db.session.commit()
+    return jsonify({"task":task.to_json()}), 200
+
+@task_db.route("/<task_id>", methods = ["DELETE"])
+def delete_task(task_id):
+    task = validate_id(task_id)
+    task_title = Task.query.get(task_id)
+    db.session.delete(task)
+    db.session.commit()
+    return {
+        "details": f'Task {task_id} \"{task_title.title}\" successfully deleted'}, 200 
+
+# @task_db.route("/<task_id>/mark_complete", methods = ["PATCH"])
+# def mark_task_complete(task_id):
+#     task = validate_id(task_id)
+    
+#     task.completed_at = datetime.now()
+
+#     db.session.commit()
+#     return jsonify({"task":task.to_json()}), 200
+
+@task_db.route("/<task_id>/mark_incomplete", methods = ["PATCH"])
+def mark_task_incomplete(task_id):
+    task = validate_id(task_id)
+
+    task.completed_at = None
+
+    db.session.commit()
+    return jsonify({"task":task.to_json()}), 200
+
+TOKEN = os.environ.get("SLACK_TOKEN")
+SLACK_URL = os.environ.get("SLACK_URL")
+@task_db.route("/<task_id>/mark_complete", methods = ["PATCH"])
+def mark_task_complete_by_slack_bot(task_id):
+    task = validate_id(task_id)
+    validated_task = task.query.get(task_id)
+    task.completed_at = datetime.now()
+
+    headers = {"Authorization":f"Bearer {TOKEN}"}
+    data = {
+        "channel":"task-notifications",
+        "text": f"Someone just completed the task {task.title}."
+    }
+    res = requests.post(SLACK_URL, headers=headers, data=data)
+    
+    db.session.commit()
+    return jsonify({"task":task.to_json()}), 200
+
+
+@goal_db.route("/<goal_id>", methods = ["GET"])
+def get_one_goal(goal_id):
+    goal_response = []
+    goal = validate_goal_id(goal_id)
+    return jsonify({"goal": goal.goal_to_json()}), 200
+
+@goal_db.route("", methods = ["GET"])
+def get_all_goals():
+    goal_response = []
+    goals = Goal.query.all()
+    for goal in goals:
+        goal_response.append(goal.goal_to_json())
+
+    return jsonify(goal_response), 200
+
+@goal_db.route("", methods = ["POST"])
+def create_goals():
+    request_body = request.get_json()
+    is_valid = validate_goal(request_body)
+    new_goal = Goal.create_goal(is_valid)
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return jsonify({"goal":new_goal.goal_to_json()}), 201
+
+@goal_db.route("/<goal_id>", methods = ["DELETE"])
+def delete_task(goal_id):
+    goal = validate_goal_id(goal_id)
+    goal_title = Goal.query.get(goal_id)
+    db.session.delete(goal_title)
+    db.session.commit()
+    return {
+        "details": f'Goal {goal_id} \"{goal_title.title}\" successfully deleted'}, 200 
+
+@goal_db.route("/<goal_id>", methods = ["PUT"])
+def update_task(goal_id):
+    goal = validate_goal_id(goal_id)
+    request_body = request.get_json()
+    goal.update_goal(request_body)
+    
+    db.session.commit()
+    return jsonify({"Goal":goal.goal_to_json()}), 200
+
+
+
+@goal_db.route("/<goal_id>/tasks", methods = ["GET"])
+def get_all_goals_and_tasks(goal_id):
+    valid_goal = validate_goal_id(goal_id)
+    
+    task_response = []
+    for task in valid_goal.tasks:
+        task_response.append(task.to_json())
+
+
+    result = {"id": valid_goal.goal_id,
+    "title":valid_goal.title,
+    "tasks": task_response}
+
+    return result, 200
+
+@goal_db.route("/<goal_id>/tasks", methods = ["POST"])
+def create_one_goal(goal_id):
+    valid_goal = validate_goal_id(goal_id)
+    request_body = request.get_json()
+
+
+    for task_id in request_body["task_ids"]:
+        validate_id(task_id)
+        task = Task.query.get(task_id)
+        valid_goal.tasks.append(task)
+    db.session.commit()
+
+    return {"id":valid_goal.goal_id,"task_ids":request_body["task_ids"]}, 200
\ No newline at end of file
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/475b940fe6aa_registered_bp.py b/migrations/versions/475b940fe6aa_registered_bp.py
new file mode 100644
index 000000000..bac2d75fc
--- /dev/null
+++ b/migrations/versions/475b940fe6aa_registered_bp.py
@@ -0,0 +1,39 @@
+"""registered bp 
+
+Revision ID: 475b940fe6aa
+Revises: 
+Create Date: 2022-05-07 07:46:02.965065
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '475b940fe6aa'
+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(), 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 ###
diff --git a/migrations/versions/710de958d23c_.py b/migrations/versions/710de958d23c_.py
new file mode 100644
index 000000000..158809a6a
--- /dev/null
+++ b/migrations/versions/710de958d23c_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 710de958d23c
+Revises: e3b3d6314e44
+Create Date: 2022-05-14 14:26:48.815609
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '710de958d23c'
+down_revision = 'e3b3d6314e44'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('title', sa.String(), nullable=True))
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_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')
+    op.drop_column('goal', 'title')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/a40b31893776_.py b/migrations/versions/a40b31893776_.py
new file mode 100644
index 000000000..7f1679f9c
--- /dev/null
+++ b/migrations/versions/a40b31893776_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: a40b31893776
+Revises: 475b940fe6aa
+Create Date: 2022-05-10 17:16:08.032643
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a40b31893776'
+down_revision = '475b940fe6aa'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('task', 'is_complete')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/ae74d297ba1b_.py b/migrations/versions/ae74d297ba1b_.py
new file mode 100644
index 000000000..4b0ff4589
--- /dev/null
+++ b/migrations/versions/ae74d297ba1b_.py
@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: ae74d297ba1b
+Revises: 710de958d23c
+Create Date: 2022-05-14 14:33:14.058503
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ae74d297ba1b'
+down_revision = '710de958d23c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('goal')
+    op.drop_constraint('task_goal_id_fkey', 'task', type_='foreignkey')
+    op.drop_column('task', 'goal_id')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('goal_id', sa.INTEGER(), autoincrement=False, nullable=True))
+    op.create_foreign_key('task_goal_id_fkey', 'task', 'goal', ['goal_id'], ['goal_id'])
+    op.create_table('goal',
+    sa.Column('goal_id', sa.INTEGER(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=True),
+    sa.PrimaryKeyConstraint('goal_id', name='goal_pkey')
+    )
+    # ### end Alembic commands ###
diff --git a/migrations/versions/e3b3d6314e44_.py b/migrations/versions/e3b3d6314e44_.py
new file mode 100644
index 000000000..1155c05ce
--- /dev/null
+++ b/migrations/versions/e3b3d6314e44_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: e3b3d6314e44
+Revises: a40b31893776
+Create Date: 2022-05-11 00:29:50.647890
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e3b3d6314e44'
+down_revision = 'a40b31893776'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('task', 'is_complete')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
index 30ff414fe..143ec15af 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@ blinker==1.4
 certifi==2020.12.5
 chardet==4.0.0
 click==7.1.2
+coverage==6.3.2
 Flask==1.1.2
 Flask-Migrate==2.6.0
 Flask-SQLAlchemy==2.4.4
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..01aca5119 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_no_saved_tasks(client):
     # Act
     response = client.get("/tasks")
@@ -13,7 +13,7 @@ def test_get_tasks_no_saved_tasks(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_one_saved_tasks(client, one_task):
     # Act
     response = client.get("/tasks")
@@ -32,7 +32,7 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task(client, one_task):
     # Act
     response = client.get("/tasks/1")
@@ -51,7 +51,7 @@ def test_get_task(client, one_task):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_not_found(client):
     # Act
     response = client.get("/tasks/1")
@@ -60,13 +60,14 @@ def test_get_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
+    assert response_body == {"message": f"Task 1 does not exist"}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +94,7 @@ def test_create_task(client):
     assert new_task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task(client, one_task):
     # Act
     response = client.put("/tasks/1", json={
@@ -119,7 +120,7 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -130,14 +131,14 @@ def test_update_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {'message': 'Task 1 does not exist'}
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -152,7 +153,7 @@ def test_delete_task(client, one_task):
     assert Task.query.get(1) == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task_not_found(client):
     # Act
     response = client.delete("/tasks/1")
@@ -161,15 +162,15 @@ def test_delete_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
-
+    assert response_body == {'message': 'Task 1 does not exist'}
     assert Task.query.all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -186,7 +187,7 @@ def test_create_task_must_contain_title(client):
     assert Task.query.all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_description(client):
     # Act
     response = client.post("/tasks", json={
@@ -195,6 +196,7 @@ def test_create_task_must_contain_description(client):
     response_body = response.get_json()
 
     # Assert
+
     assert response.status_code == 400
     assert "details" in response_body
     assert response_body == {
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index a087e0909..a4996c35a 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -1,13 +1,15 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_asc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=asc")
     response_body = response.get_json()
 
     # Assert
+    # assert ordered_tasks ==
     assert response.status_code == 200
     assert len(response_body) == 3
     assert response_body == [
@@ -29,7 +31,7 @@ def test_get_tasks_sorted_asc(client, three_tasks):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_desc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=desc")
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 959176ceb..47f1c938a 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -5,7 +5,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_incomplete_task(client, one_task):
     # Arrange
     """
@@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     assert Task.query.get(1).completed_at
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_complete_task(client, completed_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task):
     assert Task.query.get(1).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_completed_task(client, completed_task):
     # Arrange
     """
@@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task):
     assert Task.query.get(1).completed_at
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_incomplete_task(client, one_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task):
     assert Task.query.get(1).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_complete")
@@ -127,14 +127,14 @@ def test_mark_complete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {"message": f"Task 1 does not exist"}
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -142,8 +142,9 @@ def test_mark_incomplete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": f"Task 1 does not exist"}
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
@@ -151,7 +152,7 @@ def test_mark_incomplete_missing_task(client):
 
 # Let's add this test for creating tasks, now that
 # the completion functionality has been implemented
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_with_valid_completed_at(client):
     # Act
     response = client.post("/tasks", json={
@@ -181,7 +182,7 @@ def test_create_task_with_valid_completed_at(client):
 
 # Let's add this test for updating tasks, now that
 # the completion functionality has been implemented
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_with_completed_at_date(client, completed_task):
     # Act
     response = client.put("/tasks/1", json={
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..067d7d80a 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,8 @@
 import pytest
+from app.models.goal import Goal
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_no_saved_goals(client):
     # Act
     response = client.get("/goals")
@@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_one_saved_goal(client, one_goal):
     # Act
     response = client.get("/goals")
@@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goal(client, one_goal):
     # Act
     response = client.get("/goals/1")
@@ -46,14 +47,16 @@ 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()
 
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
+    assert response.status_code == 404
+    assert response_body == {"message":f"Goal 1 does not exist" }
     # Assert
     # ---- Complete Test ----
     # assertion 1 goes here
@@ -61,7 +64,7 @@ def test_get_goal_not_found(client):
     # ---- Complete Test ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal(client):
     # Act
     response = client.post("/goals", json={
@@ -80,26 +83,41 @@ def test_create_goal(client):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal(client, one_goal):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Act
+    response = client.put("/goals/1",json={
+        "title": "Updated goal Title"})
+
+    response_body = response.get_json()
     # ---- Complete Act Here ----
 
+
     # Assert
     # ---- Complete Assertions Here ----
+    assert response.status_code == 200
+    assert response_body=={"Goal":
+        {'id': 1,"title": "Updated goal Title"}}
+    assert "Goal" in response_body
     # 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")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1",json={
+        "title": "Updated goal Title"})
+
+    response_body = response.get_json()
 
+   
+    assert response.status_code == 404
+    assert response_body == {"message":f"Goal 1 does not exist" }
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
@@ -107,7 +125,7 @@ def test_update_goal_not_found(client):
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
@@ -121,30 +139,38 @@ def test_delete_goal(client, one_goal):
     }
 
     # Check that the goal was deleted
-    response = client.get("/goals/1")
-    assert response.status_code == 404
+    response_1 = client.get("/goals/1")
+    res_body = response_1.get_json()
+    assert response_1.status_code == 404
+    assert res_body == {'message': 'Goal 1 does not exist'}
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
 
     # Act
     # ---- Complete Act Here ----
-
+    response = client.delete("/goals/1")
+    response_body = response.get_json()
+    assert response.status_code == 404  
     # Assert
+    
+    assert response_body == {'message': 'Goal 1 does not exist'}
+    assert Goal.query.all() == []
+    # assert response.message == {'message': 'Goal 1 does not exist'}
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
     # assertion 2 goes here
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal_missing_title(client):
     # Act
     response = client.post("/goals", json={})
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..fd925d591 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     assert len(Goal.query.get(1).tasks) == 3
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on
     assert len(Goal.query.get(1).tasks) == 2
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_goal(client):
     # Act
     response = client.get("/goals/1/tasks")
@@ -50,14 +50,14 @@ def test_get_tasks_for_specific_goal_no_goal(client):
 
     # Assert
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {"message": f"Goal 1 does not exist"}
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -74,7 +74,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -99,7 +99,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
     response = client.get("/tasks/1")
     response_body = response.get_json()