From da8a278d3eef12862fb0a12e14464fd0748bc68f Mon Sep 17 00:00:00 2001 From: mhc Date: Thu, 3 Nov 2022 16:35:18 -0400 Subject: [PATCH 01/31] ran flask db init --- 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 6c8bc83f2088bdbf4a80c3d9cf68889ab4077a43 Mon Sep 17 00:00:00 2001 From: mhc Date: Thu, 3 Nov 2022 17:08:44 -0400 Subject: [PATCH 02/31] updated Task model --- app/models/task.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..2521825dd 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +2,7 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True) #add autoincrement=True? + title = db.Column(db.Text) + description = db.Column(db.Text) + completed_at = db.Column(db.DateTime, nullable=True, default=None) \ No newline at end of file From da8f6bf8bb2e31f072d8ab4be04a998154ce0af5 Mon Sep 17 00:00:00 2001 From: mhc Date: Thu, 3 Nov 2022 17:09:34 -0400 Subject: [PATCH 03/31] ran flask migrate and upgrade for Task model --- .../99d78fcdcf13_updated_task_model.py | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 migrations/versions/99d78fcdcf13_updated_task_model.py diff --git a/migrations/versions/99d78fcdcf13_updated_task_model.py b/migrations/versions/99d78fcdcf13_updated_task_model.py new file mode 100644 index 000000000..f75f2aa9a --- /dev/null +++ b/migrations/versions/99d78fcdcf13_updated_task_model.py @@ -0,0 +1,39 @@ +"""updated Task model + +Revision ID: 99d78fcdcf13 +Revises: +Create Date: 2022-11-03 17:09:01.828672 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '99d78fcdcf13' +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.Text(), nullable=True), + sa.Column('description', sa.Text(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### From 518c2cf06925acbf10476a55e6f043d244662779 Mon Sep 17 00:00:00 2001 From: mhc Date: Sun, 6 Nov 2022 17:21:43 -0500 Subject: [PATCH 04/31] added autoincrement=True to Task task_id attr --- app/models/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 2521825dd..f7e4bd3f1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,7 +2,7 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) #add autoincrement=True? + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) #add autoincrement=True? title = db.Column(db.Text) description = db.Column(db.Text) completed_at = db.Column(db.DateTime, nullable=True, default=None) \ No newline at end of file From 36b073b5b206aedf74057d40fb78fd0be5605dc6 Mon Sep 17 00:00:00 2001 From: mhc Date: Sun, 6 Nov 2022 17:26:06 -0500 Subject: [PATCH 05/31] added from_dict and to_dict to Task model --- app/models/task.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index f7e4bd3f1..da79ab407 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,4 +5,18 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) #add autoincrement=True? title = db.Column(db.Text) description = db.Column(db.Text) - completed_at = db.Column(db.DateTime, nullable=True, default=None) \ No newline at end of file + completed_at = db.Column(db.DateTime, nullable=True, default=None) + + @classmethod + def from_dict(cls, task_data): + new_task = Task(title=task_data["title"], + description=task_data["description"], + completed_at=task_data["completed_at"]) + + def to_dict(self): + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "completed_at": self.completed_at + } \ No newline at end of file From a6b91e0683cf64aee7664ca78b5fca8a06b7e476 Mon Sep 17 00:00:00 2001 From: mhc Date: Sun, 6 Nov 2022 17:34:43 -0500 Subject: [PATCH 06/31] created & imported tasks_bp to __init__ --- app/__init__.py | 10 ++++++---- app/routes.py | 11 ++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..210c6be33 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,13 +22,15 @@ def create_app(test_config=None): app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") + db.init_app(app) + migrate.init_app(app, db) + # 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 .routes import tasks_bp + app.register_blueprint(tasks_bp) + return app diff --git a/app/routes.py b/app/routes.py index 3aae38d49..c79253ede 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,10 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, jsonify, abort, make_response, request +from app import db +from app.models.task import Task +from app.models.goal import Goal + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST"]) +def create_task(): + \ No newline at end of file From 7089d5712d9107457948ed0c7770e411e25e9e31 Mon Sep 17 00:00:00 2001 From: mhc Date: Sun, 6 Nov 2022 18:57:12 -0500 Subject: [PATCH 07/31] implemented create_task route --- app/models/task.py | 25 ++++++++-------- app/routes.py | 26 +++++++++++++++- ...pdated_task_model_renamed_task_id_to_id.py | 30 +++++++++++++++++++ tests/test_wave_01.py | 6 ++-- 4 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py diff --git a/app/models/task.py b/app/models/task.py index da79ab407..4527938e3 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,21 +2,20 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) #add autoincrement=True? + id = db.Column(db.Integer, primary_key=True, autoincrement=True) #add autoincrement=True? title = db.Column(db.Text) description = db.Column(db.Text) completed_at = db.Column(db.DateTime, nullable=True, default=None) - @classmethod - def from_dict(cls, task_data): - new_task = Task(title=task_data["title"], - description=task_data["description"], - completed_at=task_data["completed_at"]) + # @classmethod + # def from_dict(cls, task_data): + # new_task = Task(title=task_data["title"], + # description=task_data["description"]) - def to_dict(self): - return { - "id": self.task_id, - "title": self.title, - "description": self.description, - "completed_at": self.completed_at - } \ No newline at end of file + # def to_dict(self): + # return { + # "id": self.task_id, + # "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 c79253ede..9b6cfde71 100644 --- a/app/routes.py +++ b/app/routes.py @@ -7,4 +7,28 @@ @tasks_bp.route("", methods=["POST"]) def create_task(): - \ No newline at end of file + request_body = request.get_json() + + # checks input for all required fields + if (("title") not in request_body + or ("description") not in request_body): + return make_response({"details": "Invalid data"}, 400) + + new_task = Task(title=request_body["title"], + description=request_body["description"]) + + db.session.add(new_task) + db.session.commit() + + task_response = Task.query.get(1) + return make_response( + { + "task": { + "id": task_response.id, + "title": task_response.title, + "description": task_response.description, + "is_complete": False + } + }, + 201 + ) \ No newline at end of file diff --git a/migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py b/migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py new file mode 100644 index 000000000..e294995a9 --- /dev/null +++ b/migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py @@ -0,0 +1,30 @@ +"""updated Task model renamed task_id to id + +Revision ID: 9b5cfcd65466 +Revises: 99d78fcdcf13 +Create Date: 2022-11-06 18:54:51.411754 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9b5cfcd65466' +down_revision = '99d78fcdcf13' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('id', sa.Integer(), autoincrement=True, nullable=False)) + op.drop_column('task', 'task_id') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('task_id', sa.INTEGER(), autoincrement=True, nullable=False)) + op.drop_column('task', 'id') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..df530130a 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -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={ @@ -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 2df39c9bafd1472dbe39ae3d1640c15fdf08955f Mon Sep 17 00:00:00 2001 From: mhc Date: Sun, 6 Nov 2022 19:07:09 -0500 Subject: [PATCH 08/31] restored, refactoring with from_dict raises error --- app/routes.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/routes.py b/app/routes.py index 9b6cfde71..ce55474ce 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,6 +17,8 @@ def create_task(): new_task = Task(title=request_body["title"], description=request_body["description"]) + # new_task = Task.from_dict(request_body) + db.session.add(new_task) db.session.commit() From 42a46a635d7ac03f4f651b04a7df5b1181b39751 Mon Sep 17 00:00:00 2001 From: mhc Date: Mon, 7 Nov 2022 15:11:54 -0500 Subject: [PATCH 09/31] refactored Task model from_dict method --- app/models/task.py | 12 +++++++----- app/routes.py | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 4527938e3..c9ecdd1bc 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,12 +5,14 @@ class Task(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) #add autoincrement=True? title = db.Column(db.Text) description = db.Column(db.Text) - completed_at = db.Column(db.DateTime, nullable=True, default=None) + completed_at = db.Column(db.DateTime, nullable=True) - # @classmethod - # def from_dict(cls, task_data): - # new_task = Task(title=task_data["title"], - # description=task_data["description"]) + @classmethod + def from_dict(cls, task_data): + new_task = Task(title=task_data["title"], + description=task_data["description"], + completed_at=None) + return new_task # def to_dict(self): # return { diff --git a/app/routes.py b/app/routes.py index ce55474ce..c20a64aa6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -14,10 +14,10 @@ def create_task(): or ("description") not in request_body): return make_response({"details": "Invalid data"}, 400) - new_task = Task(title=request_body["title"], - description=request_body["description"]) + # new_task = Task(title=request_body["title"], + # description=request_body["description"]) - # new_task = Task.from_dict(request_body) + new_task = Task.from_dict(request_body) db.session.add(new_task) db.session.commit() From 74892e86230a7cf43ba96adcf1f25bde3a8c0ef8 Mon Sep 17 00:00:00 2001 From: mhc Date: Mon, 7 Nov 2022 15:17:15 -0500 Subject: [PATCH 10/31] refactored Task model to_dict & is_complete helper --- app/models/task.py | 22 +++++++++++++++------- app/routes.py | 26 ++++++++++++-------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index c9ecdd1bc..8a6a043b1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -14,10 +14,18 @@ def from_dict(cls, task_data): completed_at=None) return new_task - # def to_dict(self): - # return { - # "id": self.task_id, - # "title": self.title, - # "description": self.description, - # "completed_at": self.completed_at - # } \ No newline at end of file + def is_complete(task_data): + if task_data.completed_at == None: + return False + else: + return True + + def to_dict(self): + return {"task": + { + "id": self.id, + "title": self.title, + "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 c20a64aa6..6e8510ce5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -13,9 +13,6 @@ def create_task(): if (("title") not in request_body or ("description") not in request_body): return make_response({"details": "Invalid data"}, 400) - - # new_task = Task(title=request_body["title"], - # description=request_body["description"]) new_task = Task.from_dict(request_body) @@ -23,14 +20,15 @@ def create_task(): db.session.commit() task_response = Task.query.get(1) - return make_response( - { - "task": { - "id": task_response.id, - "title": task_response.title, - "description": task_response.description, - "is_complete": False - } - }, - 201 - ) \ No newline at end of file + return make_response(task_response.to_dict(), 201) + # return make_response( + # { + # "task": { + # "id": task_response.id, + # "title": task_response.title, + # "description": task_response.description, + # "is_complete": False + # } + # }, + # 201 + # ) \ No newline at end of file From 7794a65f45d69a8428fa08f7e50534053a7c0ed3 Mon Sep 17 00:00:00 2001 From: mhc Date: Mon, 7 Nov 2022 15:17:47 -0500 Subject: [PATCH 11/31] refactored removed old code --- app/routes.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6e8510ce5..c59783738 100644 --- a/app/routes.py +++ b/app/routes.py @@ -20,15 +20,4 @@ def create_task(): db.session.commit() task_response = Task.query.get(1) - return make_response(task_response.to_dict(), 201) - # return make_response( - # { - # "task": { - # "id": task_response.id, - # "title": task_response.title, - # "description": task_response.description, - # "is_complete": False - # } - # }, - # 201 - # ) \ No newline at end of file + return make_response(task_response.to_dict(), 201) \ No newline at end of file From 904ccba35a01fdd542ff30338c5b63a599318b8e Mon Sep 17 00:00:00 2001 From: mhc Date: Tue, 8 Nov 2022 22:14:06 -0500 Subject: [PATCH 12/31] added validate_model, implemented get_all_routes --- app/models/task.py | 6 ++---- app/routes.py | 23 ++++++++++++++++++++++- tests/test_wave_01.py | 4 ++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 8a6a043b1..de0c51a0e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -21,11 +21,9 @@ def is_complete(task_data): return True def to_dict(self): - return {"task": - { + return { "id": self.id, "title": self.title, "description": self.description, "is_complete": self.is_complete() - } - } \ No newline at end of file + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index c59783738..2b76d5619 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,6 +5,19 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + + return model + @tasks_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() @@ -20,4 +33,12 @@ def create_task(): db.session.commit() task_response = Task.query.get(1) - return make_response(task_response.to_dict(), 201) \ No newline at end of file + return make_response({"task": task_response.to_dict()}, 201) + +@tasks_bp.route("", methods=["GET"]) +def get_all_tasks(): + tasks_response = [] + tasks = Task.query.all() + for task in tasks: + tasks_response.append(task.to_dict()) + return jsonify(tasks_response) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index df530130a..da04c50cc 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") From e99987fea01bd0d7b410c53411756889d49b3760 Mon Sep 17 00:00:00 2001 From: mhc Date: Tue, 8 Nov 2022 22:31:22 -0500 Subject: [PATCH 13/31] implemented get task and finished get_task_not_found test --- app/routes.py | 13 ++++++++----- tests/test_wave_01.py | 10 +++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/routes.py b/app/routes.py index 2b76d5619..01e03aee1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -12,23 +12,19 @@ def validate_model(cls, model_id): abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) model = cls.query.get(model_id) - if not model: abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) - return model @tasks_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() - # checks input for all required fields if (("title") not in request_body or ("description") not in request_body): return make_response({"details": "Invalid data"}, 400) new_task = Task.from_dict(request_body) - db.session.add(new_task) db.session.commit() @@ -39,6 +35,13 @@ def create_task(): def get_all_tasks(): tasks_response = [] tasks = Task.query.all() + for task in tasks: tasks_response.append(task.to_dict()) - return jsonify(tasks_response) \ No newline at end of file + + return jsonify(tasks_response) + +@tasks_bp.route("/", methods=["GET"]) +def read_one_task(task_id): + task = validate_model(Task, task_id) + return make_response({"task": task.to_dict()}, 200) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index da04c50cc..6e1c2e970 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -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") @@ -59,11 +59,7 @@ def test_get_task_not_found(client): # 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 == {"message": f"Task 1 not found"} #@pytest.mark.skip(reason="No way to test this feature yet") From b6753b972b321df65a130f61295cfe980c68942c Mon Sep 17 00:00:00 2001 From: mhc Date: Tue, 8 Nov 2022 22:52:06 -0500 Subject: [PATCH 14/31] wave 01 complete, implemented update_task and delete_task --- app/routes.py | 24 +++++++++++++++++++++++- tests/test_wave_01.py | 21 ++++++--------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/app/routes.py b/app/routes.py index 01e03aee1..5a60f590a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -44,4 +44,26 @@ def get_all_tasks(): @tasks_bp.route("/", methods=["GET"]) def read_one_task(task_id): task = validate_model(Task, task_id) - return make_response({"task": task.to_dict()}, 200) \ No newline at end of file + return make_response({"task": task.to_dict()}, 200) + +@tasks_bp.route("/", methods=["PUT"]) +def update_task(task_id): + task = validate_model(Task, task_id) + + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return make_response({"task": task.to_dict()}, 200) + +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = validate_model(Task, task_id) + + db.session.delete(task) + db.session.commit() + + return make_response({"details": f"Task {task.id} \"{task.title}\" successfully deleted"}, 200) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6e1c2e970..3146dbcfd 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -89,7 +89,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={ @@ -115,7 +115,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={ @@ -126,14 +126,10 @@ def test_update_task_not_found(client): # 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 == {"message": f"Task 1 not found"} -@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") @@ -148,7 +144,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") @@ -156,12 +152,7 @@ def test_delete_task_not_found(client): # 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 == {"message": f"Task 1 not found"} assert Task.query.all() == [] From 48a1dbdd1729ad946b479d4e04a478fd140c32e8 Mon Sep 17 00:00:00 2001 From: mhc Date: Tue, 8 Nov 2022 23:09:36 -0500 Subject: [PATCH 15/31] implemented get_tasks_sorted_asc --- app/routes.py | 11 ++++++++--- tests/test_wave_02.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 5a60f590a..48835ac64 100644 --- a/app/routes.py +++ b/app/routes.py @@ -33,12 +33,17 @@ def create_task(): @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): - tasks_response = [] - tasks = Task.query.all() + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(Task.title) + elif sort_query == "desc": + pass + else: + tasks = Task.query.all() + tasks_response = [] for task in tasks: tasks_response.append(task.to_dict()) - return jsonify(tasks_response) @tasks_bp.route("/", methods=["GET"]) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..b93a9b86c 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") From d99a0d8c036262f91b255fde32f8d7be94c8f5a8 Mon Sep 17 00:00:00 2001 From: mhc Date: Tue, 8 Nov 2022 23:20:03 -0500 Subject: [PATCH 16/31] implemented get_task_sorted_desc --- app/routes.py | 2 +- tests/test_wave_02.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 48835ac64..e84076a2e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -37,7 +37,7 @@ def get_all_tasks(): if sort_query == "asc": tasks = Task.query.order_by(Task.title) elif sort_query == "desc": - pass + tasks = Task.query.order_by(Task.title.desc()) #ColumnElement.desc() method produces a descending ORDER BY clause element else: tasks = Task.query.all() diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index b93a9b86c..c9a76e6b1 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -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 e56518adae4f5dafa2b2446fbb272b0abf9197a4 Mon Sep 17 00:00:00 2001 From: mhc Date: Tue, 8 Nov 2022 23:42:22 -0500 Subject: [PATCH 17/31] completed wave 03 --- app/routes.py | 22 +++++++++++++++++++++- tests/test_wave_03.py | 24 ++++++++---------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/app/routes.py b/app/routes.py index e84076a2e..d00837fac 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,8 @@ from app import db from app.models.task import Task from app.models.goal import Goal +from datetime import datetime + tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -71,4 +73,22 @@ def delete_task(task_id): db.session.delete(task) db.session.commit() - return make_response({"details": f"Task {task.id} \"{task.title}\" successfully deleted"}, 200) \ No newline at end of file + return make_response({"details": f"Task {task.id} \"{task.title}\" successfully deleted"}, 200) + +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete_task(task_id): + task = validate_model(Task, task_id) + + task.completed_at = datetime.utcnow() + db.session.commit() + + return make_response({"task": task.to_dict()}, 200) + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete_task(task_id): + task = validate_model(Task, task_id) + + task.completed_at = None + db.session.commit() + + return make_response({"task": task.to_dict()}, 200) \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..b84dd4514 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +127,10 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +138,4 @@ def test_mark_incomplete_missing_task(client): # 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 == {"message": f"Task 1 not found"} From 8a548fcb942056264f5d7bc6915b389da6057e28 Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 01:02:26 -0500 Subject: [PATCH 18/31] reinitialized database, implemented Slackbot post --- app/routes.py | 7 +++++ ...513788d29724_reinitializing_task_model.py} | 12 ++++---- ...pdated_task_model_renamed_task_id_to_id.py | 30 ------------------- 3 files changed, 13 insertions(+), 36 deletions(-) rename migrations/versions/{99d78fcdcf13_updated_task_model.py => 513788d29724_reinitializing_task_model.py} (77%) delete mode 100644 migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py diff --git a/app/routes.py b/app/routes.py index d00837fac..954309454 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,6 +3,8 @@ from app.models.task import Task from app.models.goal import Goal from datetime import datetime +import requests +import os tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -82,6 +84,11 @@ def mark_complete_task(task_id): task.completed_at = datetime.utcnow() db.session.commit() + #send notif to Slack API + params = {"channel": "task-notifications", "text": "Hello, world!"} + header = {"Authorization": f"Bearer {os.environ.get('SLACKBOT_AUTH_TOKEN')}"} + r = requests.post("https://slack.com/api/chat.postMessage", params=params, headers=header) + return make_response({"task": task.to_dict()}, 200) @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) diff --git a/migrations/versions/99d78fcdcf13_updated_task_model.py b/migrations/versions/513788d29724_reinitializing_task_model.py similarity index 77% rename from migrations/versions/99d78fcdcf13_updated_task_model.py rename to migrations/versions/513788d29724_reinitializing_task_model.py index f75f2aa9a..985bee73b 100644 --- a/migrations/versions/99d78fcdcf13_updated_task_model.py +++ b/migrations/versions/513788d29724_reinitializing_task_model.py @@ -1,8 +1,8 @@ -"""updated Task model +"""reinitializing Task model -Revision ID: 99d78fcdcf13 +Revision ID: 513788d29724 Revises: -Create Date: 2022-11-03 17:09:01.828672 +Create Date: 2022-11-09 01:00:42.241045 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '99d78fcdcf13' +revision = '513788d29724' down_revision = None branch_labels = None depends_on = None @@ -23,11 +23,11 @@ def upgrade(): sa.PrimaryKeyConstraint('goal_id') ) op.create_table('task', - sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('title', sa.Text(), nullable=True), sa.Column('description', sa.Text(), nullable=True), sa.Column('completed_at', sa.DateTime(), nullable=True), - sa.PrimaryKeyConstraint('task_id') + sa.PrimaryKeyConstraint('id') ) # ### end Alembic commands ### diff --git a/migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py b/migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py deleted file mode 100644 index e294995a9..000000000 --- a/migrations/versions/9b5cfcd65466_updated_task_model_renamed_task_id_to_id.py +++ /dev/null @@ -1,30 +0,0 @@ -"""updated Task model renamed task_id to id - -Revision ID: 9b5cfcd65466 -Revises: 99d78fcdcf13 -Create Date: 2022-11-06 18:54:51.411754 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '9b5cfcd65466' -down_revision = '99d78fcdcf13' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('id', sa.Integer(), autoincrement=True, nullable=False)) - op.drop_column('task', 'task_id') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('task_id', sa.INTEGER(), autoincrement=True, nullable=False)) - op.drop_column('task', 'id') - # ### end Alembic commands ### From f0e02234daa1a380e359c1329e6d3bc03aa07a25 Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 14:15:40 -0500 Subject: [PATCH 19/31] refactored task_routes.py and goal_routes.py --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 210c6be33..69042176e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,7 @@ def create_app(test_config=None): from app.models.goal import Goal # Register Blueprints here - from .routes import tasks_bp + from .task_routes import tasks_bp app.register_blueprint(tasks_bp) return app From db3d4cd9d57860ea07991e10cc4dfba60c941cfc Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 14:15:43 -0500 Subject: [PATCH 20/31] refactored goal_routes and task_routes --- app/goal_routes.py | 8 ++++++ app/models/goal.py | 3 +- app/{routes.py => task_routes.py} | 4 +-- .../735ec5539917_updated_goal_model.py | 28 +++++++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 app/goal_routes.py rename app/{routes.py => task_routes.py} (93%) create mode 100644 migrations/versions/735ec5539917_updated_goal_model.py diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..1bddc5be2 --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,8 @@ +from flask import Blueprint, jsonify, abort, make_response, request +from app import db +from app.models.task import Task +from app.models.goal import Goal +from datetime import datetime +from task_routes import validate_model +import requests +import os \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..26a89c153 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,4 +2,5 @@ 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.Text) diff --git a/app/routes.py b/app/task_routes.py similarity index 93% rename from app/routes.py rename to app/task_routes.py index 954309454..df994cd65 100644 --- a/app/routes.py +++ b/app/task_routes.py @@ -85,9 +85,9 @@ def mark_complete_task(task_id): db.session.commit() #send notif to Slack API - params = {"channel": "task-notifications", "text": "Hello, world!"} + params = {"channel": "task-notifications", "text": f"Someone just completed the task {task.title}"} header = {"Authorization": f"Bearer {os.environ.get('SLACKBOT_AUTH_TOKEN')}"} - r = requests.post("https://slack.com/api/chat.postMessage", params=params, headers=header) + requests.post("https://slack.com/api/chat.postMessage", params=params, headers=header) return make_response({"task": task.to_dict()}, 200) diff --git a/migrations/versions/735ec5539917_updated_goal_model.py b/migrations/versions/735ec5539917_updated_goal_model.py new file mode 100644 index 000000000..006fad4b8 --- /dev/null +++ b/migrations/versions/735ec5539917_updated_goal_model.py @@ -0,0 +1,28 @@ +"""updated Goal model + +Revision ID: 735ec5539917 +Revises: 513788d29724 +Create Date: 2022-11-09 14:12:52.696034 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '735ec5539917' +down_revision = '513788d29724' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.Text(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### From 103770409e7e73863d1938e957eb5ac86fa1da46 Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 15:05:11 -0500 Subject: [PATCH 21/31] implemented create_goal imported goals_bp into __init__ fixed validate_model import into goal_routes --- app/__init__.py | 2 ++ app/goal_routes.py | 21 +++++++++++++++++++-- app/models/goal.py | 11 +++++++++++ tests/test_wave_05.py | 2 +- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 69042176e..da5a1b0ae 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -31,6 +31,8 @@ def create_app(test_config=None): # Register Blueprints here from .task_routes import tasks_bp + from .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 1bddc5be2..a6a01c661 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -3,6 +3,23 @@ from app.models.task import Task from app.models.goal import Goal from datetime import datetime -from task_routes import validate_model +from .task_routes import validate_model import requests -import os \ No newline at end of file +import os + + +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + if (("title") not in request_body): + return make_response({"title": "Invalid data"}, 400) + + new_goal = Goal.from_dict(request_body) + db.session.add(new_goal) + db.session.commit() + + goal_response = Goal.query.get(1) + return make_response({"goal": goal_response.to_dict()}, 201) \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index 26a89c153..3dfc51258 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,14 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.Text) + + @classmethod + def from_dict(cls, goal_data): + new_task = Goal(title=goal_data["title"]) + return new_task + + def to_dict(self): + return { + "id": self.goal_id, + "title": self.title + } \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..1a2c78195 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -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={ From 878a374abac656cb2795f283680e8ed7b34cdbef Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 20:47:19 -0500 Subject: [PATCH 22/31] implemented get_all_goals --- app/goal_routes.py | 19 +++++++++++++++++-- tests/test_wave_05.py | 4 ++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index a6a01c661..6dce31b59 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -1,6 +1,6 @@ from flask import Blueprint, jsonify, abort, make_response, request from app import db -from app.models.task import Task +from app.models.goal import Goal from app.models.goal import Goal from datetime import datetime from .task_routes import validate_model @@ -22,4 +22,19 @@ def create_goal(): db.session.commit() goal_response = Goal.query.get(1) - return make_response({"goal": goal_response.to_dict()}, 201) \ No newline at end of file + return make_response({"goal": goal_response.to_dict()}, 201) + +@goals_bp.route("", methods=["GET"]) +def get_all_goals(): + sort_query = request.args.get("sort") + if sort_query == "asc": + goals = Goal.query.order_by(Goal.title) + elif sort_query == "desc": + goals = Goal.query.order_by(Goal.title.desc()) #ColumnElement.desc() method produces a descending ORDER BY clause element + else: + goals = Goal.query.all() + + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict()) + return jsonify(goals_response) \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 1a2c78195..c2417570f 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") From a47daf0b338a5a5d27d4df21a92331a98779246b Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 21:09:33 -0500 Subject: [PATCH 23/31] completed wave 05 --- app/goal_routes.py | 30 ++++++++++++++++-- tests/test_wave_05.py | 72 ++++++++++++++++++++----------------------- 2 files changed, 61 insertions(+), 41 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 6dce31b59..5ae3afdbe 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -15,7 +15,7 @@ def create_goal(): request_body = request.get_json() if (("title") not in request_body): - return make_response({"title": "Invalid data"}, 400) + return make_response({"details": "Invalid data"}, 400) new_goal = Goal.from_dict(request_body) db.session.add(new_goal) @@ -37,4 +37,30 @@ def get_all_goals(): goals_response = [] for goal in goals: goals_response.append(goal.to_dict()) - return jsonify(goals_response) \ No newline at end of file + return jsonify(goals_response) + +@goals_bp.route("/", methods=["GET"]) +def read_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + return make_response({"goal": goal.to_dict()}, 200) + +@goals_bp.route("/", methods=["PUT"]) +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + + return make_response({"goal": goal.to_dict()}, 200) + +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = validate_model(Goal, goal_id) + + db.session.delete(goal) + db.session.commit() + + return make_response({"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}, 200) \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index c2417570f..76593d7dc 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -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") @@ -46,19 +46,15 @@ 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 - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} #@pytest.mark.skip(reason="No way to test this feature yet") @@ -80,34 +76,39 @@ 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 - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "My Updated Goal" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "My Updated Goal" + } + } -@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 - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "My Updated Goal" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} -@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") @@ -122,29 +123,22 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") + response_body = response.get_json() assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - - -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} -@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 d8201885937ea53341c49a870548af71e344ab48 Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 21:18:25 -0500 Subject: [PATCH 24/31] added relationship to task and goal models --- app/models/goal.py | 1 + app/models/task.py | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/goal.py b/app/models/goal.py index 3dfc51258..cd528532f 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,6 +4,7 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.Text) + tasks = db.relationship("Task", back_populates="goal") @classmethod def from_dict(cls, goal_data): diff --git a/app/models/task.py b/app/models/task.py index de0c51a0e..fbe8226ab 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,7 @@ class Task(db.Model): title = db.Column(db.Text) description = db.Column(db.Text) completed_at = db.Column(db.DateTime, nullable=True) + goal = db.relationship("Goal", back_populates="task") @classmethod def from_dict(cls, task_data): From b203c8df2842be97a2ec70c57b12769c42c717c3 Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 21:22:10 -0500 Subject: [PATCH 25/31] added relationships to task and goal models 2/2 included goal_id, lazy=True, nullable=True --- app/models/goal.py | 2 +- app/models/task.py | 1 + ...c_added_relationships_to_task_and_goal_.py | 30 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py diff --git a/app/models/goal.py b/app/models/goal.py index cd528532f..133796f79 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, autoincrement=True) title = db.Column(db.Text) - tasks = db.relationship("Task", back_populates="goal") + tasks = db.relationship("Task", back_populates="goal", lazy=True) @classmethod def from_dict(cls, goal_data): diff --git a/app/models/task.py b/app/models/task.py index fbe8226ab..642705297 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,7 @@ class Task(db.Model): title = db.Column(db.Text) description = db.Column(db.Text) completed_at = db.Column(db.DateTime, nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) goal = db.relationship("Goal", back_populates="task") @classmethod diff --git a/migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py b/migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py new file mode 100644 index 000000000..c7c85c857 --- /dev/null +++ b/migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py @@ -0,0 +1,30 @@ +"""added relationships to task and goal models + +Revision ID: 6441e9eb484c +Revises: 735ec5539917 +Create Date: 2022-11-09 21:20:27.909261 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6441e9eb484c' +down_revision = '735ec5539917' +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 a77190dba6ae0dda2bc13cf117c7a4bdc4d0461e Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 21:25:13 -0500 Subject: [PATCH 26/31] reinitialized db --- ...c_added_relationships_to_task_and_goal_.py | 30 ------------------- .../735ec5539917_updated_goal_model.py | 28 ----------------- ...> fa6ad0d3b624_reinitializing_database.py} | 13 ++++---- 3 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py delete mode 100644 migrations/versions/735ec5539917_updated_goal_model.py rename migrations/versions/{513788d29724_reinitializing_task_model.py => fa6ad0d3b624_reinitializing_database.py} (69%) diff --git a/migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py b/migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py deleted file mode 100644 index c7c85c857..000000000 --- a/migrations/versions/6441e9eb484c_added_relationships_to_task_and_goal_.py +++ /dev/null @@ -1,30 +0,0 @@ -"""added relationships to task and goal models - -Revision ID: 6441e9eb484c -Revises: 735ec5539917 -Create Date: 2022-11-09 21:20:27.909261 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '6441e9eb484c' -down_revision = '735ec5539917' -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 ### diff --git a/migrations/versions/735ec5539917_updated_goal_model.py b/migrations/versions/735ec5539917_updated_goal_model.py deleted file mode 100644 index 006fad4b8..000000000 --- a/migrations/versions/735ec5539917_updated_goal_model.py +++ /dev/null @@ -1,28 +0,0 @@ -"""updated Goal model - -Revision ID: 735ec5539917 -Revises: 513788d29724 -Create Date: 2022-11-09 14:12:52.696034 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '735ec5539917' -down_revision = '513788d29724' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('goal', sa.Column('title', sa.Text(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('goal', 'title') - # ### end Alembic commands ### diff --git a/migrations/versions/513788d29724_reinitializing_task_model.py b/migrations/versions/fa6ad0d3b624_reinitializing_database.py similarity index 69% rename from migrations/versions/513788d29724_reinitializing_task_model.py rename to migrations/versions/fa6ad0d3b624_reinitializing_database.py index 985bee73b..701cfc156 100644 --- a/migrations/versions/513788d29724_reinitializing_task_model.py +++ b/migrations/versions/fa6ad0d3b624_reinitializing_database.py @@ -1,8 +1,8 @@ -"""reinitializing Task model +"""reinitializing database -Revision ID: 513788d29724 +Revision ID: fa6ad0d3b624 Revises: -Create Date: 2022-11-09 01:00:42.241045 +Create Date: 2022-11-09 21:24:56.926114 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '513788d29724' +revision = 'fa6ad0d3b624' down_revision = None branch_labels = None depends_on = None @@ -19,7 +19,8 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.create_table('goal', - sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('goal_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.Text(), nullable=True), sa.PrimaryKeyConstraint('goal_id') ) op.create_table('task', @@ -27,6 +28,8 @@ def upgrade(): sa.Column('title', sa.Text(), nullable=True), sa.Column('description', sa.Text(), nullable=True), sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ), sa.PrimaryKeyConstraint('id') ) # ### end Alembic commands ### From 71b47a3da1de9f21a0e21dc88deb6cca146b7b28 Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 21:39:57 -0500 Subject: [PATCH 27/31] fixed Task model goal back_populates="tasks" --- app/goal_routes.py | 13 ++++++++++++- app/models/task.py | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 5ae3afdbe..14588177f 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -63,4 +63,15 @@ def delete_goal(goal_id): db.session.delete(goal) db.session.commit() - return make_response({"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}, 200) \ No newline at end of file + return make_response( + {"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}, 200 + ) + +@goals_bp.route("//tasks", methods=["POST"]) +def assign_tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + task_ids = request_body["task_ids"] + + for id in task_ids: + pass \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 642705297..8feb0dde6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,7 +7,7 @@ class Task(db.Model): description = db.Column(db.Text) completed_at = db.Column(db.DateTime, nullable=True) goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) - goal = db.relationship("Goal", back_populates="task") + goal = db.relationship("Goal", back_populates="tasks") @classmethod def from_dict(cls, task_data): From f700f7d3d8c586e0ce95b3dd4763a703cfa44a83 Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 22:01:52 -0500 Subject: [PATCH 28/31] implemented post_task_ids_to_goals --- app/goal_routes.py | 15 +++++++++++++-- tests/test_wave_06.py | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 14588177f..3f196e550 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -1,7 +1,7 @@ from flask import Blueprint, jsonify, abort, make_response, request from app import db from app.models.goal import Goal -from app.models.goal import Goal +from app.models.task import Task from datetime import datetime from .task_routes import validate_model import requests @@ -73,5 +73,16 @@ def assign_tasks_to_goal(goal_id): request_body = request.get_json() task_ids = request_body["task_ids"] + task_list = [] for id in task_ids: - pass \ No newline at end of file + task = Task.query.get(id) + task_list.append(task) + goal.tasks = task_list + + db.session.commit() + + return make_response( + {"id": goal.goal_id, + "task_ids": task_ids}, + 200 + ) \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..9ee680527 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={ From 206513c44130b3968c084b6a05712b4bc3d56f2d Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 22:38:21 -0500 Subject: [PATCH 29/31] completed wave 06 --- app/goal_routes.py | 14 ++++++++++++++ app/models/task.py | 1 + tests/test_wave_06.py | 17 ++++++----------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 3f196e550..e1d08fb2a 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -85,4 +85,18 @@ def assign_tasks_to_goal(goal_id): {"id": goal.goal_id, "task_ids": task_ids}, 200 + ) + +@goals_bp.route("//tasks", methods=["GET"]) +def read_tasks_from_goal(goal_id): + goal = validate_model(Goal, goal_id) + + tasks_response = [] + for task in goal.tasks: + tasks_response.append(task.to_dict()) + + return make_response( + {"id": goal.goal_id, + "title": goal.title, + "tasks": tasks_response} ) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 8feb0dde6..94e438987 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -25,6 +25,7 @@ def is_complete(task_data): def to_dict(self): return { "id": self.id, + "goal_id": self.goal_id, "title": self.title, "description": self.description, "is_complete": self.is_complete() diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 9ee680527..ed8f6a97f 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -50,14 +50,9 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - - -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +69,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 +94,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 026c9633263eaef9452882e4383759ed93c8a7ca Mon Sep 17 00:00:00 2001 From: mhc Date: Wed, 9 Nov 2022 23:02:52 -0500 Subject: [PATCH 30/31] created Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file From e45260ec68de024af21cfa8b0b08f1ea8bf6c6e3 Mon Sep 17 00:00:00 2001 From: mhc Date: Thu, 10 Nov 2022 12:59:41 -0500 Subject: [PATCH 31/31] refactor task model to_dict --- app/models/task.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 94e438987..512dd0fe7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -23,10 +23,12 @@ def is_complete(task_data): return True def to_dict(self): - return { + task = { "id": self.id, - "goal_id": self.goal_id, "title": self.title, "description": self.description, "is_complete": self.is_complete() - } \ No newline at end of file + } + if self.goal_id: + task["goal_id"] = self.goal_id + return task \ No newline at end of file