From 8b7e33111de89be933dd2b4cefa0fcfb5fbbdf73 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Thu, 3 Nov 2022 17:16:39 -0400
Subject: [PATCH 01/34] added set up environment

---
 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 4eafdcf3151c2f7362c3da8fd6f4f90f82ff9958 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sun, 6 Nov 2022 09:51:16 -0500
Subject: [PATCH 02/34] Task Model completed

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

diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..6b18057ff 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -3,3 +3,10 @@
 
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String(80), index = True, unique = False) 
+    description  = db.Column(db.String(80), index = True, unique = False) 
+    completed_at = db.Column(db.DateTime, index = True, unique = False, nullable = True)
+    
+# datetime that has the date that a task is completed on. 
+# **Can be _nullable_,** and contain a null value. A task with a `null` value for `completed_at` has not been completed.
+# When we create a new task, `completed_at` should be `null` AKA `None` in Python.

From 55f719b911a2d5a07cdf93fad762cfa95fb28202 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sun, 6 Nov 2022 14:59:20 -0500
Subject: [PATCH 03/34] registered blueprint

---
 app/__init__.py                      |   2 +
 app/models/task.py                   |  14 +-
 app/routes.py                        | 222 ++++++++++++++++++++++++++-
 migrations/versions/32f99ab5f95c_.py |  45 ++++++
 migrations/versions/6164e690559f_.py |  50 ++++++
 5 files changed, 328 insertions(+), 5 deletions(-)
 create mode 100644 migrations/versions/32f99ab5f95c_.py
 create mode 100644 migrations/versions/6164e690559f_.py

diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..30052751d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -30,5 +30,7 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # 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 6b18057ff..b64bb779f 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,12 +1,18 @@
 from app import db
-
+import datetime
 
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True)
-    title = db.Column(db.String(80), index = True, unique = False) 
-    description  = db.Column(db.String(80), index = True, unique = False) 
-    completed_at = db.Column(db.DateTime, index = True, unique = False, nullable = True)
+    title = db.Column('Title',db.String(80), index = True, unique = False) 
+    description  = db.Column('Description', db.String(80), index = True, unique = False) 
+    completed_at = db.Column('Completed On', db.DateTime, index = True, unique = False, nullable = True)
     
 # datetime that has the date that a task is completed on. 
 # **Can be _nullable_,** and contain a null value. A task with a `null` value for `completed_at` has not been completed.
 # When we create a new task, `completed_at` should be `null` AKA `None` in Python.
+
+
+def __repr__(self):
+    return f'''<Task (Title: {self.title}
+                Description: {self.description}
+                Completed: {self.completed_at})'''
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 3aae38d49..38e316363 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1 +1,221 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, jsonify, abort, make_response, request
+
+
+tasks_bp = Blueprint('tasks', __name__, url_prefix="/tasks")
+
+### Create a Task: Valid Task With `null` `completed_at`
+
+# As a client, I want to be able to make a `POST` request to `/tasks` with the following HTTP request body
+# so that I know I successfully created a Task that is saved in the database.
+
+0️⃣
+app.route('/', methods = ['POST'])
+def task_completed_null:
+    pass
+#   return {
+#     "title": "A Brand New Task",
+#     "description": "Test Description",
+#     "completed_at": NULL
+#   }, "201", "CREATED"
+
+1️⃣
+# {
+#   "task": {
+#     "id": 1,
+#     "title": "A Brand New Task",
+#     "description": "Test Description",
+#     "is_complete": false
+#   }
+# }
+
+
+
+### Get Tasks: Getting Saved Tasks
+# As a client, I want to be able to make a `GET` request to `/tasks` when there is at least one saved task and get this response:
+2️⃣
+
+# `200 OK`
+# ```json
+# [
+#   {
+#     "id": 1,
+#     "title": "Example Task Title 1",
+#     "description": "Example Task Description 1",
+#     "is_complete": false
+#   },
+#   {
+#     "id": 2,
+#     "title": "Example Task Title 2",
+#     "description": "Example Task Description 2",
+#     "is_complete": false
+#   }
+# ]
+# ```
+app.route('/', methods = ['GET'])
+def saved_tasks:
+    pass 
+
+
+
+
+
+3️⃣
+### Get Tasks: No Saved Tasks
+# As a client, I want to be able to make a `GET` request to `/tasks` when there are zero saved tasks and get this response:
+# `200 OK`
+# ```json
+# []
+# ```
+
+app.route('/', methods = ['GET'])
+def no_saved_tasks:
+    pass 
+
+
+
+4️⃣
+### Get One Task: One Saved Task
+# As a client, I want to be able to make a `GET` request to `/tasks/1` when there is at least one saved task and get this response:
+# `200 OK`
+# ```json
+# {
+#   "task": {
+#     "id": 1,
+#     "title": "Example Task Title 1",
+#     "description": "Example Task Description 1",
+#     "is_complete": false
+#   }
+# }
+# ```
+# app.route('/', methods = ['GET'])
+def one_saved_tasks:
+    pass 
+
+
+5️⃣
+### Update Task
+
+# As a client, I want to be able to make a `PUT` request to `/tasks/1` when there is at least one saved task with this request body:
+
+# ```json
+# {
+#   "title": "Updated Task Title",
+#   "description": "Updated Test Description",
+# }
+# ```
+
+# and get this response:
+
+# `200 OK`
+
+# ```json
+# {
+#   "task": {
+#     "id": 1,
+#     "title": "Updated Task Title",
+#     "description": "Updated Test Description",
+#     "is_complete": false
+#   }
+# }
+# ```
+# Note that the update endpoint does update the `completed_at` attribute. This will be updated with custom endpoints implemented in Wave 03.
+
+app.route('/', methods = ['GET'])
+def update_tasks:
+    pass 
+
+
+### Delete Task: Deleting a Task
+
+# As a client, I want to be able to make a `DELETE` request to `/tasks/1` when there is at least one saved task and get this response:
+
+# `200 OK`
+
+# ```json
+# {
+#   "details": "Task 1 \"Go on my daily walk 🏞\" successfully deleted"
+# }
+# ```
+
+app.route('/', methods = ['DELETE'])
+def delete_tasks:
+    pass 
+
+
+
+# ### No matching Task: Get, Update, and Delete
+
+# As a client, if I make any of the following requests:
+
+#   * `GET` `/tasks/<task_id>`
+#   * `UPDATE` `/tasks/<task_id>`
+#   * `DELETE` `/tasks/<task_id>`
+
+# and there is no existing task with `task_id`
+
+# The response code should be `404`.
+
+# You may choose the response body.
+
+# Make sure to complete the tests for non-existing tasks to check that the correct response body is returned.
+app.route('/', methods = ['DELETE'])
+def no_matching_tasks:
+    pass 
+
+
+# ### Create a Task: Invalid Task With Missing Data
+
+# #### Missing `title`
+
+# As a client, I want to be able to make a `POST` request to `/tasks` with the following HTTP request body
+
+# ```json
+# {
+#   "description": "Test Description",
+#   "completed_at": null
+# }
+# ```
+
+# and get this response:
+
+# `400 Bad Request`
+
+# ```json
+# {
+#   "details": "Invalid data"
+# }
+# ```
+
+# so that I know I did not create a Task that is saved in the database.
+app.route('/', methods = ['DELETE'])
+def missing_title_input:
+    pass 
+
+
+
+
+# #### Missing `description` 
+# If the HTTP request is missing `description`, we should also get this response:
+# `400 Bad Request`
+
+# ```json
+# {
+#   "details": "Invalid data"
+# }
+# ```
+app.route('/', methods = ['DELETE'])
+def missing_description:
+    pass 
+
+
+#### Missing `completed_at`
+# If the HTTP request is missing `completed_at`, we should also get this response:
+# `400 Bad Request`
+# ```json0️⃣
+# {
+#   "details": "Invalid data"
+# }
+# ```
+app.route('/', methods = ['DELETE'])
+def missing_description:
+    pass 
\ No newline at end of file
diff --git a/migrations/versions/32f99ab5f95c_.py b/migrations/versions/32f99ab5f95c_.py
new file mode 100644
index 000000000..3bc92ee35
--- /dev/null
+++ b/migrations/versions/32f99ab5f95c_.py
@@ -0,0 +1,45 @@
+"""empty message
+
+Revision ID: 32f99ab5f95c
+Revises: 
+Create Date: 2022-11-06 09:55:45.366336
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '32f99ab5f95c'
+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(length=80), nullable=True),
+    sa.Column('description', sa.String(length=80), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('task_id')
+    )
+    op.create_index(op.f('ix_task_completed_at'), 'task', ['completed_at'], unique=False)
+    op.create_index(op.f('ix_task_description'), 'task', ['description'], unique=False)
+    op.create_index(op.f('ix_task_title'), 'task', ['title'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_task_title'), table_name='task')
+    op.drop_index(op.f('ix_task_description'), table_name='task')
+    op.drop_index(op.f('ix_task_completed_at'), table_name='task')
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/6164e690559f_.py b/migrations/versions/6164e690559f_.py
new file mode 100644
index 000000000..3d225238d
--- /dev/null
+++ b/migrations/versions/6164e690559f_.py
@@ -0,0 +1,50 @@
+"""empty message
+
+Revision ID: 6164e690559f
+Revises: 32f99ab5f95c
+Create Date: 2022-11-06 11:24:49.113348
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '6164e690559f'
+down_revision = '32f99ab5f95c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('Completed On', sa.DateTime(), nullable=True))
+    op.add_column('task', sa.Column('Description', sa.String(length=80), nullable=True))
+    op.add_column('task', sa.Column('Title', sa.String(length=80), nullable=True))
+    op.drop_index('ix_task_completed_at', table_name='task')
+    op.drop_index('ix_task_description', table_name='task')
+    op.drop_index('ix_task_title', table_name='task')
+    op.create_index(op.f('ix_task_Completed On'), 'task', ['Completed On'], unique=False)
+    op.create_index(op.f('ix_task_Description'), 'task', ['Description'], unique=False)
+    op.create_index(op.f('ix_task_Title'), 'task', ['Title'], unique=False)
+    op.drop_column('task', 'description')
+    op.drop_column('task', 'title')
+    op.drop_column('task', 'completed_at')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.add_column('task', sa.Column('title', sa.VARCHAR(length=80), autoincrement=False, nullable=True))
+    op.add_column('task', sa.Column('description', sa.VARCHAR(length=80), autoincrement=False, nullable=True))
+    op.drop_index(op.f('ix_task_Title'), table_name='task')
+    op.drop_index(op.f('ix_task_Description'), table_name='task')
+    op.drop_index(op.f('ix_task_Completed On'), table_name='task')
+    op.create_index('ix_task_title', 'task', ['title'], unique=False)
+    op.create_index('ix_task_description', 'task', ['description'], unique=False)
+    op.create_index('ix_task_completed_at', 'task', ['completed_at'], unique=False)
+    op.drop_column('task', 'Title')
+    op.drop_column('task', 'Description')
+    op.drop_column('task', 'Completed On')
+    # ### end Alembic commands ###

From 771a7d966b6c201a6c80e9f1a78122fa30bdee2e Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 11 Nov 2022 15:05:15 -0500
Subject: [PATCH 04/34] trying to understand tests and fixtures

---
 .idea/.gitignore                              |   0
 .../inspectionProfiles/profiles_settings.xml  |   6 +
 .idea/misc.xml                                |   7 +
 .idea/modules.xml                             |   8 +
 .idea/task-list-api.iml                       |  17 +
 .idea/vcs.xml                                 |   6 +
 .idea/workspace.xml                           |  43 +++
 app/__init__.py                               |   3 +-
 app/models/task.py                            |  26 +-
 app/routes.py                                 | 291 +++++++-----------
 migrations/README                             |   1 -
 migrations/alembic.ini                        |  45 ---
 migrations/env.py                             |  96 ------
 migrations/script.py.mako                     |  24 --
 migrations/versions/32f99ab5f95c_.py          |  45 ---
 migrations/versions/6164e690559f_.py          |  50 ---
 tests/test_wave_01.py                         |  22 +-
 17 files changed, 222 insertions(+), 468 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/task-list-api.iml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 delete mode 100644 migrations/README
 delete mode 100644 migrations/alembic.ini
 delete mode 100644 migrations/env.py
 delete mode 100644 migrations/script.py.mako
 delete mode 100644 migrations/versions/32f99ab5f95c_.py
 delete mode 100644 migrations/versions/6164e690559f_.py

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 000000000..105ce2da2
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..a8a99e530
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (task-list-api)" project-jdk-type="Python SDK" />
+  <component name="PyCharmProfessionalAdvertiser">
+    <option name="shown" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..dbcb90b51
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/task-list-api.iml" filepath="$PROJECT_DIR$/.idea/task-list-api.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/task-list-api.iml b/.idea/task-list-api.iml
new file mode 100644
index 000000000..519512493
--- /dev/null
+++ b/.idea/task-list-api.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..94a25f7f4
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..c78565839
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="c7dee5e8-450a-45dd-ab3e-35f1e148105b" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/app/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/models/task.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/task.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/routes.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/routes.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_wave_01.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_wave_01.py" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="2HI4VFmPCXP6Y8bC2XK4f97pC0L" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="c7dee5e8-450a-45dd-ab3e-35f1e148105b" name="Changes" comment="" />
+      <created>1667959287816</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1667959287816</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/__init__.py b/app/__init__.py
index 30052751d..7e1eef0e4 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,7 +4,6 @@
 import os
 from dotenv import load_dotenv
 
-
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
@@ -30,7 +29,7 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
-    from .routes import tasks_bp
+    from app.routes import tasks_bp
     app.register_blueprint(tasks_bp)
 
     return app
diff --git a/app/models/task.py b/app/models/task.py
index b64bb779f..5d59f816f 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,18 +1,16 @@
 from app import db
-import datetime
+from datetime import datetime
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
-    title = db.Column('Title',db.String(80), index = True, unique = False) 
-    description  = db.Column('Description', db.String(80), index = True, unique = False) 
-    completed_at = db.Column('Completed On', db.DateTime, index = True, unique = False, nullable = True)
+    task_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String(80), index = True, unique = False) 
+    description  = db.Column(db.String(80), index = True, unique = False) 
+    is_complete = db.Column(db.DateTime, index = True, unique = False, nullable = True)
     
-# datetime that has the date that a task is completed on. 
-# **Can be _nullable_,** and contain a null value. A task with a `null` value for `completed_at` has not been completed.
-# When we create a new task, `completed_at` should be `null` AKA `None` in Python.
-
-
-def __repr__(self):
-    return f'''<Task (Title: {self.title}
-                Description: {self.description}
-                Completed: {self.completed_at})'''
\ No newline at end of file
+    def build_task_dict(self):
+            return {
+                "id": self.id,
+                "title": self.name,
+                "description": self.description,
+                "is_complete": self.is_complete
+            }
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 38e316363..5a972d77c 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,221 +1,152 @@
 from flask import Blueprint, jsonify, abort, make_response, request
-
+from os import abort
+from app.models.task import Task
+from app import db
+import json
+from datetime import datetime
 
 tasks_bp = Blueprint('tasks', __name__, url_prefix="/tasks")
 
-### Create a Task: Valid Task With `null` `completed_at`
-
-# As a client, I want to be able to make a `POST` request to `/tasks` with the following HTTP request body
-# so that I know I successfully created a Task that is saved in the database.
-
-0️⃣
-app.route('/', methods = ['POST'])
-def task_completed_null:
-    pass
-#   return {
-#     "title": "A Brand New Task",
-#     "description": "Test Description",
-#     "completed_at": NULL
-#   }, "201", "CREATED"
-
-1️⃣
-# {
-#   "task": {
-#     "id": 1,
-#     "title": "A Brand New Task",
-#     "description": "Test Description",
-#     "is_complete": false
-#   }
-# }
-
-
-
-### Get Tasks: Getting Saved Tasks
-# As a client, I want to be able to make a `GET` request to `/tasks` when there is at least one saved task and get this response:
-2️⃣
-
-# `200 OK`
-# ```json
-# [
-#   {
-#     "id": 1,
-#     "title": "Example Task Title 1",
-#     "description": "Example Task Description 1",
-#     "is_complete": false
-#   },
-#   {
-#     "id": 2,
-#     "title": "Example Task Title 2",
-#     "description": "Example Task Description 2",
-#     "is_complete": false
-#   }
-# ]
-# ```
-app.route('/', methods = ['GET'])
-def saved_tasks:
-    pass 
-
-
-
-
-
-3️⃣
-### Get Tasks: No Saved Tasks
-# As a client, I want to be able to make a `GET` request to `/tasks` when there are zero saved tasks and get this response:
-# `200 OK`
-# ```json
-# []
-# ```
-
-app.route('/', methods = ['GET'])
-def no_saved_tasks:
-    pass 
-
-
-
-4️⃣
-### Get One Task: One Saved Task
-# As a client, I want to be able to make a `GET` request to `/tasks/1` when there is at least one saved task and get this response:
-# `200 OK`
-# ```json
-# {
-#   "task": {
-#     "id": 1,
-#     "title": "Example Task Title 1",
-#     "description": "Example Task Description 1",
-#     "is_complete": false
-#   }
-# }
-# ```
-# app.route('/', methods = ['GET'])
-def one_saved_tasks:
-    pass 
-
-
-5️⃣
-### Update Task
+now = datetime.now() 
+date_time = now.strftime("%m/%d/%Y, %H:%M:%S")
 
-# As a client, I want to be able to make a `PUT` request to `/tasks/1` when there is at least one saved task with this request body:
+@tasks_bp.route("", methods=['POST'])
+def created_task():
+    request_body = request.get_json()
+    print(request_body)
+    created_task = Task(title=request_body["title"],
+                description=request_body["description"],
+            is_complete = date_time)
+                        
+    db.session.add(created_task)
+    db.session.commit()
 
-# ```json
-# {
-#   "title": "Updated Task Title",
-#   "description": "Updated Test Description",
-# }
-# ```
+    return make_response(f"Task {created_task.title} successfully created", 201)
 
-# and get this response:
 
-# `200 OK`
+def validate_task_id(task_id):
+    try:
+        task_id = int(task_id)
+    except:
+        abort(make_response({"message":f"Task {task_id} invalid"}, 400))
 
-# ```json
-# {
-#   "task": {
-#     "id": 1,
-#     "title": "Updated Task Title",
-#     "description": "Updated Test Description",
-#     "is_complete": false
-#   }
-# }
-# ```
-# Note that the update endpoint does update the `completed_at` attribute. This will be updated with custom endpoints implemented in Wave 03.
+    task = Task.query.get(task_id)
 
-app.route('/', methods = ['GET'])
-def update_tasks:
-    pass 
+    if not task:
+        abort(make_response({"message":f"Task {task_id} not found"}, 404))
 
+    return task
 
-### Delete Task: Deleting a Task
+@tasks_bp.route('', methods=['GET'])
+def query_all():
+    all_tasks = Task.query.all()
+    tasks_lists = []
+    for task in all_tasks:
+            tasks_lists.append({
+                "id": task.task_id,
+                "title": task.title,
+                "description": task.description,
+                "is_complete": task.is_complete
+            })
+    print(tasks_lists)
+    return jsonify(tasks_lists)
 
-# As a client, I want to be able to make a `DELETE` request to `/tasks/1` when there is at least one saved task and get this response:
 
-# `200 OK`
 
-# ```json
-# {
-#   "details": "Task 1 \"Go on my daily walk 🏞\" successfully deleted"
-# }
-# ```
+@tasks_bp.route('/<task_id>', methods=['GET'])
+def one_saved_task(task_id):
+    task = validate_task_id(task_id)
+    return {
+            # "id": task.id,
+            "title": task.title,
+            "description": task.description,
+            # "is_complete": task.date_time
+        }
 
-app.route('/', methods = ['DELETE'])
-def delete_tasks:
-    pass 
 
+@tasks_bp.route('/<task_id>', methods=['PUT'])
+def update_tasks(task_id):
+    task = validate_task_id(task_id)
+    request_body = request.get_json()
+    
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+    task.is_complete = date_time
 
+    db.session.commit()
 
-# ### No matching Task: Get, Update, and Delete
+    return make_response(f"Task {task_id} successfully updated", 201)
 
-# As a client, if I make any of the following requests:
+@tasks_bp.route('/<id>', methods=['DELETE'])
+def delete_tasks(task_id):
+    test = validate_task_id(task_id)
 
-#   * `GET` `/tasks/<task_id>`
-#   * `UPDATE` `/tasks/<task_id>`
-#   * `DELETE` `/tasks/<task_id>`
+    db.session.delete(test)
+    db.session.commit()
 
-# and there is no existing task with `task_id`
+    return make_response(f"Test #{test.id} successfully deleted, 200 OK")
 
-# The response code should be `404`.
+# # Note that the update endpoint does update the `completed_at` attribute. 
+# This will be updated with custom endpoints implemented in Wave 03.
 
-# You may choose the response body.
+# # ### No matching Task: Get, Update, and Delete
 
-# Make sure to complete the tests for non-existing tasks to check that the correct response body is returned.
-app.route('/', methods = ['DELETE'])
-def no_matching_tasks:
-    pass 
+# # and there is no existing task with `task_id`
 
+# # The response code should be `404`.
 
-# ### Create a Task: Invalid Task With Missing Data
+# # You may choose the response body.
 
-# #### Missing `title`
+# # Make sure to complete the tests for non-existing tasks to check that the correct response body is returned.
+# @tasks_bp.route('/', methods=['DELETE'])
+# def no_matching_tasks():
+#     pass 
 
-# As a client, I want to be able to make a `POST` request to `/tasks` with the following HTTP request body
 
-# ```json
-# {
-#   "description": "Test Description",
-#   "completed_at": null
-# }
-# ```
+# # ### Create a Task: Invalid Task With Missing Data
 
-# and get this response:
+# # #### Missing `title`
 
-# `400 Bad Request`
+# # As a client, I want to be able to make a `POST` request to `/tasks` with the following HTTP request body
 
-# ```json
-# {
-#   "details": "Invalid data"
-# }
-# ```
+# # ```json
+# # {
+# #   "description": "Test Description",
+# #   "completed_at": null
+# # }
+# # ```
 
-# so that I know I did not create a Task that is saved in the database.
-app.route('/', methods = ['DELETE'])
-def missing_title_input:
-    pass 
+# # and get this response:
 
+# # `400 Bad Request`
 
+# # ```json
+# # {
+# #   "details": "Invalid data"
+# # }
+# # ```
 
+# # so that I know I did not create a Task that is saved in the database.
 
-# #### Missing `description` 
-# If the HTTP request is missing `description`, we should also get this response:
-# `400 Bad Request`
+# # #### Missing `description` 
+# # If the HTTP request is missing `description`, we should also get this response:
+# # `400 Bad Request`
 
-# ```json
-# {
-#   "details": "Invalid data"
-# }
-# ```
-app.route('/', methods = ['DELETE'])
-def missing_description:
-    pass 
+# # ```json
+# # {
+# #   "details": "Invalid data"
+# # }
+# # ```
+# @tasks_bp.route('/', methods=['DELETE'])
+# def missing_description():
+#     pass 
 
 
-#### Missing `completed_at`
-# If the HTTP request is missing `completed_at`, we should also get this response:
-# `400 Bad Request`
-# ```json0️⃣
-# {
-#   "details": "Invalid data"
-# }
-# ```
-app.route('/', methods = ['DELETE'])
-def missing_description:
-    pass 
\ No newline at end of file
+# #### Missing `completed_at`
+# # If the HTTP request is missing `completed_at`, we should also get this response:
+# # `400 Bad Request`
+# # ```json0️⃣
+# # {
+# #   "details": "Invalid data"
+# # }
+# # ```
\ No newline at end of file
diff --git a/migrations/README b/migrations/README
deleted file mode 100644
index 98e4f9c44..000000000
--- a/migrations/README
+++ /dev/null
@@ -1 +0,0 @@
-Generic single-database configuration.
\ No newline at end of file
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
deleted file mode 100644
index f8ed4801f..000000000
--- a/migrations/alembic.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
deleted file mode 100644
index 8b3fb3353..000000000
--- a/migrations/env.py
+++ /dev/null
@@ -1,96 +0,0 @@
-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
deleted file mode 100644
index 2c0156303..000000000
--- a/migrations/script.py.mako
+++ /dev/null
@@ -1,24 +0,0 @@
-"""${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/32f99ab5f95c_.py b/migrations/versions/32f99ab5f95c_.py
deleted file mode 100644
index 3bc92ee35..000000000
--- a/migrations/versions/32f99ab5f95c_.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""empty message
-
-Revision ID: 32f99ab5f95c
-Revises: 
-Create Date: 2022-11-06 09:55:45.366336
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '32f99ab5f95c'
-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(length=80), nullable=True),
-    sa.Column('description', sa.String(length=80), nullable=True),
-    sa.Column('completed_at', sa.DateTime(), nullable=True),
-    sa.PrimaryKeyConstraint('task_id')
-    )
-    op.create_index(op.f('ix_task_completed_at'), 'task', ['completed_at'], unique=False)
-    op.create_index(op.f('ix_task_description'), 'task', ['description'], unique=False)
-    op.create_index(op.f('ix_task_title'), 'task', ['title'], unique=False)
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_task_title'), table_name='task')
-    op.drop_index(op.f('ix_task_description'), table_name='task')
-    op.drop_index(op.f('ix_task_completed_at'), table_name='task')
-    op.drop_table('task')
-    op.drop_table('goal')
-    # ### end Alembic commands ###
diff --git a/migrations/versions/6164e690559f_.py b/migrations/versions/6164e690559f_.py
deleted file mode 100644
index 3d225238d..000000000
--- a/migrations/versions/6164e690559f_.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""empty message
-
-Revision ID: 6164e690559f
-Revises: 32f99ab5f95c
-Create Date: 2022-11-06 11:24:49.113348
-
-"""
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = '6164e690559f'
-down_revision = '32f99ab5f95c'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('task', sa.Column('Completed On', sa.DateTime(), nullable=True))
-    op.add_column('task', sa.Column('Description', sa.String(length=80), nullable=True))
-    op.add_column('task', sa.Column('Title', sa.String(length=80), nullable=True))
-    op.drop_index('ix_task_completed_at', table_name='task')
-    op.drop_index('ix_task_description', table_name='task')
-    op.drop_index('ix_task_title', table_name='task')
-    op.create_index(op.f('ix_task_Completed On'), 'task', ['Completed On'], unique=False)
-    op.create_index(op.f('ix_task_Description'), 'task', ['Description'], unique=False)
-    op.create_index(op.f('ix_task_Title'), 'task', ['Title'], unique=False)
-    op.drop_column('task', 'description')
-    op.drop_column('task', 'title')
-    op.drop_column('task', 'completed_at')
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('task', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
-    op.add_column('task', sa.Column('title', sa.VARCHAR(length=80), autoincrement=False, nullable=True))
-    op.add_column('task', sa.Column('description', sa.VARCHAR(length=80), autoincrement=False, nullable=True))
-    op.drop_index(op.f('ix_task_Title'), table_name='task')
-    op.drop_index(op.f('ix_task_Description'), table_name='task')
-    op.drop_index(op.f('ix_task_Completed On'), table_name='task')
-    op.create_index('ix_task_title', 'task', ['title'], unique=False)
-    op.create_index('ix_task_description', 'task', ['description'], unique=False)
-    op.create_index('ix_task_completed_at', 'task', ['completed_at'], unique=False)
-    op.drop_column('task', 'Title')
-    op.drop_column('task', 'Description')
-    op.drop_column('task', 'Completed On')
-    # ### end Alembic commands ###
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..35e1d6840 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")
@@ -66,7 +66,7 @@ def test_get_task_not_found(client):
     # *****************************************************************
 
 
-@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 +93,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 +119,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={
@@ -137,7 +137,7 @@ def test_update_task_not_found(client):
     # *****************************************************************
 
 
-@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 +152,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")
@@ -169,7 +169,7 @@ def test_delete_task_not_found(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_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -186,7 +186,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={

From da0f53d4e0bd1e463debf0806c699c8ec7053a4a Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 11 Nov 2022 18:23:28 -0500
Subject: [PATCH 05/34] correct class

---
 app/models/task.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/task.py b/app/models/task.py
index 5d59f816f..72e3ee245 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -5,12 +5,12 @@ class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String(80), index = True, unique = False) 
     description  = db.Column(db.String(80), index = True, unique = False) 
-    is_complete = db.Column(db.DateTime, index = True, unique = False, nullable = True)
+    completed_at = db.Column(db.DateTime, index = True, unique = False, nullable = True)
     
     def build_task_dict(self):
             return {
                 "id": self.id,
                 "title": self.name,
                 "description": self.description,
-                "is_complete": self.is_complete
+                "completed_at": self.completed_at
             }
\ No newline at end of file

From 03de79b13955d489d286a1c6ae7ea264f84c5e58 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sat, 12 Nov 2022 00:25:58 -0500
Subject: [PATCH 06/34] Able to retrive all & individual tasks

---
 app/models/task.py                   | 10 +--
 app/routes.py                        | 29 +++++----
 migrations/README                    |  1 +
 migrations/alembic.ini               | 45 +++++++++++++
 migrations/env.py                    | 96 ++++++++++++++++++++++++++++
 migrations/script.py.mako            | 24 +++++++
 migrations/versions/cf1d8b0de5b9_.py | 45 +++++++++++++
 migrations/versions/f81eec31fc3f_.py | 32 ++++++++++
 8 files changed, 263 insertions(+), 19 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/cf1d8b0de5b9_.py
 create mode 100644 migrations/versions/f81eec31fc3f_.py

diff --git a/app/models/task.py b/app/models/task.py
index 72e3ee245..e8dcc7b61 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -3,14 +3,14 @@
 
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    title = db.Column(db.String(80), index = True, unique = False) 
-    description  = db.Column(db.String(80), index = True, unique = False) 
-    completed_at = db.Column(db.DateTime, index = True, unique = False, nullable = True)
+    title = db.Column(db.String(80)) 
+    description  = db.Column(db.String(80)) 
+    completed_at = db.Column(db.DateTime, unique = False, nullable = True)
     
     def build_task_dict(self):
             return {
                 "id": self.id,
-                "title": self.name,
+                "title": self.title,
                 "description": self.description,
                 "completed_at": self.completed_at
-            }
\ No newline at end of file
+            }
diff --git a/app/routes.py b/app/routes.py
index 5a972d77c..42f2bc0f9 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -16,12 +16,12 @@ def created_task():
     print(request_body)
     created_task = Task(title=request_body["title"],
                 description=request_body["description"],
-            is_complete = date_time)
+            completed_at=request_body["completed_at"])
                         
     db.session.add(created_task)
     db.session.commit()
 
-    return make_response(f"Task {created_task.title} successfully created", 201)
+    return jsonify({"task": created_task.build_task_dict()}), 201
 
 
 def validate_task_id(task_id):
@@ -46,23 +46,23 @@ def query_all():
                 "id": task.task_id,
                 "title": task.title,
                 "description": task.description,
-                "is_complete": task.is_complete
+                "completed_at": bool(task.completed_at)
             })
     print(tasks_lists)
     return jsonify(tasks_lists)
 
-
-
 @tasks_bp.route('/<task_id>', methods=['GET'])
 def one_saved_task(task_id):
-    task = validate_task_id(task_id)
+    # task_validate = validate_task_id(task_id)
+    task = Task.query.get(task_id)
+    print(task_id)
     return {
-            # "id": task.id,
-            "title": task.title,
-            "description": task.description,
-            # "is_complete": task.date_time
-        }
-
+        "id": task.task_id,
+        "title": task.title,
+        "description": task.description
+    }
+    #
+    # print(task)
 
 @tasks_bp.route('/<task_id>', methods=['PUT'])
 def update_tasks(task_id):
@@ -71,7 +71,7 @@ def update_tasks(task_id):
     
     task.title = request_body["title"]
     task.description = request_body["description"]
-    task.is_complete = date_time
+    task.completed_at = request_body["completed_at"]
 
     db.session.commit()
 
@@ -149,4 +149,5 @@ def delete_tasks(task_id):
 # # {
 # #   "details": "Invalid data"
 # # }
-# # ```
\ 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/cf1d8b0de5b9_.py b/migrations/versions/cf1d8b0de5b9_.py
new file mode 100644
index 000000000..3f11917b9
--- /dev/null
+++ b/migrations/versions/cf1d8b0de5b9_.py
@@ -0,0 +1,45 @@
+"""empty message
+
+Revision ID: cf1d8b0de5b9
+Revises: 
+Create Date: 2022-11-11 18:24:46.976383
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'cf1d8b0de5b9'
+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(length=80), nullable=True),
+    sa.Column('description', sa.String(length=80), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('task_id')
+    )
+    op.create_index(op.f('ix_task_completed_at'), 'task', ['completed_at'], unique=False)
+    op.create_index(op.f('ix_task_description'), 'task', ['description'], unique=False)
+    op.create_index(op.f('ix_task_title'), 'task', ['title'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_task_title'), table_name='task')
+    op.drop_index(op.f('ix_task_description'), table_name='task')
+    op.drop_index(op.f('ix_task_completed_at'), table_name='task')
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/f81eec31fc3f_.py b/migrations/versions/f81eec31fc3f_.py
new file mode 100644
index 000000000..1d057803d
--- /dev/null
+++ b/migrations/versions/f81eec31fc3f_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: f81eec31fc3f
+Revises: cf1d8b0de5b9
+Create Date: 2022-11-11 19:07:54.318699
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f81eec31fc3f'
+down_revision = 'cf1d8b0de5b9'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index('ix_task_completed_at', table_name='task')
+    op.drop_index('ix_task_description', table_name='task')
+    op.drop_index('ix_task_title', table_name='task')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index('ix_task_title', 'task', ['title'], unique=False)
+    op.create_index('ix_task_description', 'task', ['description'], unique=False)
+    op.create_index('ix_task_completed_at', 'task', ['completed_at'], unique=False)
+    # ### end Alembic commands ###

From 70bf4c370a60161fc6d0184a4f85a22c2ec64ca3 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sat, 12 Nov 2022 00:29:12 -0500
Subject: [PATCH 07/34] 404 for missing ID finalized

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

diff --git a/app/routes.py b/app/routes.py
index 42f2bc0f9..f05cdb635 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -55,12 +55,14 @@ def query_all():
 def one_saved_task(task_id):
     # task_validate = validate_task_id(task_id)
     task = Task.query.get(task_id)
-    print(task_id)
-    return {
-        "id": task.task_id,
-        "title": task.title,
-        "description": task.description
-    }
+    if task == None:
+        return "The task ID submitted, does not exist: error code 404"
+    else:      
+        return {
+            "id": task.task_id,
+            "title": task.title,
+            "description": task.description
+        }
     #
     # print(task)
 

From 076860cfcbe7a136310920b46c7aba19779ad8b5 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sat, 12 Nov 2022 00:54:04 -0500
Subject: [PATCH 08/34] Successful: Missing title 400 bad request, need to
 update dict

---
 app/routes.py | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index f05cdb635..3e38593c9 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -17,11 +17,15 @@ def created_task():
     created_task = Task(title=request_body["title"],
                 description=request_body["description"],
             completed_at=request_body["completed_at"])
-                        
-    db.session.add(created_task)
-    db.session.commit()
+    
+    if created_task.title == "":
+        return f"{created_task.title}, 400 Bad Request"
+
+    else:
+        db.session.add(created_task)
+        db.session.commit()
 
-    return jsonify({"task": created_task.build_task_dict()}), 201
+        return jsonify({"task": created_task.build_task_dict()}), 201
 
 
 def validate_task_id(task_id):
@@ -77,7 +81,7 @@ def update_tasks(task_id):
 
     db.session.commit()
 
-    return make_response(f"Task {task_id} successfully updated", 201)
+    return make_response(f"Task {task_id} successfully updated", 200)
 
 @tasks_bp.route('/<id>', methods=['DELETE'])
 def delete_tasks(task_id):
@@ -88,21 +92,6 @@ def delete_tasks(task_id):
 
     return make_response(f"Test #{test.id} successfully deleted, 200 OK")
 
-# # Note that the update endpoint does update the `completed_at` attribute. 
-# This will be updated with custom endpoints implemented in Wave 03.
-
-# # ### No matching Task: Get, Update, and Delete
-
-# # and there is no existing task with `task_id`
-
-# # The response code should be `404`.
-
-# # You may choose the response body.
-
-# # Make sure to complete the tests for non-existing tasks to check that the correct response body is returned.
-# @tasks_bp.route('/', methods=['DELETE'])
-# def no_matching_tasks():
-#     pass 
 
 
 # # ### Create a Task: Invalid Task With Missing Data

From 1450c18383cf1a79622330e0a37996a50b070bd8 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sat, 12 Nov 2022 12:05:41 -0500
Subject: [PATCH 09/34] created 404 requests from missing info

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

diff --git a/app/routes.py b/app/routes.py
index 3e38593c9..3fb04a929 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -10,6 +10,7 @@
 now = datetime.now() 
 date_time = now.strftime("%m/%d/%Y, %H:%M:%S")
 
+
 @tasks_bp.route("", methods=['POST'])
 def created_task():
     request_body = request.get_json()
@@ -19,7 +20,14 @@ def created_task():
             completed_at=request_body["completed_at"])
     
     if created_task.title == "":
-        return f"{created_task.title}, 400 Bad Request"
+        return abort(make_response({"message":f"Task {created_task.title} invalid"}, 400))
+
+    elif created_task.description == "":
+        return abort(make_response({"message":f"Task {created_task.description} invalid"}, 400))
+
+
+    elif created_task.completed_at == "":
+        return abort(make_response({"message":f"Task {created_task.completed_at} invalid"}, 400))
 
     else:
         db.session.add(created_task)
@@ -67,8 +75,7 @@ def one_saved_task(task_id):
             "title": task.title,
             "description": task.description
         }
-    #
-    # print(task)
+
 
 @tasks_bp.route('/<task_id>', methods=['PUT'])
 def update_tasks(task_id):
@@ -83,62 +90,14 @@ def update_tasks(task_id):
 
     return make_response(f"Task {task_id} successfully updated", 200)
 
-@tasks_bp.route('/<id>', methods=['DELETE'])
+
+@tasks_bp.route('/<task_id>', methods=['DELETE'])
 def delete_tasks(task_id):
-    test = validate_task_id(task_id)
+    test_task = validate_task_id(task_id)
 
-    db.session.delete(test)
+    db.session.delete(test_task)
     db.session.commit()
 
-    return make_response(f"Test #{test.id} successfully deleted, 200 OK")
-
-
-
-# # ### Create a Task: Invalid Task With Missing Data
-
-# # #### Missing `title`
-
-# # As a client, I want to be able to make a `POST` request to `/tasks` with the following HTTP request body
-
-# # ```json
-# # {
-# #   "description": "Test Description",
-# #   "completed_at": null
-# # }
-# # ```
-
-# # and get this response:
-
-# # `400 Bad Request`
-
-# # ```json
-# # {
-# #   "details": "Invalid data"
-# # }
-# # ```
-
-# # so that I know I did not create a Task that is saved in the database.
-
-# # #### Missing `description` 
-# # If the HTTP request is missing `description`, we should also get this response:
-# # `400 Bad Request`
-
-# # ```json
-# # {
-# #   "details": "Invalid data"
-# # }
-# # ```
-# @tasks_bp.route('/', methods=['DELETE'])
-# def missing_description():
-#     pass 
-
+    return make_response(f"Task #{task_id} successfully deleted, 200 OK")
 
-# #### Missing `completed_at`
-# # If the HTTP request is missing `completed_at`, we should also get this response:
-# # `400 Bad Request`
-# # ```json0️⃣
-# # {
-# #   "details": "Invalid data"
-# # }
-# # ```
 

From 90991f03d66a86adac392fa42539b4f92fc47502 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sat, 12 Nov 2022 14:51:40 -0500
Subject: [PATCH 10/34] Passed 2/3 Wave 1(W/1) tests

---
 app/models/task.py                   |   4 +-
 app/routes.py                        |  32 +--
 migrations/versions/7039fbae1b28_.py |  30 +++
 migrations/versions/bddf6ef63637_.py |  30 +++
 tests/test_wave_01.py                | 300 +++++++++++++--------------
 5 files changed, 231 insertions(+), 165 deletions(-)
 create mode 100644 migrations/versions/7039fbae1b28_.py
 create mode 100644 migrations/versions/bddf6ef63637_.py

diff --git a/app/models/task.py b/app/models/task.py
index e8dcc7b61..8e58c1d5f 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -9,8 +9,8 @@ class Task(db.Model):
     
     def build_task_dict(self):
             return {
-                "id": self.id,
+                "id": self.task_id,
                 "title": self.title,
                 "description": self.description,
-                "completed_at": self.completed_at
+                "is_complete": bool(self.completed_at)
             }
diff --git a/app/routes.py b/app/routes.py
index 3fb04a929..65cde8c84 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -4,12 +4,12 @@
 from app import db
 import json
 from datetime import datetime
+from sqlalchemy import asc, desc
 
 tasks_bp = Blueprint('tasks', __name__, url_prefix="/tasks")
 
-now = datetime.now() 
-date_time = now.strftime("%m/%d/%Y, %H:%M:%S")
-
+# now = datetime.now() 
+# date_time = now.strftime("%m/%d/%Y, %H:%M:%S")
 
 @tasks_bp.route("", methods=['POST'])
 def created_task():
@@ -18,22 +18,23 @@ def created_task():
     created_task = Task(title=request_body["title"],
                 description=request_body["description"],
             completed_at=request_body["completed_at"])
-    
+
     if created_task.title == "":
-        return abort(make_response({"message":f"Task {created_task.title} invalid"}, 400))
+        make_response({"message":f"Task {created_task.title} invalid"}, 400)
 
-    elif created_task.description == "":
-        return abort(make_response({"message":f"Task {created_task.description} invalid"}, 400))
+    if created_task.description == "":
+        return make_response({"message":f"Task {created_task.description} invalid"}, 400)
 
 
-    elif created_task.completed_at == "":
-        return abort(make_response({"message":f"Task {created_task.completed_at} invalid"}, 400))
+    if created_task.completed_at == None:
+        return make_response({"message":f"Task {created_task.complete_at} invalid"}, 400)
 
     else:
         db.session.add(created_task)
         db.session.commit()
-
-        return jsonify({"task": created_task.build_task_dict()}), 201
+    
+    return jsonify({"task": created_task.build_task_dict()}), 201
+    
 
 
 def validate_task_id(task_id):
@@ -52,16 +53,21 @@ def validate_task_id(task_id):
 @tasks_bp.route('', methods=['GET'])
 def query_all():
     all_tasks = Task.query.all()
+
     tasks_lists = []
     for task in all_tasks:
             tasks_lists.append({
                 "id": task.task_id,
                 "title": task.title,
                 "description": task.description,
-                "completed_at": bool(task.completed_at)
+                "is_complete": bool(task.completed_at)
             })
     print(tasks_lists)
     return jsonify(tasks_lists)
+    # query_desc = Task.query.order_by(Task.title.desc())
+    # query_asc = Task.order_by(Task.title.asc())
+
+
 
 @tasks_bp.route('/<task_id>', methods=['GET'])
 def one_saved_task(task_id):
@@ -84,7 +90,7 @@ def update_tasks(task_id):
     
     task.title = request_body["title"]
     task.description = request_body["description"]
-    task.completed_at = request_body["completed_at"]
+    task.is_complete = request_body["is_complete"]
 
     db.session.commit()
 
diff --git a/migrations/versions/7039fbae1b28_.py b/migrations/versions/7039fbae1b28_.py
new file mode 100644
index 000000000..43bc2cb3f
--- /dev/null
+++ b/migrations/versions/7039fbae1b28_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 7039fbae1b28
+Revises: f81eec31fc3f
+Create Date: 2022-11-12 14:12:36.993387
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '7039fbae1b28'
+down_revision = 'f81eec31fc3f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('is_complete', sa.DateTime(), nullable=True))
+    op.drop_column('task', 'completed_at')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.drop_column('task', 'is_complete')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/bddf6ef63637_.py b/migrations/versions/bddf6ef63637_.py
new file mode 100644
index 000000000..17d2b47a0
--- /dev/null
+++ b/migrations/versions/bddf6ef63637_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: bddf6ef63637
+Revises: 7039fbae1b28
+Create Date: 2022-11-12 14:40:26.752660
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'bddf6ef63637'
+down_revision = '7039fbae1b28'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True))
+    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', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.drop_column('task', 'completed_at')
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index 35e1d6840..878f24827 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -51,153 +51,153 @@ def test_get_task(client, one_task):
     }
 
 
-# @pytest.mark.skip(reason="No way to test this feature yet")
-def test_get_task_not_found(client):
-    # Act
-    response = client.get("/tasks/1")
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 404
-
-    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")
-def test_create_task(client):
-    # Act
-    response = client.post("/tasks", json={
-        "title": "A Brand New Task",
-        "description": "Test Description",
-    })
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 201
-    assert "task" in response_body
-    assert response_body == {
-        "task": {
-            "id": 1,
-            "title": "A Brand New Task",
-            "description": "Test Description",
-            "is_complete": False
-        }
-    }
-    new_task = Task.query.get(1)
-    assert new_task
-    assert new_task.title == "A Brand New Task"
-    assert new_task.description == "Test Description"
-    assert new_task.completed_at == None
-
-
-# @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={
-        "title": "Updated Task Title",
-        "description": "Updated Test Description",
-    })
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 200
-    assert "task" in response_body
-    assert response_body == {
-        "task": {
-            "id": 1,
-            "title": "Updated Task Title",
-            "description": "Updated Test Description",
-            "is_complete": False
-        }
-    }
-    task = Task.query.get(1)
-    assert task.title == "Updated Task Title"
-    assert task.description == "Updated Test Description"
-    assert task.completed_at == None
-
-
-# @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={
-        "title": "Updated Task Title",
-        "description": "Updated Test Description",
-    })
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 404
-
-    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")
-def test_delete_task(client, one_task):
-    # Act
-    response = client.delete("/tasks/1")
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 200
-    assert "details" in response_body
-    assert response_body == {
-        "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted'
-    }
-    assert Task.query.get(1) == None
-
-
-# @pytest.mark.skip(reason="No way to test this feature yet")
-def test_delete_task_not_found(client):
-    # Act
-    response = client.delete("/tasks/1")
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
-    assert Task.query.all() == []
-
-
-# @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={
-        "description": "Test Description"
-    })
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 400
-    assert "details" in response_body
-    assert response_body == {
-        "details": "Invalid data"
-    }
-    assert Task.query.all() == []
-
-
-# @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={
-        "title": "A Brand New Task"
-    })
-    response_body = response.get_json()
-
-    # Assert
-    assert response.status_code == 400
-    assert "details" in response_body
-    assert response_body == {
-        "details": "Invalid data"
-    }
-    assert Task.query.all() == []
+# # @pytest.mark.skip(reason="No way to test this feature yet")
+# def test_get_task_not_found(client):
+#     # Act
+#     response = client.get("/tasks/1")
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 404
+
+#     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")
+# def test_create_task(client):
+#     # Act
+#     response = client.post("/tasks", json={
+#         "title": "A Brand New Task",
+#         "description": "Test Description",
+#     })
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 201
+#     assert "task" in response_body
+#     assert response_body == {
+#         "task": {
+#             "id": 1,
+#             "title": "A Brand New Task",
+#             "description": "Test Description",
+#             "is_complete": False
+#         }
+#     }
+#     new_task = Task.query.get(1)
+#     assert new_task
+#     assert new_task.title == "A Brand New Task"
+#     assert new_task.description == "Test Description"
+#     assert new_task.completed_at == None
+
+
+# # @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={
+#         "title": "Updated Task Title",
+#         "description": "Updated Test Description",
+#     })
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 200
+#     assert "task" in response_body
+#     assert response_body == {
+#         "task": {
+#             "id": 1,
+#             "title": "Updated Task Title",
+#             "description": "Updated Test Description",
+#             "is_complete": False
+#         }
+#     }
+#     task = Task.query.get(1)
+#     assert task.title == "Updated Task Title"
+#     assert task.description == "Updated Test Description"
+#     assert task.completed_at == None
+
+
+# # @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={
+#         "title": "Updated Task Title",
+#         "description": "Updated Test Description",
+#     })
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 404
+
+#     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")
+# def test_delete_task(client, one_task):
+#     # Act
+#     response = client.delete("/tasks/1")
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 200
+#     assert "details" in response_body
+#     assert response_body == {
+#         "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted'
+#     }
+#     assert Task.query.get(1) == None
+
+
+# # @pytest.mark.skip(reason="No way to test this feature yet")
+# def test_delete_task_not_found(client):
+#     # Act
+#     response = client.delete("/tasks/1")
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 404
+
+#     raise Exception("Complete test with assertion about response body")
+#     # *****************************************************************
+#     # **Complete test with assertion about response body***************
+#     # *****************************************************************
+
+#     assert Task.query.all() == []
+
+
+# # @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={
+#         "description": "Test Description"
+#     })
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 400
+#     assert "details" in response_body
+#     assert response_body == {
+#         "details": "Invalid data"
+#     }
+#     assert Task.query.all() == []
+
+
+# # @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={
+#         "title": "A Brand New Task"
+#     })
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 400
+#     assert "details" in response_body
+#     assert response_body == {
+#         "details": "Invalid data"
+#     }
+#     assert Task.query.all() == []

From 89b781517f35c8af67b8d7607dec921101be66c9 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Sun, 13 Nov 2022 19:06:21 -0500
Subject: [PATCH 11/34] sort queried started

---
 app/routes.py         |  46 ++++++------
 tests/test_wave_01.py | 164 +++++++++++++++++++++---------------------
 2 files changed, 107 insertions(+), 103 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index 65cde8c84..40b9634f7 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -52,35 +52,39 @@ def validate_task_id(task_id):
 
 @tasks_bp.route('', methods=['GET'])
 def query_all():
-    all_tasks = Task.query.all()
+    query_tasks = Task.query.all()
+    task_sort_query = request.args.get("sort")
 
-    tasks_lists = []
-    for task in all_tasks:
-            tasks_lists.append({
-                "id": task.task_id,
-                "title": task.title,
-                "description": task.description,
-                "is_complete": bool(task.completed_at)
-            })
-    print(tasks_lists)
-    return jsonify(tasks_lists)
-    # query_desc = Task.query.order_by(Task.title.desc())
-    # query_asc = Task.order_by(Task.title.asc())
+    if task_sort_query == "desc":
+        query_tasks = Task.query.order_by(Task.title.desc())
+        return query_tasks
 
+    elif task_sort_query == "asc":
+        query_tasks = query_asc = Task.order_by(Task.title.asc())
+        return query_tasks
+
+    else:
+        tasks_lists = []
+        for task in query_tasks:
+                tasks_lists.append({
+                    "id": task.task_id,
+                    "title": task.title,
+                    "description": task.description,
+                    "is_complete": bool(task.completed_at)
+                })
+        print(tasks_lists)
+        return jsonify(tasks_lists)
+    
 
 
 @tasks_bp.route('/<task_id>', methods=['GET'])
 def one_saved_task(task_id):
-    # task_validate = validate_task_id(task_id)
-    task = Task.query.get(task_id)
-    if task == None:
+    task_validate = validate_task_id(task_id)
+    # task = Task.query.get(task_id)
+    if task_id == None:
         return "The task ID submitted, does not exist: error code 404"
     else:      
-        return {
-            "id": task.task_id,
-            "title": task.title,
-            "description": task.description
-        }
+        return jsonify(Task.build_task_dict())
 
 
 @tasks_bp.route('/<task_id>', methods=['PUT'])
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index 878f24827..1689b3455 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -67,56 +67,56 @@ def test_get_task(client, one_task):
 
 
 # # @pytest.mark.skip(reason="No way to test this feature yet")
-# def test_create_task(client):
-#     # Act
-#     response = client.post("/tasks", json={
-#         "title": "A Brand New Task",
-#         "description": "Test Description",
-#     })
-#     response_body = response.get_json()
+def test_create_task(client):
+    # Act
+    response = client.post("/tasks", json={
+        "title": "A Brand New Task",
+        "description": "Test Description",
+    })
+    response_body = response.get_json()
 
-#     # Assert
-#     assert response.status_code == 201
-#     assert "task" in response_body
-#     assert response_body == {
-#         "task": {
-#             "id": 1,
-#             "title": "A Brand New Task",
-#             "description": "Test Description",
-#             "is_complete": False
-#         }
-#     }
-#     new_task = Task.query.get(1)
-#     assert new_task
-#     assert new_task.title == "A Brand New Task"
-#     assert new_task.description == "Test Description"
-#     assert new_task.completed_at == None
+    # Assert
+    assert response.status_code == 201
+    assert "task" in response_body
+    assert response_body == {
+        "task": {
+            "id": 1,
+            "title": "A Brand New Task",
+            "description": "Test Description",
+            "is_complete": False
+        }
+    }
+    new_task = Task.query.get(1)
+    assert new_task
+    assert new_task.title == "A Brand New Task"
+    assert new_task.description == "Test Description"
+    assert new_task.completed_at == None
 
 
 # # @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={
-#         "title": "Updated Task Title",
-#         "description": "Updated Test Description",
-#     })
-#     response_body = response.get_json()
+def test_update_task(client, one_task):
+    # Act
+    response = client.put("/tasks/1", json={
+        "title": "Updated Task Title",
+        "description": "Updated Test Description",
+    })
+    response_body = response.get_json()
 
-#     # Assert
-#     assert response.status_code == 200
-#     assert "task" in response_body
-#     assert response_body == {
-#         "task": {
-#             "id": 1,
-#             "title": "Updated Task Title",
-#             "description": "Updated Test Description",
-#             "is_complete": False
-#         }
-#     }
-#     task = Task.query.get(1)
-#     assert task.title == "Updated Task Title"
-#     assert task.description == "Updated Test Description"
-#     assert task.completed_at == None
+    # Assert
+    assert response.status_code == 200
+    assert "task" in response_body
+    assert response_body == {
+        "task": {
+            "id": 1,
+            "title": "Updated Task Title",
+            "description": "Updated Test Description",
+            "is_complete": False
+        }
+    }
+    task = Task.query.get(1)
+    assert task.title == "Updated Task Title"
+    assert task.description == "Updated Test Description"
+    assert task.completed_at == None
 
 
 # # @pytest.mark.skip(reason="No way to test this feature yet")
@@ -138,18 +138,18 @@ def test_get_task(client, one_task):
 
 
 # # @pytest.mark.skip(reason="No way to test this feature yet")
-# def test_delete_task(client, one_task):
-#     # Act
-#     response = client.delete("/tasks/1")
-#     response_body = response.get_json()
+def test_delete_task(client, one_task):
+    # Act
+    response = client.delete("/tasks/1")
+    response_body = response.get_json()
 
-#     # Assert
-#     assert response.status_code == 200
-#     assert "details" in response_body
-#     assert response_body == {
-#         "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted'
-#     }
-#     assert Task.query.get(1) == None
+    # Assert
+    assert response.status_code == 200
+    assert "details" in response_body
+    assert response_body == {
+        "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted'
+    }
+    assert Task.query.get(1) == None
 
 
 # # @pytest.mark.skip(reason="No way to test this feature yet")
@@ -170,34 +170,34 @@ def test_get_task(client, one_task):
 
 
 # # @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={
-#         "description": "Test Description"
-#     })
-#     response_body = response.get_json()
+def test_create_task_must_contain_title(client):
+    # Act
+    response = client.post("/tasks", json={
+        "description": "Test Description"
+    })
+    response_body = response.get_json()
 
-#     # Assert
-#     assert response.status_code == 400
-#     assert "details" in response_body
-#     assert response_body == {
-#         "details": "Invalid data"
-#     }
-#     assert Task.query.all() == []
+    # Assert
+    assert response.status_code == 400
+    assert "details" in response_body
+    assert response_body == {
+        "details": "Invalid data"
+    }
+    assert Task.query.all() == []
 
 
 # # @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={
-#         "title": "A Brand New Task"
-#     })
-#     response_body = response.get_json()
+def test_create_task_must_contain_description(client):
+    # Act
+    response = client.post("/tasks", json={
+        "title": "A Brand New Task"
+    })
+    response_body = response.get_json()
 
-#     # Assert
-#     assert response.status_code == 400
-#     assert "details" in response_body
-#     assert response_body == {
-#         "details": "Invalid data"
-#     }
-#     assert Task.query.all() == []
+    # Assert
+    assert response.status_code == 400
+    assert "details" in response_body
+    assert response_body == {
+        "details": "Invalid data"
+    }
+    assert Task.query.all() == []

From a4744effa1d5d4374cc77c2d7d89ab933b0158cc Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Mon, 14 Nov 2022 19:07:36 -0500
Subject: [PATCH 12/34] successful task added

---
 app/routes.py         | 60 ++++++++++++++++++++++++++-----------------
 tests/test_wave_02.py |  4 +--
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index 40b9634f7..e384314cf 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -16,8 +16,8 @@ def created_task():
     request_body = request.get_json()
     print(request_body)
     created_task = Task(title=request_body["title"],
-                description=request_body["description"],
-            completed_at=request_body["completed_at"])
+                description=request_body["description"])
+            # completed_at=request_body["completed_at"])
 
     if created_task.title == "":
         make_response({"message":f"Task {created_task.title} invalid"}, 400)
@@ -52,39 +52,51 @@ def validate_task_id(task_id):
 
 @tasks_bp.route('', methods=['GET'])
 def query_all():
-    query_tasks = Task.query.all()
-    task_sort_query = request.args.get("sort")
+    
+    sort_query = request.args.get("sort")
 
-    if task_sort_query == "desc":
-        query_tasks = Task.query.order_by(Task.title.desc())
-        return query_tasks
+    if sort_query== "desc":
+        query_tasks = query_tasks.order_by(Task.sort.desc())
 
-    elif task_sort_query == "asc":
-        query_tasks = query_asc = Task.order_by(Task.title.asc())
-        return query_tasks
 
-    else:
-        tasks_lists = []
-        for task in query_tasks:
-                tasks_lists.append({
-                    "id": task.task_id,
-                    "title": task.title,
-                    "description": task.description,
-                    "is_complete": bool(task.completed_at)
-                })
-        print(tasks_lists)
-        return jsonify(tasks_lists)
+    elif sort_query == "asc":
+        query_tasks = query_tasks.order_by(Task.sort.asc())
+
+    all_query_tasks = Task.query.all()
+
+    query_lists = []
+    # for task in query_tasks:
+    #         query_lists.append(task.build_task_dict())
+
+    for query in all_query_tasks:
+        query_lists.append({
+            "id":query.task_id,
+            "title":query.title,
+            "description":query.description,
+            "is_complete": bool(query.completed_at)
+        })
+
+        if query.completed_at == False:
+            query.completed_at == None
+
+    print(query_lists)
+    return jsonify(query_lists)
     
 
 
 @tasks_bp.route('/<task_id>', methods=['GET'])
 def one_saved_task(task_id):
     task_validate = validate_task_id(task_id)
+    
     # task = Task.query.get(task_id)
     if task_id == None:
         return "The task ID submitted, does not exist: error code 404"
-    else:      
-        return jsonify(Task.build_task_dict())
+    else:    
+        return {"task": task_validate.build_task_dict()}
+        # query_lists = []
+        # for query in task_validate:
+        #     query_lists.append(task_validate.build_task_dict())
+        # return jsonify(task_validate.build_task_dict())
 
 
 @tasks_bp.route('/<task_id>', methods=['PUT'])
@@ -94,7 +106,7 @@ def update_tasks(task_id):
     
     task.title = request_body["title"]
     task.description = request_body["description"]
-    task.is_complete = request_body["is_complete"]
+    task.is_complete = request_body["completed_at"]
 
     db.session.commit()
 
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index a087e0909..651e3aebd 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -1,7 +1,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_sorted_asc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=asc")
@@ -29,7 +29,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")

From 1513e96b6a666d05d22e2fdbcc2fcbfcb21ff0e0 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Mon, 14 Nov 2022 20:59:08 -0500
Subject: [PATCH 13/34] successfully ran test wave 2 tests

---
 app/routes.py | 54 +++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index e384314cf..f93ba1be9 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -20,14 +20,17 @@ def created_task():
             # completed_at=request_body["completed_at"])
 
     if created_task.title == "":
-        make_response({"message":f"Task {created_task.title} invalid"}, 400)
+        created_task = Task(details=request_body["details"])
+        return created_task
+        # make_response({"message":f"Task {created_task.title} invalid"}, 400)
 
     if created_task.description == "":
-        return make_response({"message":f"Task {created_task.description} invalid"}, 400)
+        return make_response({"details": "Invalid data"}, 400)
+        # return make_response({"message":f"Task {created_task.description} invalid"}, 400)
 
 
-    if created_task.completed_at == None:
-        return make_response({"message":f"Task {created_task.complete_at} invalid"}, 400)
+    # if created_task.completed_at == None:
+    #     return make_response({"message":f"Task {created_task.complete_at} invalid"}, 400)
 
     else:
         db.session.add(created_task)
@@ -54,33 +57,31 @@ def validate_task_id(task_id):
 def query_all():
     
     sort_query = request.args.get("sort")
-
+    
+    query_lists = []
+    
     if sort_query== "desc":
-        query_tasks = query_tasks.order_by(Task.sort.desc())
+        query_tasks = Task.query.order_by(Task.title.desc())
 
 
     elif sort_query == "asc":
-        query_tasks = query_tasks.order_by(Task.sort.asc())
+        query_tasks = Task.query.order_by(Task.title.asc())
 
-    all_query_tasks = Task.query.all()
+    else:
+        query_tasks = Task.query.all()
 
-    query_lists = []
-    # for task in query_tasks:
-    #         query_lists.append(task.build_task_dict())
+    for query in query_tasks:
+        query_lists.append(query.build_task_dict())
 
-    for query in all_query_tasks:
-        query_lists.append({
-            "id":query.task_id,
-            "title":query.title,
-            "description":query.description,
-            "is_complete": bool(query.completed_at)
-        })
+    return jsonify(query_lists), 200
+        #     "is_complete": bool(query.completed_at)
+        # })
 
-        if query.completed_at == False:
-            query.completed_at == None
+        # for task in query_tasks:
+    #         query_lists.append(task.build_task_dict())
 
     print(query_lists)
-    return jsonify(query_lists)
+   
     
 
 
@@ -104,22 +105,29 @@ def update_tasks(task_id):
     task = validate_task_id(task_id)
     request_body = request.get_json()
     
+    task = request_body["task"]
     task.title = request_body["title"]
     task.description = request_body["description"]
     task.is_complete = request_body["completed_at"]
 
     db.session.commit()
 
-    return make_response(f"Task {task_id} successfully updated", 200)
+    return make_response( f"Task {task_id} successfully updated", 200)
+    # return "task": f"Task {task_id} successfully updated", 200)
+    # return make_response("task": f"Task {task_id} successfully updated", 200)
 
 
 @tasks_bp.route('/<task_id>', methods=['DELETE'])
 def delete_tasks(task_id):
     test_task = validate_task_id(task_id)
+    result_notice = {"details": f'Task {task_id} "{test_task.title}" successfully deleted'}
 
     db.session.delete(test_task)
     db.session.commit()
 
-    return make_response(f"Task #{task_id} successfully deleted, 200 OK")
+    return make_response(result_notice, 200)
+
+    #     {"details": 'Task 1 "Go on my daily walk 🏞" successfully deleted'
+    # }
 
 

From 1d92498009d213c87ad62f90c12bfa213e19e208 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Tue, 15 Nov 2022 10:57:13 -0500
Subject: [PATCH 14/34] successfully ran test more  test 1 waves

---
 app/routes.py | 75 +++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index f93ba1be9..bf904814e 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,11 +1,13 @@
-from flask import Blueprint, jsonify, abort, make_response, request
-from os import abort
-from app.models.task import Task
-from app import db
 import json
 from datetime import datetime
+from os import abort
+
+from flask import Blueprint, abort, jsonify, make_response, request
 from sqlalchemy import asc, desc
 
+from app import db
+from app.models.task import Task
+
 tasks_bp = Blueprint('tasks', __name__, url_prefix="/tasks")
 
 # now = datetime.now() 
@@ -13,32 +15,32 @@
 
 @tasks_bp.route("", methods=['POST'])
 def created_task():
-    request_body = request.get_json()
-    print(request_body)
-    created_task = Task(title=request_body["title"],
-                description=request_body["description"])
-            # completed_at=request_body["completed_at"])
-
-    if created_task.title == "":
-        created_task = Task(details=request_body["details"])
-        return created_task
-        # make_response({"message":f"Task {created_task.title} invalid"}, 400)
-
-    if created_task.description == "":
-        return make_response({"details": "Invalid data"}, 400)
+    response_body = request.get_json()
+  
+    if "title" not in response_body or "description" not in response_body:
+        return {"details": "Invalid data"}, 400
+    
+    created_task = Task(title=response_body["title"],
+                description=response_body["description"])
+
+    
+    db.session.add(created_task)
+    db.session.commit()
+    
+    return jsonify(created_task.build_task_dict()), 201
+        # if title is not in response body then return invalid data
+        # if description is not in response body then return invalid datay_tasks.description == "":
+
         # return make_response({"message":f"Task {created_task.description} invalid"}, 400)
 
+  # created_task = Task(title=response_body["title"],
+    #             description=response_body["description"],
+    #         completed_at=response_body["completed_at"])
+
 
     # if created_task.completed_at == None:
     #     return make_response({"message":f"Task {created_task.complete_at} invalid"}, 400)
 
-    else:
-        db.session.add(created_task)
-        db.session.commit()
-    
-    return jsonify({"task": created_task.build_task_dict()}), 201
-    
-
 
 def validate_task_id(task_id):
     try:
@@ -74,15 +76,7 @@ def query_all():
         query_lists.append(query.build_task_dict())
 
     return jsonify(query_lists), 200
-        #     "is_complete": bool(query.completed_at)
-        # })
-
-        # for task in query_tasks:
-    #         query_lists.append(task.build_task_dict())
 
-    print(query_lists)
-   
-    
 
 
 @tasks_bp.route('/<task_id>', methods=['GET'])
@@ -102,17 +96,18 @@ def one_saved_task(task_id):
 
 @tasks_bp.route('/<task_id>', methods=['PUT'])
 def update_tasks(task_id):
-    task = validate_task_id(task_id)
-    request_body = request.get_json()
     
-    task = request_body["task"]
-    task.title = request_body["title"]
-    task.description = request_body["description"]
-    task.is_complete = request_body["completed_at"]
+    validate_id = validate_task_id(task_id)
+
+    response_body = request.get_json()
+    
+    validate_id.title = response_body["title"]
+    validate_id.description = response_body["description"]
+    # validate_id.completed_at = response_body["completed_at"]
 
     db.session.commit()
 
-    return make_response( f"Task {task_id} successfully updated", 200)
+    return jsonify({"task": validate_id.build_task_dict()}),200
     # return "task": f"Task {task_id} successfully updated", 200)
     # return make_response("task": f"Task {task_id} successfully updated", 200)
 
@@ -127,7 +122,5 @@ def delete_tasks(task_id):
 
     return make_response(result_notice, 200)
 
-    #     {"details": 'Task 1 "Go on my daily walk 🏞" successfully deleted'
-    # }
 
 

From f89c2bd1eae466699d470ed14dc48f241bbe0e11 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Tue, 15 Nov 2022 10:57:24 -0500
Subject: [PATCH 15/34] successfully ran test more  test 1 waves

---
 app/routes.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index bf904814e..d0019287f 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -28,19 +28,6 @@ def created_task():
     db.session.commit()
     
     return jsonify(created_task.build_task_dict()), 201
-        # if title is not in response body then return invalid data
-        # if description is not in response body then return invalid datay_tasks.description == "":
-
-        # return make_response({"message":f"Task {created_task.description} invalid"}, 400)
-
-  # created_task = Task(title=response_body["title"],
-    #             description=response_body["description"],
-    #         completed_at=response_body["completed_at"])
-
-
-    # if created_task.completed_at == None:
-    #     return make_response({"message":f"Task {created_task.complete_at} invalid"}, 400)
-
 
 def validate_task_id(task_id):
     try:

From da37206a157ffad72fb23176dcb7ca148d868e08 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Tue, 15 Nov 2022 11:41:44 -0500
Subject: [PATCH 16/34] successfully ran test 1,2 waves

---
 app/routes.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index d0019287f..edb5a1abe 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -10,13 +10,11 @@
 
 tasks_bp = Blueprint('tasks', __name__, url_prefix="/tasks")
 
-# now = datetime.now() 
-# date_time = now.strftime("%m/%d/%Y, %H:%M:%S")
 
 @tasks_bp.route("", methods=['POST'])
 def created_task():
     response_body = request.get_json()
-  
+
     if "title" not in response_body or "description" not in response_body:
         return {"details": "Invalid data"}, 400
     
@@ -27,7 +25,8 @@ def created_task():
     db.session.add(created_task)
     db.session.commit()
     
-    return jsonify(created_task.build_task_dict()), 201
+    return make_response(jsonify({"task": created_task.build_task_dict()})), 201
+
 
 def validate_task_id(task_id):
     try:
@@ -75,10 +74,7 @@ def one_saved_task(task_id):
         return "The task ID submitted, does not exist: error code 404"
     else:    
         return {"task": task_validate.build_task_dict()}
-        # query_lists = []
-        # for query in task_validate:
-        #     query_lists.append(task_validate.build_task_dict())
-        # return jsonify(task_validate.build_task_dict())
+
 
 
 @tasks_bp.route('/<task_id>', methods=['PUT'])
@@ -95,9 +91,7 @@ def update_tasks(task_id):
     db.session.commit()
 
     return jsonify({"task": validate_id.build_task_dict()}),200
-    # return "task": f"Task {task_id} successfully updated", 200)
-    # return make_response("task": f"Task {task_id} successfully updated", 200)
-
+    
 
 @tasks_bp.route('/<task_id>', methods=['DELETE'])
 def delete_tasks(task_id):

From 13826716b46e1a67ce71ab1975761559b2988300 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Wed, 16 Nov 2022 15:34:49 -0500
Subject: [PATCH 17/34] added custom endpoints for both Patch scenarios

---
 app/routes.py         | 38 +++++++++++++++++++++++++++++++++++++-
 tests/test_wave_03.py | 12 ++++++------
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index edb5a1abe..afe9cc743 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -76,7 +76,6 @@ def one_saved_task(task_id):
         return {"task": task_validate.build_task_dict()}
 
 
-
 @tasks_bp.route('/<task_id>', methods=['PUT'])
 def update_tasks(task_id):
     
@@ -103,5 +102,42 @@ def delete_tasks(task_id):
 
     return make_response(result_notice, 200)
 
+@tasks_bp.route('/<task_id>/<mark_complete>', methods=['PATCH'])
+def patch_tasks(task_id):
+    test_task = validate_task_id(task_id)
+    response_body = request.get_json()
+
+    if "completed_at" in response_body and "completed_at" == True:
+        db.session.commit()
+
+    if "completed_at" in response_body and "completed_at" == False:
+        db.session.commit()
+    
+    if "completed_at" in response_body and "completed_at" == None:
+        db.session.commit()
+
+    if "completed_at" not in response_body and "title" not in response_body and "description" not in response_body:
+        return "404 Not Found"
+        
+
+    return make_response(response_body, 200)
+
+@tasks_bp.route('/<task_id>/<mark_incomplete>', methods=['PATCH'])
+def patch_tasks(task_id):
+    test_task = validate_task_id(task_id)
+    response_body = request.get_json()
+
+    if "completed_at" in response_body and "completed_at" == True:
+        db.session.commit()
+
+    if "completed_at" in response_body and "completed_at" == False:
+        db.session.commit()
+    
+    if "completed_at" in response_body and "completed_at" == None:
+        db.session.commit()
 
+    if "completed_at" not in response_body and "title" not in response_body and "description" not in response_body:
+        return "404 Not Found"
+        
 
+    return make_response(response_body, 200)
\ No newline at end of file
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 32d379822..9233073df 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")
@@ -134,7 +134,7 @@ def test_mark_complete_missing_task(client):
     # *****************************************************************
 
 
-@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")

From 7f5d681f9f5b30ab0ae4d72150f388de4c1315f8 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Wed, 16 Nov 2022 23:19:06 -0500
Subject: [PATCH 18/34] added goal dict and routes

---
 app/goal_routes.py                            | 133 ++++++++++++++++++
 app/models/goal.py                            |   7 +
 app/routes.py                                 |  57 +++-----
 ...0bf26_added_more_variables_to_the_class.py |  32 +++++
 tests/test_wave_03.py                         |   7 +-
 tests/test_wave_05.py                         |  10 +-
 6 files changed, 204 insertions(+), 42 deletions(-)
 create mode 100644 app/goal_routes.py
 create mode 100644 migrations/versions/08d90f10bf26_added_more_variables_to_the_class.py

diff --git a/app/goal_routes.py b/app/goal_routes.py
new file mode 100644
index 000000000..84f57384f
--- /dev/null
+++ b/app/goal_routes.py
@@ -0,0 +1,133 @@
+import json
+import datetime
+from os import abort
+
+from flask import Blueprint, abort, jsonify, make_response, request
+from sqlalchemy import asc, desc
+
+from app import db
+from app.models.goal import Goal
+
+goals_bp = Blueprint('goals', __name__, url_prefix="/goals")
+
+
+
+
+@goals_bp.route("", methods=['POST'])
+def created_goal():
+    response_body = request.get_json()
+
+    if "title" not in response_body:
+        return {"details": "Invalid data"}, 400
+    
+    created_goal = Goal(title=response_body["title"])
+
+    db.session.add(created_goal)
+    db.session.commit()
+    
+    return make_response(jsonify({"goal": created_goal.build_goal_dict()})), 201
+
+
+def validate_goal_id(goal_id):
+    try:
+        goal_id = int(goal_id)
+    except:
+        abort(make_response({"message":f"Goal {goal_id} invalid"}, 400))
+
+    goal = goal.query.get(goal_id)
+
+    if not goal:
+        abort(make_response({"message":f"Goal {goal_id} not found"}, 404))
+
+    return goal
+
+
+@goals_bp.route('/<goal_id>', methods=['GET'])
+def one_saved_goal(goal_id):
+    goal_validate = validate_goal_id(goal_id)
+    
+    # goal = goal.query.get(goal_id)
+    if goal_id == None:
+        return "The goal ID submitted, does not exist: error code 404"
+    else:    
+        return {"goal": goal_validate.build_goal_dict()}
+
+
+@goals_bp.route('', methods=['GET'])
+def query_all():
+    
+    sort_query = request.args.get("sort")
+    
+    query_lists = []
+    
+    if sort_query== "desc":
+        query_goals = Goal.query.order_by(Goal.title.desc())
+
+
+    elif sort_query == "asc":
+        query_goals = Goal.query.order_by(Goal.title.asc())
+
+    else:
+        query_goals = Goal.query.all()
+
+    for query in query_goals:
+        query_lists.append(query.build_goal_dict())
+
+    return jsonify(query_lists), 200
+
+
+
+
+
+@goals_bp.route('/<goal_id>', methods=['PUT'])
+def update_goals(goal_id):
+    
+    validate_id = validate_goal_id(goal_id)
+
+    response_body = request.get_json()
+    
+    validate_id.title = response_body["title"]
+    validate_id.description = response_body["description"]
+
+
+    db.session.commit()
+
+    return jsonify({"goal": validate_id.build_goal_dict()}),200
+    
+
+@goals_bp.route('/<goal_id>', methods=['DELETE'])
+def delete_goals(goal_id):
+    test_goal = validate_goal_id(goal_id)
+    result_notice = {"details": f'Goal {goal_id} "{test_goal.title}" successfully deleted'}
+
+    db.session.delete(test_goal)
+    db.session.commit()
+
+    return make_response(result_notice, 200)
+
+@goals_bp.route('/<goal_id>/mark_complete', methods=['PATCH'])
+def mark_complete_on_incomplete_goal(goal_id):
+    test_goal = validate_goal_id(goal_id)
+    test_goal.completed_at = datetime.datetime.today()
+    test_goal.is_complete = True
+    db.session.commit()
+    print(test_goal.completed_at)
+
+    return make_response({"goal": {
+            "id": test_goal.goal_id,
+            "title": test_goal.title, 
+            "description":test_goal.description, 
+            "is_complete": test_goal.is_complete}}), 200
+
+@goals_bp.route('/<goal_id>/mark_incomplete', methods=['PATCH'])
+def mark_incomplete_on_complete_goal(goal_id):
+    test_goal = validate_goal_id(goal_id)
+    test_goal.completed_at = None
+    test_goal.is_complete = False
+    db.session.commit()
+
+    return make_response({"goal": {
+            "id": test_goal.goal_id,
+            "title": test_goal.title, 
+            "description":test_goal.description, 
+            "is_complete": test_goal.is_complete}}), 200
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..e5a0c9d8c 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,3 +3,10 @@
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    goal_title = db.Column(db.String(80)) 
+
+        
+    def goal_dict(self):
+            return {
+                "id": self.task_id,
+                "title": self.title}
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index afe9cc743..ae8117cfd 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,5 +1,5 @@
 import json
-from datetime import datetime
+import datetime
 from os import abort
 
 from flask import Blueprint, abort, jsonify, make_response, request
@@ -102,42 +102,29 @@ def delete_tasks(task_id):
 
     return make_response(result_notice, 200)
 
-@tasks_bp.route('/<task_id>/<mark_complete>', methods=['PATCH'])
-def patch_tasks(task_id):
+@tasks_bp.route('/<task_id>/mark_complete', methods=['PATCH'])
+def mark_complete_on_incomplete_task(task_id):
     test_task = validate_task_id(task_id)
-    response_body = request.get_json()
-
-    if "completed_at" in response_body and "completed_at" == True:
-        db.session.commit()
-
-    if "completed_at" in response_body and "completed_at" == False:
-        db.session.commit()
-    
-    if "completed_at" in response_body and "completed_at" == None:
-        db.session.commit()
-
-    if "completed_at" not in response_body and "title" not in response_body and "description" not in response_body:
-        return "404 Not Found"
-        
+    test_task.completed_at = datetime.datetime.today()
+    test_task.is_complete = True
+    db.session.commit()
+    print(test_task.completed_at)
 
-    return make_response(response_body, 200)
+    return make_response({"task": {
+            "id": test_task.task_id,
+            "title": test_task.title, 
+            "description":test_task.description, 
+            "is_complete": test_task.is_complete}}), 200
 
-@tasks_bp.route('/<task_id>/<mark_incomplete>', methods=['PATCH'])
-def patch_tasks(task_id):
+@tasks_bp.route('/<task_id>/mark_incomplete', methods=['PATCH'])
+def mark_incomplete_on_complete_task(task_id):
     test_task = validate_task_id(task_id)
-    response_body = request.get_json()
-
-    if "completed_at" in response_body and "completed_at" == True:
-        db.session.commit()
-
-    if "completed_at" in response_body and "completed_at" == False:
-        db.session.commit()
-    
-    if "completed_at" in response_body and "completed_at" == None:
-        db.session.commit()
-
-    if "completed_at" not in response_body and "title" not in response_body and "description" not in response_body:
-        return "404 Not Found"
-        
+    test_task.completed_at = None
+    test_task.is_complete = False
+    db.session.commit()
 
-    return make_response(response_body, 200)
\ No newline at end of file
+    return make_response({"task": {
+            "id": test_task.task_id,
+            "title": test_task.title, 
+            "description":test_task.description, 
+            "is_complete": test_task.is_complete}}), 200
\ No newline at end of file
diff --git a/migrations/versions/08d90f10bf26_added_more_variables_to_the_class.py b/migrations/versions/08d90f10bf26_added_more_variables_to_the_class.py
new file mode 100644
index 000000000..b9acc7b3c
--- /dev/null
+++ b/migrations/versions/08d90f10bf26_added_more_variables_to_the_class.py
@@ -0,0 +1,32 @@
+"""added more variables to the class
+
+Revision ID: 08d90f10bf26
+Revises: bddf6ef63637
+Create Date: 2022-11-16 23:05:26.972666
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '08d90f10bf26'
+down_revision = 'bddf6ef63637'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('completed_at', sa.DateTime(), nullable=True))
+    op.add_column('goal', sa.Column('description', sa.String(length=80), nullable=True))
+    op.add_column('goal', sa.Column('goal_title', sa.String(length=80), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('goal', 'goal_title')
+    op.drop_column('goal', 'description')
+    op.drop_column('goal', 'completed_at')
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 9233073df..48b7e9f58 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -128,7 +128,8 @@ def test_mark_complete_missing_task(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': 'Task 1 not found'}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
@@ -143,7 +144,9 @@ def test_mark_incomplete_missing_task(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': 'Task 1 not found'}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..26d37fc4f 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,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_goals_no_saved_goals(client):
     # Act
     response = client.get("/goals")
@@ -12,7 +12,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 +29,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")
@@ -61,7 +61,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={
@@ -144,7 +144,7 @@ def test_delete_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_create_goal_missing_title(client):
     # Act
     response = client.post("/goals", json={})

From ec02fee77d6262f6087644beb353bbc23221d010 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Wed, 16 Nov 2022 23:26:10 -0500
Subject: [PATCH 19/34] added CRUD routes, tests are not working

---
 app/goal_routes.py | 34 +---------------------------------
 app/models/goal.py |  2 +-
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/app/goal_routes.py b/app/goal_routes.py
index 84f57384f..a6ada14ab 100644
--- a/app/goal_routes.py
+++ b/app/goal_routes.py
@@ -11,8 +11,6 @@
 goals_bp = Blueprint('goals', __name__, url_prefix="/goals")
 
 
-
-
 @goals_bp.route("", methods=['POST'])
 def created_goal():
     response_body = request.get_json()
@@ -25,8 +23,7 @@ def created_goal():
     db.session.add(created_goal)
     db.session.commit()
     
-    return make_response(jsonify({"goal": created_goal.build_goal_dict()})), 201
-
+    return make_response(jsonify({"goal": created_goal.build_goal_dict()})), 200
 
 def validate_goal_id(goal_id):
     try:
@@ -77,8 +74,6 @@ def query_all():
 
 
 
-
-
 @goals_bp.route('/<goal_id>', methods=['PUT'])
 def update_goals(goal_id):
     
@@ -104,30 +99,3 @@ def delete_goals(goal_id):
     db.session.commit()
 
     return make_response(result_notice, 200)
-
-@goals_bp.route('/<goal_id>/mark_complete', methods=['PATCH'])
-def mark_complete_on_incomplete_goal(goal_id):
-    test_goal = validate_goal_id(goal_id)
-    test_goal.completed_at = datetime.datetime.today()
-    test_goal.is_complete = True
-    db.session.commit()
-    print(test_goal.completed_at)
-
-    return make_response({"goal": {
-            "id": test_goal.goal_id,
-            "title": test_goal.title, 
-            "description":test_goal.description, 
-            "is_complete": test_goal.is_complete}}), 200
-
-@goals_bp.route('/<goal_id>/mark_incomplete', methods=['PATCH'])
-def mark_incomplete_on_complete_goal(goal_id):
-    test_goal = validate_goal_id(goal_id)
-    test_goal.completed_at = None
-    test_goal.is_complete = False
-    db.session.commit()
-
-    return make_response({"goal": {
-            "id": test_goal.goal_id,
-            "title": test_goal.title, 
-            "description":test_goal.description, 
-            "is_complete": test_goal.is_complete}}), 200
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index e5a0c9d8c..41d4f9e00 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,7 +3,7 @@
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
-    goal_title = db.Column(db.String(80)) 
+    title = db.Column(db.String(80)) 
 
         
     def goal_dict(self):

From b862d434a0a655f2f62657521e121c5aff808ba6 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Mon, 21 Nov 2022 10:36:13 -0500
Subject: [PATCH 20/34] review database setup

---
 app/__init__.py                      |  3 ++-
 app/goal_routes.py                   | 10 ++++----
 app/models/goal.py                   | 12 +++++++---
 app/models/task.py                   | 11 ++++++++-
 migrations/versions/17069dd1dc5c_.py | 34 ++++++++++++++++++++++++++++
 tests/test_wave_01.py                | 30 ++++++++++++------------
 tests/test_wave_05.py                | 23 ++++++++++---------
 tests/test_wave_06.py                | 10 ++++----
 8 files changed, 92 insertions(+), 41 deletions(-)
 create mode 100644 migrations/versions/17069dd1dc5c_.py

diff --git a/app/__init__.py b/app/__init__.py
index 7e1eef0e4..cf86ba8a9 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -30,6 +30,7 @@ def create_app(test_config=None):
 
     # Register Blueprints here
     from app.routes import tasks_bp
+    from app.goal_routes import goals_bp
     app.register_blueprint(tasks_bp)
-
+    app.register_blueprint(goals_bp)
     return app
diff --git a/app/goal_routes.py b/app/goal_routes.py
index a6ada14ab..c40d6d0f5 100644
--- a/app/goal_routes.py
+++ b/app/goal_routes.py
@@ -23,7 +23,7 @@ def created_goal():
     db.session.add(created_goal)
     db.session.commit()
     
-    return make_response(jsonify({"goal": created_goal.build_goal_dict()})), 200
+    return make_response(jsonify({"goal": created_goal.goal_dict()})), 201
 
 def validate_goal_id(goal_id):
     try:
@@ -31,7 +31,7 @@ def validate_goal_id(goal_id):
     except:
         abort(make_response({"message":f"Goal {goal_id} invalid"}, 400))
 
-    goal = goal.query.get(goal_id)
+    goal = Goal.query.get(goal_id)
 
     if not goal:
         abort(make_response({"message":f"Goal {goal_id} not found"}, 404))
@@ -47,7 +47,7 @@ def one_saved_goal(goal_id):
     if goal_id == None:
         return "The goal ID submitted, does not exist: error code 404"
     else:    
-        return {"goal": goal_validate.build_goal_dict()}
+        return {"goal": goal_validate.goal_dict()}
 
 
 @goals_bp.route('', methods=['GET'])
@@ -68,7 +68,7 @@ def query_all():
         query_goals = Goal.query.all()
 
     for query in query_goals:
-        query_lists.append(query.build_goal_dict())
+        query_lists.append(query.goal_dict())
 
     return jsonify(query_lists), 200
 
@@ -87,7 +87,7 @@ def update_goals(goal_id):
 
     db.session.commit()
 
-    return jsonify({"goal": validate_id.build_goal_dict()}),200
+    return jsonify({"goal": validate_id.goal_dict()}),200
     
 
 @goals_bp.route('/<goal_id>', methods=['DELETE'])
diff --git a/app/models/goal.py b/app/models/goal.py
index 41d4f9e00..91ccc413e 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -4,9 +4,15 @@
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
     title = db.Column(db.String(80)) 
+    task_rel = db.relationship("Task", back_populates="task",lazy='True')
+    task_id = db.Column(db.Integer, db.ForeignKey('task.id')) 
 
-        
     def goal_dict(self):
             return {
-                "id": self.task_id,
-                "title": self.title}
\ No newline at end of file
+                "id": self.goal_id,
+                "title": self.title}
+    
+    @classmethod
+    def from_dict(cls, book_data):
+        new_Goal = Goal(title=book_data["title"])
+        return new_Goal
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 8e58c1d5f..707fbcf9a 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -6,7 +6,9 @@ class Task(db.Model):
     title = db.Column(db.String(80)) 
     description  = db.Column(db.String(80)) 
     completed_at = db.Column(db.DateTime, unique = False, nullable = True)
-    
+    goal_rel = db.relationship("Goal", back_populates="goal",lazy='True')
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id')) 
+
     def build_task_dict(self):
             return {
                 "id": self.task_id,
@@ -14,3 +16,10 @@ def build_task_dict(self):
                 "description": self.description,
                 "is_complete": bool(self.completed_at)
             }
+
+    @classmethod
+    def from_dict(cls, book_data):
+        new_Task = Task(title=book_data["title"],
+                        description=book_data["description"],
+                        is_complete=bool["completed_at"])
+        return new_Task
\ No newline at end of file
diff --git a/migrations/versions/17069dd1dc5c_.py b/migrations/versions/17069dd1dc5c_.py
new file mode 100644
index 000000000..2591e373e
--- /dev/null
+++ b/migrations/versions/17069dd1dc5c_.py
@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: 17069dd1dc5c
+Revises: 08d90f10bf26
+Create Date: 2022-11-21 09:59:35.100729
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '17069dd1dc5c'
+down_revision = '08d90f10bf26'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('title', sa.String(length=80), nullable=True))
+    op.drop_column('goal', 'goal_title')
+    op.drop_column('goal', 'completed_at')
+    op.drop_column('goal', 'description')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('description', sa.VARCHAR(length=80), autoincrement=False, nullable=True))
+    op.add_column('goal', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.add_column('goal', sa.Column('goal_title', sa.VARCHAR(length=80), autoincrement=False, nullable=True))
+    op.drop_column('goal', 'title')
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index 1689b3455..9ed9b62f2 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -119,22 +119,22 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-# # @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={
-#         "title": "Updated Task Title",
-#         "description": "Updated Test Description",
-#     })
-#     response_body = response.get_json()
-
-#     # Assert
-#     assert response.status_code == 404
+# @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={
+        "title": "Updated Task Title",
+        "description": "Updated Test Description",
+    })
+    response_body = response.get_json()
 
-#     raise Exception("Complete test with assertion about response body")
-#     # *****************************************************************
-#     # **Complete test with assertion about response body***************
-#     # *****************************************************************
+    # Assert
+    assert response.status_code == 404
+    assert Task.query.get(1) == None
+    # 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")
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 26d37fc4f..c9b583a0c 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -80,7 +80,7 @@ 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")
     # Act
@@ -94,7 +94,7 @@ def test_update_goal(client, one_goal):
     # ---- 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")
     # Act
@@ -107,7 +107,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")
@@ -130,18 +130,19 @@ def test_delete_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_delete_goal_not_found(client):
-    raise Exception("Complete test")
-
+    # raise Exception("Complete test")
     # Act
-    # ---- Complete Act Here ----
+    response = client.post("/goals", json={})
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 400
+    assert response_body == {
+        "details": "Invalid data"
+    }
+
 
 
 # @pytest.mark.skip(reason="No way to test this feature yet")
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..ebfcbac67 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={
@@ -57,7 +57,7 @@ def test_get_tasks_for_specific_goal_no_goal(client):
     # *****************************************************************
 
 
-@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()

From f376660d48752ca42b5f7de8ae2856ea7112286a Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Mon, 21 Nov 2022 15:02:26 -0500
Subject: [PATCH 21/34] updated read_one and read_all

---
 app/models/goal.py |  2 +-
 app/routes.py      | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/models/goal.py b/app/models/goal.py
index 91ccc413e..fc4d3a472 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -4,7 +4,7 @@
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
     title = db.Column(db.String(80)) 
-    task_rel = db.relationship("Task", back_populates="task",lazy='True')
+    task_rel = db.relationship("Task", backref="task",lazy='True')
     task_id = db.Column(db.Integer, db.ForeignKey('task.id')) 
 
     def goal_dict(self):
diff --git a/app/routes.py b/app/routes.py
index ae8117cfd..459052155 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -48,6 +48,20 @@ def query_all():
     
     query_lists = []
     
+       
+    title_query = request.args.get("title")
+    if title_query:
+        books = Book.query.filter_by(title=title_query)
+    else:
+        books = Book.query.all()
+
+    books_response = []
+    for book in books:
+        books_response.append(book.to_dict())
+    return jsonify(books_response)
+
+
+
     if sort_query== "desc":
         query_tasks = Task.query.order_by(Task.title.desc())
 

From 70a56d210344b6e6be429a3dd3a4c46290e90cb7 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Mon, 28 Nov 2022 21:58:57 -0500
Subject: [PATCH 22/34] updated get task route

---
 app/routes.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index 459052155..ae8117cfd 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -48,20 +48,6 @@ def query_all():
     
     query_lists = []
     
-       
-    title_query = request.args.get("title")
-    if title_query:
-        books = Book.query.filter_by(title=title_query)
-    else:
-        books = Book.query.all()
-
-    books_response = []
-    for book in books:
-        books_response.append(book.to_dict())
-    return jsonify(books_response)
-
-
-
     if sort_query== "desc":
         query_tasks = Task.query.order_by(Task.title.desc())
 

From 0a78860835e6d6c7abdf6ef178461d5c6965af52 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Mon, 28 Nov 2022 22:30:37 -0500
Subject: [PATCH 23/34] registerd init blueprint update

---
 app/__init__.py    | 4 ++++
 app/goal_routes.py | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index cf86ba8a9..5493d4393 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -33,4 +33,8 @@ def create_app(test_config=None):
     from app.goal_routes import goals_bp
     app.register_blueprint(tasks_bp)
     app.register_blueprint(goals_bp)
+
+    from app.models.goal import Goal
+    from app.models.task import Task
+    
     return app
diff --git a/app/goal_routes.py b/app/goal_routes.py
index c40d6d0f5..88fafd930 100644
--- a/app/goal_routes.py
+++ b/app/goal_routes.py
@@ -25,16 +25,16 @@ def created_goal():
     
     return make_response(jsonify({"goal": created_goal.goal_dict()})), 201
 
-def validate_goal_id(goal_id):
+def validate_goal_id(cls, goal_id):
     try:
         goal_id = int(goal_id)
     except:
-        abort(make_response({"message":f"Goal {goal_id} invalid"}, 400))
+        abort(make_response({"message":f"{cls.__name__} {goal_id} invalid"}, 400))
 
     goal = Goal.query.get(goal_id)
 
     if not goal:
-        abort(make_response({"message":f"Goal {goal_id} not found"}, 404))
+        abort(make_response({"message":f"{cls.__name__} {goal_id} not found"}, 404))
 
     return goal
 
@@ -43,7 +43,8 @@ def validate_goal_id(goal_id):
 def one_saved_goal(goal_id):
     goal_validate = validate_goal_id(goal_id)
     
-    # goal = goal.query.get(goal_id)
+    goal_response = [goal_routes.todict() for goal in goals]
+
     if goal_id == None:
         return "The goal ID submitted, does not exist: error code 404"
     else:    

From e9252cb6b61560a66c5bc6a6374074445a6bc105 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 16 Dec 2022 20:13:18 -0500
Subject: [PATCH 24/34] updated tests

---
 app/goal_routes.py    | 77 +++++++++++++++++++++++++++++++++----------
 app/models/goal.py    |  8 ++---
 app/models/task.py    |  6 ++--
 requirements.txt      |  7 ++--
 tests/test_wave_01.py | 46 ++++++++++++++------------
 tests/test_wave_03.py |  4 +--
 tests/test_wave_05.py |  1 +
 7 files changed, 99 insertions(+), 50 deletions(-)

diff --git a/app/goal_routes.py b/app/goal_routes.py
index 88fafd930..2529d0135 100644
--- a/app/goal_routes.py
+++ b/app/goal_routes.py
@@ -7,31 +7,18 @@
 
 from app import db
 from app.models.goal import Goal
+from app.models.task import Task
 
 goals_bp = Blueprint('goals', __name__, url_prefix="/goals")
 
 
-@goals_bp.route("", methods=['POST'])
-def created_goal():
-    response_body = request.get_json()
-
-    if "title" not in response_body:
-        return {"details": "Invalid data"}, 400
-    
-    created_goal = Goal(title=response_body["title"])
-
-    db.session.add(created_goal)
-    db.session.commit()
-    
-    return make_response(jsonify({"goal": created_goal.goal_dict()})), 201
-
 def validate_goal_id(cls, goal_id):
     try:
         goal_id = int(goal_id)
     except:
-        abort(make_response({"message":f"{cls.__name__} {goal_id} invalid"}, 400))
+        abort(make_response({"message":f"{cls.__name__} {goal_id} invalid"},400))
 
-    goal = Goal.query.get(goal_id)
+    goal = cls.query.get(goal_id)
 
     if not goal:
         abort(make_response({"message":f"{cls.__name__} {goal_id} not found"}, 404))
@@ -39,18 +26,72 @@ def validate_goal_id(cls, goal_id):
     return goal
 
 
+@goals_bp.route('/<goal_id>', methods=['GET'])
+def no_saved_goal(goal_id):
+    goal_validate = validate_goal_id(goal_id)
+    
+    goal_response = []
+    # goal.todict() for goal in Goal
+
+    if goal_response is None:
+        return "The goal ID submitted, does not exist: error code 404"
+    else:    
+        return jsonify({goal_validate.goal_dict()}),200 
+
 @goals_bp.route('/<goal_id>', methods=['GET'])
 def one_saved_goal(goal_id):
     goal_validate = validate_goal_id(goal_id)
     
-    goal_response = [goal_routes.todict() for goal in goals]
+    goal_response = [goal.todict() for goal in Goal]
 
     if goal_id == None:
         return "The goal ID submitted, does not exist: error code 404"
     else:    
-        return {"goal": goal_validate.goal_dict()}
+        return jsonify({goal_validate.goal_dict()}), 
 
 
+@goals_bp.route('/<goal_id>', methods=['GET'])
+def get_goal():
+    goal_validate = validate_goal_id()
+    
+    goal_response = [goal.todict() for goal in Goal]
+
+    if goal_validate == None:
+        return "The goal ID submitted, does not exist: error code 404"
+    else:    
+        return jsonify({"goal": goal_validate.goal_dict()}), 200
+
+@goals_bp.route("", methods=['POST'])
+def create_goal():
+    response_body = request.get_json()
+
+    if "title" not in response_body:
+        return jsonify({"details": "Invalid data"}), 400
+    
+    created_goal = Goal(title=response_body["title"])
+
+    # new_goal.goal = Goal
+
+    db.session.add(created_goal)
+    db.session.commit()
+    
+    return jsonify({"goal": created_goal.goal_dict()}), 201
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=['GET'])
+def goal_not_found(goal_id):
+    response_body = request.get_json()
+    print(response_body)
+
+    goal = validate_goal_id
+
+    if not goal:
+        return "The goal ID submitted, does not exist: error code 404"
+    else:    
+        return jsonify({"goal": goal.goal_dict()}), 200
+    
+    # return make_response(jsonify({"goal": created_goal.goal_dict()}))
+
 @goals_bp.route('', methods=['GET'])
 def query_all():
     
diff --git a/app/models/goal.py b/app/models/goal.py
index fc4d3a472..39e80036d 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,9 +2,9 @@
 
 
 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(80)) 
-    task_rel = db.relationship("Task", backref="task",lazy='True')
+    task_rel = db.relationship("Task", backref="goal",lazy=True)
     task_id = db.Column(db.Integer, db.ForeignKey('task.id')) 
 
     def goal_dict(self):
@@ -13,6 +13,6 @@ def goal_dict(self):
                 "title": self.title}
     
     @classmethod
-    def from_dict(cls, book_data):
-        new_Goal = Goal(title=book_data["title"])
+    def from_dict(cls, goal_data):
+        new_Goal = Goal(title=goal_data["title"])
         return new_Goal
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 707fbcf9a..43c41952e 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -18,8 +18,8 @@ def build_task_dict(self):
             }
 
     @classmethod
-    def from_dict(cls, book_data):
-        new_Task = Task(title=book_data["title"],
-                        description=book_data["description"],
+    def from_dict(cls, task_data):
+        new_Task = Task(title=task_data["title"],
+                        description=task_data["description"],
                         is_complete=bool["completed_at"])
         return new_Task
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index cacdbc36e..4cfd2f584 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,9 @@ blinker==1.4
 certifi==2020.12.5
 chardet==4.0.0
 click==7.1.2
+coverage==6.3.3
 Flask==1.1.2
+Flask-Cors==3.0.10
 Flask-Migrate==2.6.0
 Flask-SQLAlchemy==2.4.4
 gunicorn==20.1.0
@@ -15,13 +17,14 @@ itsdangerous==1.1.0
 Jinja2==2.11.3
 Mako==1.1.4
 MarkupSafe==1.1.1
+mypy @ git+https://github.com/python/mypy.git@abc9d155ffbd9ea160eec0b57c450cdf7e53ce39
+mypy-extensions==0.4.3
 packaging==20.9
 pluggy==0.13.1
-psycopg2-binary==2.9.4
 py==1.10.0
 pycodestyle==2.6.0
 pyparsing==2.4.7
-pytest==7.1.1
+pytest==6.2.3
 pytest-cov==2.12.1
 python-dateutil==2.8.1
 python-dotenv==0.15.0
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index 9ed9b62f2..7826b3b4e 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -52,18 +52,20 @@ def test_get_task(client, one_task):
 
 
 # # @pytest.mark.skip(reason="No way to test this feature yet")
-# def test_get_task_not_found(client):
-#     # Act
-#     response = client.get("/tasks/1")
-#     response_body = response.get_json()
+def test_get_task_not_found(client):
+    # Act
+    response = client.get("/tasks/1")
+    response_body = response.get_json()
 
-#     # Assert
-#     assert response.status_code == 404
+    # Assert
+    assert response.status_code == 404
 
-#     raise Exception("Complete test with assertion about response body")
-#     # *****************************************************************
-#     # **Complete test with assertion about response body***************
-#     # *****************************************************************
+    assert response_body == None
+
+    # 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")
@@ -153,20 +155,22 @@ def test_delete_task(client, one_task):
 
 
 # # @pytest.mark.skip(reason="No way to test this feature yet")
-# def test_delete_task_not_found(client):
-#     # Act
-#     response = client.delete("/tasks/1")
-#     response_body = response.get_json()
+def test_delete_task_not_found(client):
+    # Act
+    response = client.delete("/tasks/1")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 404
+    assert Task.query.all() == []
+    assert response_body == None
 
-#     # Assert
-#     assert response.status_code == 404
+    # raise Exception("Complete test with assertion about response body")
+    # *****************************************************************
+    # **Complete test with assertion about response body***************
+    # *****************************************************************
 
-#     raise Exception("Complete test with assertion about response body")
-#     # *****************************************************************
-#     # **Complete test with assertion about response body***************
-#     # *****************************************************************
 
-#     assert Task.query.all() == []
 
 
 # # @pytest.mark.skip(reason="No way to test this feature yet")
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 48b7e9f58..b480833a1 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -129,7 +129,7 @@ def test_mark_complete_missing_task(client):
     assert response.status_code == 404
 
     # raise Exception("Complete test with assertion about response body")
-    assert response_body == {'message': 'Task 1 not found'}
+    assert response_body == None
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
@@ -146,7 +146,7 @@ def test_mark_incomplete_missing_task(client):
 
     # raise Exception("Complete test with assertion about response body")
     
-    assert response_body == {'message': 'Task 1 not found'}
+    assert response_body == None
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index c9b583a0c..8ca38168b 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,3 +1,4 @@
+from app.models.goal import Goal
 import pytest
 
 

From 1872bc61af59b3eb3cb146747ce7112802552c72 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Tue, 17 Jan 2023 21:56:58 -0500
Subject: [PATCH 25/34] updated models

---
 .idea/workspace.xml | 6 ++----
 app/goal_routes.py  | 6 +++---
 app/models/goal.py  | 3 +--
 requirements.txt    | 3 ++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c78565839..a9556e977 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c7dee5e8-450a-45dd-ab3e-35f1e148105b" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/app/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/models/task.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/task.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/routes.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/routes.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/test_wave_01.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_wave_01.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/goal_routes.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/goal_routes.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/app/goal_routes.py b/app/goal_routes.py
index 2529d0135..dd4baad33 100644
--- a/app/goal_routes.py
+++ b/app/goal_routes.py
@@ -34,7 +34,7 @@ def no_saved_goal(goal_id):
     # goal.todict() for goal in Goal
 
     if goal_response is None:
-        return "The goal ID submitted, does not exist: error code 404"
+        return None
     else:    
         return jsonify({goal_validate.goal_dict()}),200 
 
@@ -45,7 +45,7 @@ def one_saved_goal(goal_id):
     goal_response = [goal.todict() for goal in Goal]
 
     if goal_id == None:
-        return "The goal ID submitted, does not exist: error code 404"
+        return None
     else:    
         return jsonify({goal_validate.goal_dict()}), 
 
@@ -57,7 +57,7 @@ def get_goal():
     goal_response = [goal.todict() for goal in Goal]
 
     if goal_validate == None:
-        return "The goal ID submitted, does not exist: error code 404"
+        return None
     else:    
         return jsonify({"goal": goal_validate.goal_dict()}), 200
 
diff --git a/app/models/goal.py b/app/models/goal.py
index 39e80036d..56838e9d8 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -4,8 +4,7 @@
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String(80)) 
-    task_rel = db.relationship("Task", backref="goal",lazy=True)
-    task_id = db.Column(db.Integer, db.ForeignKey('task.id')) 
+    task_rel = db.relationship("Task", backref="goal",lazy=True) 
 
     def goal_dict(self):
             return {
diff --git a/requirements.txt b/requirements.txt
index 4cfd2f584..e8da56e54 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,10 +21,11 @@ mypy @ git+https://github.com/python/mypy.git@abc9d155ffbd9ea160eec0b57c450cdf7e
 mypy-extensions==0.4.3
 packaging==20.9
 pluggy==0.13.1
+psycopg2-binary==2.9.4
 py==1.10.0
 pycodestyle==2.6.0
 pyparsing==2.4.7
-pytest==6.2.3
+pytest==7.1.1
 pytest-cov==2.12.1
 python-dateutil==2.8.1
 python-dotenv==0.15.0

From 741ed60ec4a20ad3774d41cec1c86d3e11adb61a Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Tue, 17 Jan 2023 22:00:15 -0500
Subject: [PATCH 26/34] updated models

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

diff --git a/app/models/goal.py b/app/models/goal.py
index 56838e9d8..ba29cb7b1 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,10 +1,10 @@
 from app import db
-
+from .task import Task
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String(80)) 
-    task_rel = db.relationship("Task", backref="goal",lazy=True) 
+    task_rel = db.relationship("Task", back_populates="goal", lazy=True) 
 
     def goal_dict(self):
             return {
@@ -13,5 +13,6 @@ def goal_dict(self):
     
     @classmethod
     def from_dict(cls, goal_data):
-        new_Goal = Goal(title=goal_data["title"])
-        return new_Goal
\ No newline at end of file
+        goal_class = cls(title=goal_data["title"])
+        return goal_class
+        
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 43c41952e..977d1bfc2 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -5,9 +5,9 @@ class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String(80)) 
     description  = db.Column(db.String(80)) 
-    completed_at = db.Column(db.DateTime, unique = False, nullable = True)
-    goal_rel = db.relationship("Goal", back_populates="goal",lazy='True')
-    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id')) 
+    completed_at = db.Column(db.DateTime, nullable=True)
+    goal_rel = db.relationship("Goal", back_populates="tasks")
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal.id'),nullable=True)
 
     def build_task_dict(self):
             return {
@@ -19,7 +19,8 @@ def build_task_dict(self):
 
     @classmethod
     def from_dict(cls, task_data):
-        new_Task = Task(title=task_data["title"],
+        new_Task = cls(title=task_data["title"],
                         description=task_data["description"],
-                        is_complete=bool["completed_at"])
+                        is_complete=task_data["completed_at"],
+                        completed_at=task_data.get("is_complete", None),)
         return new_Task
\ No newline at end of file

From 22aaa55154ebd9d4335cbfcba6c0486d76a1c5b2 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 15:22:21 -0500
Subject: [PATCH 27/34] redo flask config

---
 app/__init__.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 5493d4393..6ba30095c 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,6 +4,7 @@
 import os
 from dotenv import load_dotenv
 
+
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
@@ -21,20 +22,17 @@ def create_app(test_config=None):
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
             "SQLALCHEMY_TEST_DATABASE_URI")
 
-    # Import models here for Alembic setup
     from app.models.task import Task
     from app.models.goal import Goal
 
     db.init_app(app)
     migrate.init_app(app, db)
 
-    # Register Blueprints here
-    from app.routes import tasks_bp
-    from app.goal_routes import goals_bp
-    app.register_blueprint(tasks_bp)
-    app.register_blueprint(goals_bp)
+    # Register Blueprints
+    from .routes import task
+    from .routes import goal
 
-    from app.models.goal import Goal
-    from app.models.task import Task
-    
-    return app
+    app.register_blueprint(task.bp)
+    app.register_blueprint(goal.bp)
+
+    return app
\ No newline at end of file

From 5bdd38ea6804d3ed3cd0ba5e61a216209deb5ca2 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 18:06:49 -0500
Subject: [PATCH 28/34] fixed database

---
 app/__init__.py                      |  8 ++++----
 app/models/goal.py                   |  5 +++--
 app/models/task.py                   |  4 ++--
 app/{routes.py => task_routes.py}    | 13 +++++-------
 migrations/versions/e650b09bff6e_.py | 30 ++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 16 deletions(-)
 rename app/{routes.py => task_routes.py} (95%)
 create mode 100644 migrations/versions/e650b09bff6e_.py

diff --git a/app/__init__.py b/app/__init__.py
index 6ba30095c..4dcce36af 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -29,10 +29,10 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints
-    from .routes import task
-    from .routes import goal
+    from . import task_routes
+    from . import goal_routes
 
-    app.register_blueprint(task.bp)
-    app.register_blueprint(goal.bp)
+    app.register_blueprint(task_routes.tasks_bp)
+    app.register_blueprint(goal_routes.goals_bp)
 
     return app
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index ba29cb7b1..525692147 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,16 +1,17 @@
 from app import db
-from .task import Task
+
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     title = db.Column(db.String(80)) 
-    task_rel = db.relationship("Task", back_populates="goal", lazy=True) 
+    tasks = db.relationship("Task", back_populates="goal", lazy=True) 
 
     def goal_dict(self):
             return {
                 "id": self.goal_id,
                 "title": self.title}
     
+
     @classmethod
     def from_dict(cls, goal_data):
         goal_class = cls(title=goal_data["title"])
diff --git a/app/models/task.py b/app/models/task.py
index 977d1bfc2..f37c4363c 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -6,8 +6,8 @@ class Task(db.Model):
     title = db.Column(db.String(80)) 
     description  = db.Column(db.String(80)) 
     completed_at = db.Column(db.DateTime, nullable=True)
-    goal_rel = db.relationship("Goal", back_populates="tasks")
-    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal.id'),nullable=True)
+    goal = db.relationship("Goal", back_populates="tasks")
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'),nullable=True)
 
     def build_task_dict(self):
             return {
diff --git a/app/routes.py b/app/task_routes.py
similarity index 95%
rename from app/routes.py
rename to app/task_routes.py
index ae8117cfd..4fad8b3d7 100644
--- a/app/routes.py
+++ b/app/task_routes.py
@@ -1,12 +1,9 @@
-import json
-import datetime
-from os import abort
-
-from flask import Blueprint, abort, jsonify, make_response, request
-from sqlalchemy import asc, desc
-
-from app import db
+from flask import Blueprint
 from app.models.task import Task
+from app import db
+from flask import Blueprint, jsonify, abort, make_response, request
+from datetime import datetime
+
 
 tasks_bp = Blueprint('tasks', __name__, url_prefix="/tasks")
 
diff --git a/migrations/versions/e650b09bff6e_.py b/migrations/versions/e650b09bff6e_.py
new file mode 100644
index 000000000..a14423aac
--- /dev/null
+++ b/migrations/versions/e650b09bff6e_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: e650b09bff6e
+Revises: 17069dd1dc5c
+Create Date: 2023-01-20 18:00:37.997559
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e650b09bff6e'
+down_revision = '17069dd1dc5c'
+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'], ['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')
+    # ### end Alembic commands ###

From 03530160a1fc45518881aa0ed7e941aeaff7cfab Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 19:01:49 -0500
Subject: [PATCH 29/34] test wave 1

---
 app/task_routes.py    |  4 ++--
 tests/test_wave_01.py |  4 ++--
 tests/test_wave_03.py | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/task_routes.py b/app/task_routes.py
index 4fad8b3d7..926141ebf 100644
--- a/app/task_routes.py
+++ b/app/task_routes.py
@@ -34,8 +34,8 @@ def validate_task_id(task_id):
     task = Task.query.get(task_id)
 
     if not task:
-        abort(make_response({"message":f"Task {task_id} not found"}, 404))
-
+        return abort(make_response({"message":f"Task {task_id} not found"}, 404))
+        #  abort(make_response(None))
     return task
 
 @tasks_bp.route('', methods=['GET'])
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index 7826b3b4e..295905f65 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -60,7 +60,7 @@ def test_get_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    assert response_body == None
+    assert response_body == {'message': 'Task 1 not found'} 
 
     # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
@@ -163,7 +163,7 @@ def test_delete_task_not_found(client):
     # Assert
     assert response.status_code == 404
     assert Task.query.all() == []
-    assert response_body == None
+    assert response_body ==  {'message': 'Task 1 not found'}
 
     # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index b480833a1..460b7fb0e 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -8,18 +8,18 @@
 # @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_incomplete_task(client, one_task):
     # Arrange
-    """
-    The future Wave 4 adds special functionality to this route,
-    so for this test, we need to set-up "mocking."
+    # """
+    # The future Wave 4 adds special functionality to this route,
+    # so for this test, we need to set-up "mocking."
 
-    Mocking will help our tests work in isolation, which is a
-    good thing!
+    # Mocking will help our tests work in isolation, which is a
+    # good thing!
 
-    We need to mock any POST requests that may occur during this
-    test (due to Wave 4).
+    # We need to mock any POST requests that may occur during this
+    # test (due to Wave 4).
 
-    There is no action needed here, the tests should work as-is.
-    """
+    # There is no action needed here, the tests should work as-is.
+    # """
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
 

From 8d2eae5a607c4b5f3283a566e7684271155dddcb Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 19:05:17 -0500
Subject: [PATCH 30/34] test wave 2

---
 app/task_routes.py    |  2 +-
 tests/test_wave_03.py | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/task_routes.py b/app/task_routes.py
index 926141ebf..43bc88312 100644
--- a/app/task_routes.py
+++ b/app/task_routes.py
@@ -102,7 +102,7 @@ def delete_tasks(task_id):
 @tasks_bp.route('/<task_id>/mark_complete', methods=['PATCH'])
 def mark_complete_on_incomplete_task(task_id):
     test_task = validate_task_id(task_id)
-    test_task.completed_at = datetime.datetime.today()
+    test_task.completed_at = datetime.today()
     test_task.is_complete = True
     db.session.commit()
     print(test_task.completed_at)
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 460b7fb0e..b785b9cbc 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -19,7 +19,7 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     # test (due to Wave 4).
 
     # There is no action needed here, the tests should work as-is.
-    # """
+    # # """
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
 
@@ -65,18 +65,18 @@ def test_mark_incomplete_on_complete_task(client, completed_task):
 # @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_completed_task(client, completed_task):
     # Arrange
-    """
-    The future Wave 4 adds special functionality to this route,
-    so for this test, we need to set-up "mocking."
+    # """
+    # The future Wave 4 adds special functionality to this route,
+    # so for this test, we need to set-up "mocking."
 
-    Mocking will help our tests work in isolation, which is a
-    good thing!
+    # Mocking will help our tests work in isolation, which is a
+    # good thing!
 
-    We need to mock any POST requests that may occur during this
-    test (due to Wave 4).
+    # We need to mock any POST requests that may occur during this
+    # test (due to Wave 4).
 
-    There is no action needed here, the tests should work as-is.
-    """
+    # There is no action needed here, the tests should work as-is.
+    # """
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
 

From c4f0bee59ce9901a5c42d3b85174f54d04e959c4 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 19:06:26 -0500
Subject: [PATCH 31/34] test wave 3

---
 tests/test_wave_03.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index b785b9cbc..b435ca98b 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -129,7 +129,7 @@ def test_mark_complete_missing_task(client):
     assert response.status_code == 404
 
     # raise Exception("Complete test with assertion about response body")
-    assert response_body == None
+    assert response_body == {'message': 'Task 1 not found'}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
@@ -146,7 +146,7 @@ def test_mark_incomplete_missing_task(client):
 
     # raise Exception("Complete test with assertion about response body")
     
-    assert response_body == None
+    assert response_body == {'message': 'Task 1 not found'}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************

From dbed2de7e430555681b1842905c4688a1bc0cdf3 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 19:38:34 -0500
Subject: [PATCH 32/34] test wave 5

---
 app/goal_routes.py    | 53 ++++++++++++++++++++-----------------------
 tests/test_wave_05.py | 27 +++++++++++++---------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/app/goal_routes.py b/app/goal_routes.py
index dd4baad33..8fa096314 100644
--- a/app/goal_routes.py
+++ b/app/goal_routes.py
@@ -26,40 +26,36 @@ def validate_goal_id(cls, goal_id):
     return goal
 
 
-@goals_bp.route('/<goal_id>', methods=['GET'])
-def no_saved_goal(goal_id):
-    goal_validate = validate_goal_id(goal_id)
+# @goals_bp.route('/<goal_id>', methods=['GET'])
+# def no_saved_goal(goal_id):
+#     goal_validate = validate_goal_id(goal_id)
     
-    goal_response = []
-    # goal.todict() for goal in Goal
+#     goal_response = []
+#     # goal.todict() for goal in Goal
 
-    if goal_response is None:
-        return None
-    else:    
-        return jsonify({goal_validate.goal_dict()}),200 
+#     if goal_response is None:
+#         return None
+#     else:    
+#         return jsonify({goal_validate.goal_dict()}),200 
 
-@goals_bp.route('/<goal_id>', methods=['GET'])
-def one_saved_goal(goal_id):
-    goal_validate = validate_goal_id(goal_id)
+# @goals_bp.route('/<goal_id>', methods=['GET'])
+# def one_saved_goal(goal_id):
+#     goal_validate = validate_goal_id(goal_id)
     
-    goal_response = [goal.todict() for goal in Goal]
+#     goal_response = [goal.todict() for goal in Goal]
 
-    if goal_id == None:
-        return None
-    else:    
-        return jsonify({goal_validate.goal_dict()}), 
+#     if goal_id == None:
+#         return None
+#     else:    
+#         return jsonify({goal_validate.goal_dict()}), 
 
 
 @goals_bp.route('/<goal_id>', methods=['GET'])
-def get_goal():
-    goal_validate = validate_goal_id()
-    
-    goal_response = [goal.todict() for goal in Goal]
+def get_goal(goal_id):
+    goal_validate = validate_goal_id(Goal,goal_id)
 
-    if goal_validate == None:
-        return None
-    else:    
-        return jsonify({"goal": goal_validate.goal_dict()}), 200
+    
+    return jsonify({"goal": goal_validate.goal_dict()}), 200
 
 @goals_bp.route("", methods=['POST'])
 def create_goal():
@@ -119,13 +115,12 @@ def query_all():
 @goals_bp.route('/<goal_id>', methods=['PUT'])
 def update_goals(goal_id):
     
-    validate_id = validate_goal_id(goal_id)
+    validate_id = validate_goal_id(Goal,goal_id)
 
     response_body = request.get_json()
     
     validate_id.title = response_body["title"]
-    validate_id.description = response_body["description"]
-
+    # validate_id.description = response_body["description"]
 
     db.session.commit()
 
@@ -134,7 +129,7 @@ def update_goals(goal_id):
 
 @goals_bp.route('/<goal_id>', methods=['DELETE'])
 def delete_goals(goal_id):
-    test_goal = validate_goal_id(goal_id)
+    test_goal = validate_goal_id(Goal,goal_id)
     result_notice = {"details": f'Goal {goal_id} "{test_goal.title}" successfully deleted'}
 
     db.session.delete(test_goal)
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 8ca38168b..ac0b749e2 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -47,14 +47,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()
 
-    raise Exception("Complete test")
+    assert response.status_code == 404
+    assert "message" in response_body
+    assert response_body == {"message":"Goal 1 not found"}
+
+    # raise Exception("Complete test")
     # Assert
     # ---- Complete Test ----
     # assertion 1 goes here
@@ -83,16 +86,18 @@ def test_create_goal(client):
 
 # @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal(client, one_goal):
-    raise Exception("Complete test")
     # Act
     # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "My New Goal"
+    })
+    response_body = response.get_json()
+
+    # raise Exception("Complete test") 
+    assert response.status_code == 200
+    assert "title" in response_body
+    assert response_body["title"]  == "My New Goal"
 
-    # 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")
@@ -125,7 +130,7 @@ def test_delete_goal(client, one_goal):
     response = client.get("/goals/1")
     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***************
     # *****************************************************************

From 320dbe20c72bb3f7893137ae7651a7cff3c49022 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 20:11:36 -0500
Subject: [PATCH 33/34] test wave 6

---
 app/goal_routes.py    | 47 ++++++++++++++++++++++++++-----------------
 app/models/task.py    |  3 ++-
 tests/test_wave_05.py | 16 ++++++++-------
 tests/test_wave_06.py |  2 +-
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/app/goal_routes.py b/app/goal_routes.py
index 8fa096314..5816f0b95 100644
--- a/app/goal_routes.py
+++ b/app/goal_routes.py
@@ -49,7 +49,6 @@ def validate_goal_id(cls, goal_id):
 #     else:    
 #         return jsonify({goal_validate.goal_dict()}), 
 
-
 @goals_bp.route('/<goal_id>', methods=['GET'])
 def get_goal(goal_id):
     goal_validate = validate_goal_id(Goal,goal_id)
@@ -74,20 +73,6 @@ def create_goal():
     return jsonify({"goal": created_goal.goal_dict()}), 201
 
 
-@goals_bp.route("/<goal_id>/tasks", methods=['GET'])
-def goal_not_found(goal_id):
-    response_body = request.get_json()
-    print(response_body)
-
-    goal = validate_goal_id
-
-    if not goal:
-        return "The goal ID submitted, does not exist: error code 404"
-    else:    
-        return jsonify({"goal": goal.goal_dict()}), 200
-    
-    # return make_response(jsonify({"goal": created_goal.goal_dict()}))
-
 @goals_bp.route('', methods=['GET'])
 def query_all():
     
@@ -115,16 +100,16 @@ def query_all():
 @goals_bp.route('/<goal_id>', methods=['PUT'])
 def update_goals(goal_id):
     
-    validate_id = validate_goal_id(Goal,goal_id)
+    goal_object = validate_goal_id(Goal,goal_id)
 
     response_body = request.get_json()
     
-    validate_id.title = response_body["title"]
-    # validate_id.description = response_body["description"]
+    if "title" in response_body:
+        goal_object.title = response_body["title"]
 
     db.session.commit()
 
-    return jsonify({"goal": validate_id.goal_dict()}),200
+    return jsonify(goal_object.goal_dict()), 200
     
 
 @goals_bp.route('/<goal_id>', methods=['DELETE'])
@@ -136,3 +121,27 @@ def delete_goals(goal_id):
     db.session.commit()
 
     return make_response(result_notice, 200)
+
+@goals_bp.route('/<goal_id>/tasks', methods=['POST'])
+def task_ids_to_goal(goal_id):
+    goal_object = validate_goal_id(Goal,goal_id)
+
+    request_body = request.get_json()
+
+    goal_object.tasks = [Task.query.get(task_id) for task_id in request_body["task_ids"]]
+    db.session.commit()
+    
+    return {"id":goal_object.goal_id,
+            "task_ids":[task.task_id for task in goal_object.tasks]}, 200
+
+
+@goals_bp.route('/<goal_id>/tasks', methods=['GET'])
+def goal_with_no_task(goal_id):
+    goal_object = validate_goal_id(Goal,goal_id)
+
+    # request_body = request.get_json()
+
+    tasks = [task.build_task_dict() for task in goal_object.tasks] 
+    
+    return {"id": goal_object.goal_id, "title": goal_object.title,
+            "tasks": tasks}, 200
diff --git a/app/models/task.py b/app/models/task.py
index f37c4363c..54b13e95f 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -14,7 +14,8 @@ def build_task_dict(self):
                 "id": self.task_id,
                 "title": self.title,
                 "description": self.description,
-                "is_complete": bool(self.completed_at)
+                "is_complete": bool(self.completed_at),
+                "goal_id": self.goal_id
             }
 
     @classmethod
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index ac0b749e2..6832f7e65 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -102,15 +102,17 @@ def test_update_goal(client, one_goal):
 
 # @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    raise Exception("Complete test")
-    # Act
+   # Act
     # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "My New Goal"
+    })
+    response_body = response.get_json()
 
-    # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    # raise Exception("Complete test") 
+    assert response.status_code == 404
+    assert "message" in response_body
+    assert response_body == {"message":"Goal 1 not found"}
 
 
 # @pytest.mark.skip(reason="No way to test this feature yet")
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index ebfcbac67..0b0e67577 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -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")

From b8b4842a13a148f8ebbb4386d20ad370c379db08 Mon Sep 17 00:00:00 2001
From: Diana Soriano <dssori@gmail.com>
Date: Fri, 20 Jan 2023 22:43:28 -0500
Subject: [PATCH 34/34] final

---
 tests/test_wave_06.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 0b0e67577..6cb44ee8f 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -49,9 +49,11 @@ def test_get_tasks_for_specific_goal_no_goal(client):
     response_body = response.get_json()
 
     # Assert
+    assert "message" in response_body
+    assert response_body == {"message":"Goal 1 not found"}
     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***************
     # *****************************************************************