From d3b6a25352a78d4cc47012caa1db724e3b817df5 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Mon, 8 May 2023 17:59:10 -0700 Subject: [PATCH 01/24] added nullability --- app/models/task.py | 17 +++- app/routes.py | 3 +- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../3870b246c9e2_added_nullability_default.py | 39 ++++++++ tests/test_wave_01.py | 22 ++--- 8 files changed, 234 insertions(+), 13 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/3870b246c9e2_added_nullability_default.py diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..a3c9e59ac 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +2,19 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True, autoincrement = True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, default = None, nullable = True) + + +def to_json(self): + is_complete = True if self.completed_at else False; + + return{ + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } + diff --git a/app/routes.py b/app/routes.py index 3aae38d49..8e9dfe684 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,2 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint + 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/3870b246c9e2_added_nullability_default.py b/migrations/versions/3870b246c9e2_added_nullability_default.py new file mode 100644 index 000000000..c268989ab --- /dev/null +++ b/migrations/versions/3870b246c9e2_added_nullability_default.py @@ -0,0 +1,39 @@ +"""added nullability default + +Revision ID: 3870b246c9e2 +Revises: +Create Date: 2023-05-08 17:56:09.519347 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3870b246c9e2' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..9ad258c89 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 3b04e8e9fd1e36baa4199d8f60f7fb7ef23b265b Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Mon, 8 May 2023 18:10:02 -0700 Subject: [PATCH 02/24] testing --- app/models/task.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/task.py b/app/models/task.py index a3c9e59ac..39ce71f8a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,6 +8,7 @@ class Task(db.Model): completed_at = db.Column(db.DateTime, default = None, nullable = True) + def to_json(self): is_complete = True if self.completed_at else False; From ddb09721e99f79b53a2515dfc03e96d3576ef59b Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Mon, 8 May 2023 20:32:49 -0700 Subject: [PATCH 03/24] completes get_one/get_all POST/GET functions --- app/__init__.py | 2 ++ app/helper.py | 15 +++++++++++++ app/models/task.py | 22 ++++++++++++------- app/routes.py | 49 ++++++++++++++++++++++++++++++++++++++++++- tests/test_wave_01.py | 16 +++++++------- 5 files changed, 87 insertions(+), 17 deletions(-) create mode 100644 app/helper.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/helper.py b/app/helper.py new file mode 100644 index 000000000..a928fd0b3 --- /dev/null +++ b/app/helper.py @@ -0,0 +1,15 @@ +from flask import abort, make_response +from app.models.task import Task + +def validate_task(id): + try: + id = int(id) + except: + abort(make_response({"message": f"Task {id} is invalid"}, 400)) + + task = Task.query.get(id) + + if not task: + abort(make_response({"message": f"Task {id} not found"}, 404)) + + return task \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 39ce71f8a..09af1c08a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,13 +9,19 @@ class Task(db.Model): -def to_json(self): - is_complete = True if self.completed_at else False; + def to_json(self): + is_complete = True if self.completed_at else False; - return{ - "id": self.task_id, - "title": self.title, - "description": self.description, - "is_complete": is_complete - } + return{ + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } + @classmethod + def create_dict(cls, response_body): + return cls( + title = response_body["title"], + description = response_body["description"] + ) diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..221382403 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,49 @@ -from flask import Blueprint +from flask import Blueprint, jsonify, make_response, request +from app import db +from app.models.task import Task +from app.helper import validate_task +tasks_bp = Blueprint("tasks", __name__, url_prefix= "/tasks") + +# GET all task - GET[READ] - /tasks + +@tasks_bp.route("", methods =["GET"]) +def get_all_tasks(): + title_query = request.args.get("title") + description_query = request.args.get("description") + completed_query = request.args.get("is_complete") + + if title_query: + tasks = Task.query.filter_by(title = title_query) + elif description_query: + tasks = Task.query.filter_by(description = description_query) + elif completed_query: + tasks = Task.query.filter_by(is_completed = completed_query) + else: + tasks = Task.query.all() + + + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_json()) + + return jsonify(tasks_response), 200 + +# GET one task - /tasks/ - [READ] + +@tasks_bp.route("/", methods=["GET"]) +def get_one_task(id): + task = validate_task(id) + + return jsonify({"task":task.to_json()}), 200 + +#POST - /tasks - [CREATE] +@tasks_bp.route("", methods= ["POST"]) +def create_task(): + request_body = request.get_json() + new_task = Task.create_dict(request_body) + + db.session.add(new_task) + db.session.commit() + + return make_response({"task":new_task.to_json()}), 201 \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 9ad258c89..fed3aee8e 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -60,11 +60,11 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** - + assert response_body == {"message": "Task 1 not found"} #@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): @@ -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 763f291934e34499544f28899e4a95a4ea684eed Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Mon, 8 May 2023 23:01:07 -0700 Subject: [PATCH 04/24] completes DELETE one task function --- app/helper.py | 6 +++++- app/models/task.py | 5 +++++ app/routes.py | 42 ++++++++++++++++++++++++++++++++++-------- tests/test_wave_01.py | 7 ++++--- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/app/helper.py b/app/helper.py index a928fd0b3..3e942c254 100644 --- a/app/helper.py +++ b/app/helper.py @@ -12,4 +12,8 @@ def validate_task(id): if not task: abort(make_response({"message": f"Task {id} not found"}, 404)) - return task \ No newline at end of file + return task + + + + diff --git a/app/models/task.py b/app/models/task.py index 09af1c08a..37b166cb6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -18,6 +18,10 @@ def to_json(self): "description": self.description, "is_complete": is_complete } + + def update_dict(self, request_body): + self.title = request_body["title"] + self.description = request_body["description"] @classmethod def create_dict(cls, response_body): @@ -25,3 +29,4 @@ def create_dict(cls, response_body): title = response_body["title"], description = response_body["description"] ) + diff --git a/app/routes.py b/app/routes.py index 221382403..cd07060de 100644 --- a/app/routes.py +++ b/app/routes.py @@ -6,13 +6,11 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix= "/tasks") # GET all task - GET[READ] - /tasks - @tasks_bp.route("", methods =["GET"]) def get_all_tasks(): title_query = request.args.get("title") description_query = request.args.get("description") completed_query = request.args.get("is_complete") - if title_query: tasks = Task.query.filter_by(title = title_query) elif description_query: @@ -21,8 +19,6 @@ def get_all_tasks(): tasks = Task.query.filter_by(is_completed = completed_query) else: tasks = Task.query.all() - - tasks_response = [] for task in tasks: tasks_response.append(task.to_json()) @@ -30,11 +26,9 @@ def get_all_tasks(): return jsonify(tasks_response), 200 # GET one task - /tasks/ - [READ] - @tasks_bp.route("/", methods=["GET"]) def get_one_task(id): task = validate_task(id) - return jsonify({"task":task.to_json()}), 200 #POST - /tasks - [CREATE] @@ -42,8 +36,40 @@ def get_one_task(id): def create_task(): request_body = request.get_json() new_task = Task.create_dict(request_body) - db.session.add(new_task) db.session.commit() + return make_response({"task":new_task.to_json()}), 200 + +#UPDATE one task- PUT /tasks/ (UPDATE) +@tasks_bp.route("/",methods=["PUT"]) +def update_task(id): + task = validate_task(id) + request_body = request.get_json() + task.update_dict(request_body) + db.session.commit() + + return jsonify({"task":task.to_json()}), 200 + +#DELETE one task -DELETE /tasks/ (DELETE) +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(id): + task_to_delete = validate_task(id) + + db.session.delete(task_to_delete) + db.session.commit() + + message = {"details": f'Task 1 "{task_to_delete.title}" successfully deleted'} + return make_response(message, 200) + + + # message = "details": 'Task 1 "Go on my daily walk {task_to_delete.title}" successfuly deleted' + # return make_response(message,200) + + # message = {"details": f'Task {task_to_delete.title} "{task_to_delete.description}" successfully deleted'} + # return make_response(message, 200) + + + #return make_response({"details": f"Task {task.title} successfully deleted"}) + - return make_response({"task":new_task.to_json()}), 201 \ No newline at end of file +# #return make_response({"task":new_task}) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index fed3aee8e..bad2969a0 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -66,7 +66,7 @@ def test_get_task_not_found(client): # ***************************************************************** assert response_body == {"message": "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_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={ @@ -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") @@ -201,3 +201,4 @@ def test_create_task_must_contain_description(client): "details": "Invalid data" } assert Task.query.all() == [] + From 762bea8cbb923cc22051c5b85a3f3fe06e0aa9a9 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Tue, 9 May 2023 20:36:12 -0700 Subject: [PATCH 05/24] passing wave 1 --- app/models/task.py | 19 ++++++++++++------- app/routes.py | 13 +------------ tests/test_wave_01.py | 19 ++++++++++--------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 37b166cb6..fd4845c23 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,10 +1,12 @@ from app import db +from flask import abort, make_response, jsonify + class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement = True) - title = db.Column(db.String) - description = db.Column(db.String) + title = db.Column(db.String, nullable = False) + description = db.Column(db.String, nullable = False ) completed_at = db.Column(db.DateTime, default = None, nullable = True) @@ -25,8 +27,11 @@ def update_dict(self, request_body): @classmethod def create_dict(cls, response_body): - return cls( - title = response_body["title"], - description = response_body["description"] - ) - + try: + new_task = cls( + title = response_body["title"], + description = response_body["description"] + ) + except KeyError: + abort(make_response(jsonify({"details": "Invalid data"}), 400)) + return new_task \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index cd07060de..f2a02f2ba 100644 --- a/app/routes.py +++ b/app/routes.py @@ -38,7 +38,7 @@ def create_task(): new_task = Task.create_dict(request_body) db.session.add(new_task) db.session.commit() - return make_response({"task":new_task.to_json()}), 200 + return make_response({"task":new_task.to_json()}), 201 #UPDATE one task- PUT /tasks/ (UPDATE) @tasks_bp.route("/",methods=["PUT"]) @@ -62,14 +62,3 @@ def delete_task(id): return make_response(message, 200) - # message = "details": 'Task 1 "Go on my daily walk {task_to_delete.title}" successfuly deleted' - # return make_response(message,200) - - # message = {"details": f'Task {task_to_delete.title} "{task_to_delete.description}" successfully deleted'} - # return make_response(message, 200) - - - #return make_response({"details": f"Task {task.title} successfully deleted"}) - - -# #return make_response({"task":new_task}) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index bad2969a0..a04085c16 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -66,7 +66,7 @@ def test_get_task_not_found(client): # ***************************************************************** assert response_body == {"message": "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_create_task(client): # Act response = client.post("/tasks", 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={ @@ -131,11 +131,11 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** - + assert response_body == {"message": "Task 1 not found"} #@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): @@ -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") @@ -161,15 +161,16 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** - assert Task.query.all() == [] + assert Task.query.get(1) == None + assert response_body == {"message": "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_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -186,7 +187,7 @@ def test_create_task_must_contain_title(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_description(client): # Act response = client.post("/tasks", json={ From 3891dd708e3a5a52b5fcd1dfb2cfda063cc17f94 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Tue, 9 May 2023 21:02:12 -0700 Subject: [PATCH 06/24] passing wave2 --- app/routes.py | 13 ++++--------- tests/test_wave_02.py | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/routes.py b/app/routes.py index f2a02f2ba..870b6f5b6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,15 +8,10 @@ # GET all task - GET[READ] - /tasks @tasks_bp.route("", methods =["GET"]) def get_all_tasks(): - title_query = request.args.get("title") - description_query = request.args.get("description") - completed_query = request.args.get("is_complete") - if title_query: - tasks = Task.query.filter_by(title = title_query) - elif description_query: - tasks = Task.query.filter_by(description = description_query) - elif completed_query: - tasks = Task.query.filter_by(is_completed = completed_query) + if request.args.get("sort") == "asc": + tasks = Task.query.order_by(Task.title.asc()) + elif request.args.get("sort") == "desc": + tasks = Task.query.order_by(Task.title.desc()) else: tasks = Task.query.all() tasks_response = [] diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..c9a76e6b1 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 a669c46369148cf4f7a6d43a57ccce8ab2691b72 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Tue, 9 May 2023 22:32:43 -0700 Subject: [PATCH 07/24] passing test_mark_complete --- app/models/task.py | 9 +++++---- app/routes.py | 9 +++++++++ tests/test_wave_03.py | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index fd4845c23..2f59c0b63 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,7 +1,6 @@ from app import db from flask import abort, make_response, jsonify - - +from datetime import datetime class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement = True) @@ -9,8 +8,6 @@ class Task(db.Model): description = db.Column(db.String, nullable = False ) completed_at = db.Column(db.DateTime, default = None, nullable = True) - - def to_json(self): is_complete = True if self.completed_at else False; @@ -25,6 +22,10 @@ def update_dict(self, request_body): self.title = request_body["title"] self.description = request_body["description"] + def patch_complete(self, request_body): + self.completed_at = datetime.utcnow() + + @classmethod def create_dict(cls, response_body): try: diff --git a/app/routes.py b/app/routes.py index 870b6f5b6..af46f07dd 100644 --- a/app/routes.py +++ b/app/routes.py @@ -56,4 +56,13 @@ def delete_task(id): message = {"details": f'Task 1 "{task_to_delete.title}" successfully deleted'} return make_response(message, 200) +# PATCH tasks//mark_complete (UPDATE) +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_completed(id): + task_to_patch = validate_task(id) + request_body = request.get_json() + task_to_patch.patch_complete(request_body) + db.session.commit() + + return jsonify({"task":task_to_patch.to_json()}), 200 diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..6f4ab0f6d 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 """ From 2d53b43a2f849194f7f2b65ba62626ace1318699 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Tue, 9 May 2023 23:04:20 -0700 Subject: [PATCH 08/24] passing mark_incomplete --- app/models/task.py | 4 +++- app/routes.py | 18 +++++++++++++++--- tests/test_wave_03.py | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 2f59c0b63..f36e14eb0 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -25,7 +25,9 @@ def update_dict(self, request_body): def patch_complete(self, request_body): self.completed_at = datetime.utcnow() - + def patch_incomplete(self,request_body): + self.completed_at = None + @classmethod def create_dict(cls, response_body): try: diff --git a/app/routes.py b/app/routes.py index af46f07dd..0b3a0975c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -59,10 +59,22 @@ def delete_task(id): # PATCH tasks//mark_complete (UPDATE) @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_completed(id): - task_to_patch = validate_task(id) + task_to_complete = validate_task(id) request_body = request.get_json() - task_to_patch.patch_complete(request_body) + task_to_complete.patch_complete(request_body) db.session.commit() - return jsonify({"task":task_to_patch.to_json()}), 200 + return jsonify({"task":task_to_complete.to_json()}), 200 + +#PATCH /tasks/1/mark_incomplete" (UPDATE) +@tasks_bp.route("//mark_incomplete", methods = ["PATCH"]) +def mark_incompleted(id): + task_to_incomplete = validate_task(id) + request_body = request.get_json() + task_to_incomplete.patch_incomplete(request_body) + db.session.commit() + + return jsonify({"task":task_to_incomplete.to_json()}), 200 + + diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 6f4ab0f6d..b47b2a787 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -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") From 70e6fa75678480488696d5b5a8948605ee5a7522 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Tue, 9 May 2023 23:12:47 -0700 Subject: [PATCH 09/24] passing wave 3 --- tests/test_wave_03.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index b47b2a787..af314cb58 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -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") @@ -128,13 +128,13 @@ 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") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == {"message": "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_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -143,7 +143,8 @@ 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") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == {"message": "Task 1 not found"} \ No newline at end of file From 1aee551b2877182061bd0b9182cc8e59c5157a7e Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 11 May 2023 21:20:10 -0700 Subject: [PATCH 10/24] passing wave4 --- app/models/task.py | 2 +- app/routes.py | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index f36e14eb0..0fb2b3910 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,5 @@ from app import db -from flask import abort, make_response, jsonify +from flask import abort, make_response, jsonify from datetime import datetime class Task(db.Model): diff --git a/app/routes.py b/app/routes.py index 0b3a0975c..c791b8daf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,3 +1,5 @@ +import os +import requests from flask import Blueprint, jsonify, make_response, request from app import db from app.models.task import Task @@ -57,14 +59,14 @@ def delete_task(id): return make_response(message, 200) # PATCH tasks//mark_complete (UPDATE) -@tasks_bp.route("//mark_complete", methods=["PATCH"]) -def mark_completed(id): - task_to_complete = validate_task(id) - request_body = request.get_json() - task_to_complete.patch_complete(request_body) - db.session.commit() +# @tasks_bp.route("//mark_complete", methods=["PATCH"]) +# def mark_completed(id): +# task_to_complete = validate_task(id) +# request_body = request.get_json() +# task_to_complete.patch_complete(request_body) +# db.session.commit() - return jsonify({"task":task_to_complete.to_json()}), 200 +# return jsonify({"task":task_to_complete.to_json()}), 200 #PATCH /tasks/1/mark_incomplete" (UPDATE) @tasks_bp.route("//mark_incomplete", methods = ["PATCH"]) @@ -78,3 +80,24 @@ def mark_incompleted(id): +# PATCH tasks//mark_complete (UPDATE) +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_completed(id): + task_to_complete = validate_task(id) + request_body = request.get_json() + task_to_complete.patch_complete(request_body) + + db.session.commit() + + PATH = "https://slack.com/api/chat.postMessage" + + query_params = { + "channel": "api-test-channel", + "text": f'Task {task_to_complete.title} has been completed!' + } + + headers = {"Authorization": os.environ.get("SLACK_API_KEY")} + + requests.post(PATH, params=query_params, headers=headers) + + return jsonify({"task":task_to_complete.to_json()}), 200 \ No newline at end of file From 8d1997408197e2ea687e2875c75c522cdbe7c382 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 11 May 2023 22:39:17 -0700 Subject: [PATCH 11/24] wave5 2 tests passing --- app/__init__.py | 3 +++ app/goal_routes.py | 28 ++++++++++++++++++++++++++++ app/helper.py | 12 ++++++++++++ app/models/goal.py | 19 ++++++++++++++++++- app/routes.py | 12 ------------ tests/test_wave_05.py | 8 ++++---- 6 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 app/goal_routes.py diff --git a/app/__init__.py b/app/__init__.py index 30052751d..d0eb91d5b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -33,4 +33,7 @@ def create_app(test_config=None): from .routes import tasks_bp app.register_blueprint(tasks_bp) + from .goal_routes import goals_bp + app.register_blueprint(goals_bp) + return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..e2ee8cbbb --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,28 @@ +import os +import requests +from flask import Blueprint, jsonify, make_response, request +from app import db +from app.models.goal import Goal +from app.helper import validate_goal + +#CREATE BP/ENDPOINT +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +#POST - /goals - [CREATE] +@goals_bp.route("", methods= ["POST"]) +def create_goal(): + request_body = request.get_json() + new_goal = Goal.create_dict(request_body) + db.session.add(new_goal) + db.session.commit() + return make_response({"goal":new_goal.to_json()}), 201 + +# GET one goal - /goals/ - [READ] +@goals_bp.route("/", methods=["GET"]) +def get_one_goal(id): + goal = validate_goal(id) + return jsonify({"goal":goal.to_json()}), 200 + + + +#POST request/response [POST] / one goal (CREATE) diff --git a/app/helper.py b/app/helper.py index 3e942c254..4f9928b18 100644 --- a/app/helper.py +++ b/app/helper.py @@ -1,4 +1,5 @@ from flask import abort, make_response +from app.models.goal import Goal from app.models.task import Task def validate_task(id): @@ -15,5 +16,16 @@ def validate_task(id): return task +def validate_goal(id): + try: + id = int(id) + except: + abort(make_response({"message": f"Goal {id} is invalid"}, 400)) + + goal = Goal.query.get(id) + + if not goal: + abort(make_response({"message": f"Goal {id} not found"}, 404)) + return goal diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..23b2d34f2 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,22 @@ from app import db - +from flask import abort, make_response, jsonify class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String, nullable = False) + + def to_json(self): + return{ + "id": self.goal_id, + "title": self.title + } + + @classmethod + def create_dict(cls, response_body): + try: + new_goal = cls( + title = response_body["title"] + ) + except KeyError: + abort(make_response(jsonify({"details": "Invalid data"}), 400)) + return new_goal \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index c791b8daf..72a920793 100644 --- a/app/routes.py +++ b/app/routes.py @@ -58,16 +58,6 @@ def delete_task(id): message = {"details": f'Task 1 "{task_to_delete.title}" successfully deleted'} return make_response(message, 200) -# PATCH tasks//mark_complete (UPDATE) -# @tasks_bp.route("//mark_complete", methods=["PATCH"]) -# def mark_completed(id): -# task_to_complete = validate_task(id) -# request_body = request.get_json() -# task_to_complete.patch_complete(request_body) -# db.session.commit() - -# return jsonify({"task":task_to_complete.to_json()}), 200 - #PATCH /tasks/1/mark_incomplete" (UPDATE) @tasks_bp.route("//mark_incomplete", methods = ["PATCH"]) def mark_incompleted(id): @@ -78,8 +68,6 @@ def mark_incompleted(id): return jsonify({"task":task_to_incomplete.to_json()}), 200 - - # PATCH tasks//mark_complete (UPDATE) @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_completed(id): diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..70ba0feba 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") @@ -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={ @@ -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 From 9d50edf1bf93891191a3313408a2ef255f4d336f Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 11 May 2023 23:34:15 -0700 Subject: [PATCH 12/24] passing wave5 --- app/goal_routes.py | 35 +++++++++++++++++++++++++++++ app/models/goal.py | 3 +++ tests/test_wave_05.py | 52 ++++++++++++++++++++++++++++++++----------- 3 files changed, 77 insertions(+), 13 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index e2ee8cbbb..d5e6156d6 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -8,6 +8,22 @@ #CREATE BP/ENDPOINT goals_bp = Blueprint("goals", __name__, url_prefix="/goals") +# GET all goals - GET[READ] - /goals +@goals_bp.route("", methods =["GET"]) +def get_all_goals(): + # if request.args.get("sort") == "asc": + # goals = Goal.query.order_by(Goal.title.asc()) + # elif request.args.get("sort") == "desc": + # goals = Goal.query.order_by(Goal.title.desc()) + # else: + goals = Goal.query.all() + goals_response = [] + for goal in goals: + goals_response.append(goal.to_json()) + + return jsonify(goals_response), 200 + + #POST - /goals - [CREATE] @goals_bp.route("", methods= ["POST"]) def create_goal(): @@ -23,6 +39,25 @@ def get_one_goal(id): goal = validate_goal(id) return jsonify({"goal":goal.to_json()}), 200 +#UPDATE one goal- PUT /goals/ (UPDATE) +@goals_bp.route("/",methods=["PUT"]) +def update_goal(id): + goal = validate_goal(id) + request_body = request.get_json() + goal.update_dict(request_body) + db.session.commit() + + return jsonify({"goal":goal.to_json()}), 200 + +#DELETE one goal -DELETE /goals/ (DELETE) +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(id): + goal_to_delete = validate_goal(id) + + db.session.delete(goal_to_delete) + db.session.commit() + message = {"details": f'Goal 1 "{goal_to_delete.title}" successfully deleted'} + return make_response(message, 200) #POST request/response [POST] / one goal (CREATE) diff --git a/app/models/goal.py b/app/models/goal.py index 23b2d34f2..f0edcead6 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -11,6 +11,9 @@ def to_json(self): "title": self.title } + def update_dict(self, request_body): + self.title = request_body["title"] + @classmethod def create_dict(cls, response_body): try: diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 70ba0feba..af1032d71 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 @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -46,19 +47,21 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + #raise Exception("Complete test") # Assert # ---- Complete Test ---- # assertion 1 goes here # assertion 2 goes here # ---- Complete Test ---- + assert response_body == {"message": "Goal 1 not found"} + assert response.status_code == 404 #@pytest.mark.skip(reason="No way to test this feature yet") @@ -82,9 +85,13 @@ 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") + #raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- @@ -92,22 +99,36 @@ def test_update_goal(client, one_goal): # assertion 2 goes here # assertion 3 goes here # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title", + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" - -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + #raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert # ---- 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") @@ -124,27 +145,32 @@ 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*************** # ***************************************************************** + assert Goal.query.get(1) == None - -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") + #raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here # assertion 2 goes here # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert Goal.query.get(1) == None + 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 68bf2b1a003df72cb958d622cff7875bcae0cb77 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Sat, 13 May 2023 22:42:35 -0700 Subject: [PATCH 13/24] passing all waves --- app/__init__.py | 2 +- app/goal_routes.py | 45 ++++++++++++++++++++++------ app/models/goal.py | 7 +++-- app/models/task.py | 11 ++++++- app/{routes.py => task_routes.py} | 26 +++++++++------- migrations/versions/2cfcef63b555_.py | 44 +++++++++++++++++++++++++++ tests/test_wave_01.py | 2 ++ tests/test_wave_06.py | 16 +++++----- 8 files changed, 121 insertions(+), 32 deletions(-) rename app/{routes.py => task_routes.py} (84%) create mode 100644 migrations/versions/2cfcef63b555_.py diff --git a/app/__init__.py b/app/__init__.py index d0eb91d5b..b8aba69ee 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import tasks_bp + from .task_routes import tasks_bp app.register_blueprint(tasks_bp) from .goal_routes import goals_bp diff --git a/app/goal_routes.py b/app/goal_routes.py index d5e6156d6..d8c1c4d59 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -2,8 +2,9 @@ import requests from flask import Blueprint, jsonify, make_response, request from app import db -from app.models.goal import Goal -from app.helper import validate_goal +from app.models.goal import Goal +from app.models.task import Task +from app.helper import validate_goal, validate_task #CREATE BP/ENDPOINT goals_bp = Blueprint("goals", __name__, url_prefix="/goals") @@ -23,6 +24,11 @@ def get_all_goals(): return jsonify(goals_response), 200 +# GET one goal - /goals/ - [READ] +@goals_bp.route("/", methods=["GET"]) +def get_one_goal(id): + goal = validate_goal(id) + return jsonify({"goal":goal.to_json()}), 200 #POST - /goals - [CREATE] @goals_bp.route("", methods= ["POST"]) @@ -33,12 +39,6 @@ def create_goal(): db.session.commit() return make_response({"goal":new_goal.to_json()}), 201 -# GET one goal - /goals/ - [READ] -@goals_bp.route("/", methods=["GET"]) -def get_one_goal(id): - goal = validate_goal(id) - return jsonify({"goal":goal.to_json()}), 200 - #UPDATE one goal- PUT /goals/ (UPDATE) @goals_bp.route("/",methods=["PUT"]) def update_goal(id): @@ -60,4 +60,31 @@ def delete_goal(id): message = {"details": f'Goal 1 "{goal_to_delete.title}" successfully deleted'} return make_response(message, 200) -#POST request/response [POST] / one goal (CREATE) +#POST taks ids to goal /goals/1/tasks [CREATE] +@goals_bp.route("//tasks", methods=["POST"]) +def post_task_ids_to_goal(id): + goal = validate_goal(id) + request_body = request.get_json() + + validated_task = [] + [validated_task.append(validate_task(task_id)) for task_id in request_body["task_ids"]] + # for task_id in request_body["task_ids"]: + # task = validate_task(task_id) + # validated_task.append(task) + + [goal.tasks.append(task) for task in validated_task if task not in goal.tasks] + # for task in validated_task: + # if task not in goal.tasks: + # goal.tasks.append(task) + + db.session.commit() + + + return make_response({"id" : goal.goal_id, "task_ids":request_body["task_ids"]}), 200 + +# GET one goal - /goals/ - [READ] +@goals_bp.route("//tasks", methods=["GET"]) +def get_tasks_in_one_goal(id): + goal = validate_goal(id) + goal_with_tasks = [Task.to_json(task) for task in goal.tasks] + return jsonify({"id":goal.goal_id, "title":goal.title, "tasks":goal_with_tasks}), 200 \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index f0edcead6..3a96d130a 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,7 +4,8 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String, nullable = False) - + tasks = db.relationship("Task", back_populates="goal", lazy=True) + def to_json(self): return{ "id": self.goal_id, @@ -22,4 +23,6 @@ def create_dict(cls, response_body): ) except KeyError: abort(make_response(jsonify({"details": "Invalid data"}), 400)) - return new_goal \ No newline at end of file + return new_goal + + diff --git a/app/models/task.py b/app/models/task.py index 0fb2b3910..a84d7bda1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,16 +7,25 @@ class Task(db.Model): title = db.Column(db.String, nullable = False) description = db.Column(db.String, nullable = False ) completed_at = db.Column(db.DateTime, default = None, nullable = True) + #child - many to one (the task are the children/ many children(tasks) to one parent(goal)) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + goal = db.relationship("Goal", back_populates="tasks") + def to_json(self): is_complete = True if self.completed_at else False; - return{ + task_return = { "id": self.task_id, "title": self.title, "description": self.description, "is_complete": is_complete } + + if self.goal_id: + task_return["goal_id"] = self.goal_id + + return task_return def update_dict(self, request_body): self.title = request_body["title"] diff --git a/app/routes.py b/app/task_routes.py similarity index 84% rename from app/routes.py rename to app/task_routes.py index 72a920793..436d4611e 100644 --- a/app/routes.py +++ b/app/task_routes.py @@ -1,13 +1,13 @@ -import os -import requests +import os, requests from flask import Blueprint, jsonify, make_response, request from app import db from app.models.task import Task from app.helper import validate_task +#CREATE BP/ENDPOINT tasks_bp = Blueprint("tasks", __name__, url_prefix= "/tasks") -# GET all task - GET[READ] - /tasks +# GET all tasks - /tasks [READ] @tasks_bp.route("", methods =["GET"]) def get_all_tasks(): if request.args.get("sort") == "asc": @@ -22,32 +22,35 @@ def get_all_tasks(): return jsonify(tasks_response), 200 -# GET one task - /tasks/ - [READ] +# GET one task - /tasks/ [READ] @tasks_bp.route("/", methods=["GET"]) def get_one_task(id): task = validate_task(id) return jsonify({"task":task.to_json()}), 200 -#POST - /tasks - [CREATE] +#POST - /tasks [CREATE] @tasks_bp.route("", methods= ["POST"]) def create_task(): request_body = request.get_json() new_task = Task.create_dict(request_body) + db.session.add(new_task) db.session.commit() + return make_response({"task":new_task.to_json()}), 201 -#UPDATE one task- PUT /tasks/ (UPDATE) +#PUT one task - /tasks/ [UPDATE] @tasks_bp.route("/",methods=["PUT"]) def update_task(id): task = validate_task(id) request_body = request.get_json() task.update_dict(request_body) + db.session.commit() return jsonify({"task":task.to_json()}), 200 -#DELETE one task -DELETE /tasks/ (DELETE) +#DELETE one task - /tasks/ [DELETE] @tasks_bp.route("/", methods=["DELETE"]) def delete_task(id): task_to_delete = validate_task(id) @@ -58,17 +61,18 @@ def delete_task(id): message = {"details": f'Task 1 "{task_to_delete.title}" successfully deleted'} return make_response(message, 200) -#PATCH /tasks/1/mark_incomplete" (UPDATE) +#PATCH /tasks/1/mark_incomplete" [UPDATE] @tasks_bp.route("//mark_incomplete", methods = ["PATCH"]) def mark_incompleted(id): task_to_incomplete = validate_task(id) request_body = request.get_json() task_to_incomplete.patch_incomplete(request_body) + db.session.commit() return jsonify({"task":task_to_incomplete.to_json()}), 200 -# PATCH tasks//mark_complete (UPDATE) +# PATCH tasks//mark_complete [UPDATE] @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_completed(id): task_to_complete = validate_task(id) @@ -84,8 +88,8 @@ def mark_completed(id): "text": f'Task {task_to_complete.title} has been completed!' } - headers = {"Authorization": os.environ.get("SLACK_API_KEY")} + the_headers = {"Authorization": os.environ.get("SLACK_API_KEY")} - requests.post(PATH, params=query_params, headers=headers) + requests.post(PATH, params=query_params, headers=the_headers) return jsonify({"task":task_to_complete.to_json()}), 200 \ No newline at end of file diff --git a/migrations/versions/2cfcef63b555_.py b/migrations/versions/2cfcef63b555_.py new file mode 100644 index 000000000..8a9d0488f --- /dev/null +++ b/migrations/versions/2cfcef63b555_.py @@ -0,0 +1,44 @@ +"""empty message + +Revision ID: 2cfcef63b555 +Revises: 3870b246c9e2 +Create Date: 2023-05-13 21:34:43.872722 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2cfcef63b555' +down_revision = '3870b246c9e2' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=False)) + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=False) + 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.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=True) + op.drop_column('task', 'goal_id') + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index a04085c16..3e10a5a14 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -66,6 +66,7 @@ def test_get_task_not_found(client): # ***************************************************************** assert response_body == {"message": "Task 1 not found"} + #@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act @@ -137,6 +138,7 @@ def test_update_task_not_found(client): # ***************************************************************** assert response_body == {"message": "Task 1 not found"} + #@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..f10829b5d 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -51,13 +51,13 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + 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_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 c66a0b8c50f8302a6cb0a117031889d730b34fd4 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Tue, 23 May 2023 16:36:50 -0700 Subject: [PATCH 14/24] Connect to Render db --- app/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index b8aba69ee..eea2c50d1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,8 +15,9 @@ def create_app(test_config=None): app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + #app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + #"SQLALCHEMY_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("RENDER_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( From 3dd77c8afd4d91293cbd766fb234371ae01ca797 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Wed, 6 Sep 2023 17:25:20 -0700 Subject: [PATCH 15/24] changes the database environment variable name from Renderbase_URL to Databaseurl --- app/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index eea2c50d1..5d09a36e8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,13 +15,10 @@ def create_app(test_config=None): app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: - #app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - #"SQLALCHEMY_DATABASE_URI") - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("RENDER_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("DATABASE_URI") else: app.config["TESTING"] = True - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + 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 11d2442d1c076a66c23dc30d6e2914d78651baee Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 7 Sep 2023 15:41:53 -0700 Subject: [PATCH 16/24] adds web:flask run to Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..af820e1b1 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: flask run \ No newline at end of file From df2b6bbcda89aa05411de818e8cc9083eec5a9a1 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 7 Sep 2023 15:47:21 -0700 Subject: [PATCH 17/24] changes procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index af820e1b1..6730bb663 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: flask run \ No newline at end of file +web: gunicorn "app:create_app()" \ No newline at end of file From 254a86a5327a97b57fe3869f38007319b54399d5 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 7 Sep 2023 15:51:54 -0700 Subject: [PATCH 18/24] everytime it deploys it will upgrade data base with release flask db upgrade in procfile --- Procfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 6730bb663..098bdac4c 100644 --- a/Procfile +++ b/Procfile @@ -1 +1,2 @@ -web: gunicorn "app:create_app()" \ No newline at end of file +release: flask db upgrade +web: gunicorn "app:create_app()" From b7af79caf707637210db7762dccd6071ab7cccac Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 7 Sep 2023 16:03:58 -0700 Subject: [PATCH 19/24] changes URI to URL --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 5d09a36e8..f250f90b1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,7 +15,7 @@ def create_app(test_config=None): app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("DATABASE_URL") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") From 00a0c2df119834077ac5c8e233e1a7f2d844312f Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Thu, 7 Sep 2023 23:41:21 -0700 Subject: [PATCH 20/24] adds flask cors --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index 453f0ef6a..bbe6d45e9 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==7.2.5 Flask==1.1.2 +Flask-Cors==4.0.0 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 gunicorn==20.1.0 @@ -30,5 +32,6 @@ requests==2.25.1 six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.5 Werkzeug==1.0.1 From 7287e00bb2a9e42cabbec28109b09b80295d3efd Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Fri, 8 Sep 2023 00:05:39 -0700 Subject: [PATCH 21/24] adds import cors and calls app with cors --- app/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index f250f90b1..57b6c6f86 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,6 +3,7 @@ from flask_migrate import Migrate import os from dotenv import load_dotenv +from flask_cors import CORS db = SQLAlchemy() @@ -12,6 +13,7 @@ def create_app(test_config=None): app = Flask(__name__) + CORS(app) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: From d747a54b4c37427aae308eb60094ab899f58425f Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Sat, 17 Aug 2024 16:45:44 -0700 Subject: [PATCH 22/24] goal_routes minor spelling change --- app/goal_routes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index d8c1c4d59..5d72add3f 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -39,7 +39,7 @@ def create_goal(): db.session.commit() return make_response({"goal":new_goal.to_json()}), 201 -#UPDATE one goal- PUT /goals/ (UPDATE) +#UPDATE one goal- PUT /goals/ [UPDATE] @goals_bp.route("/",methods=["PUT"]) def update_goal(id): goal = validate_goal(id) @@ -49,7 +49,7 @@ def update_goal(id): return jsonify({"goal":goal.to_json()}), 200 -#DELETE one goal -DELETE /goals/ (DELETE) +#DELETE one goal -DELETE /goals/ [DELETE] @goals_bp.route("/", methods=["DELETE"]) def delete_goal(id): goal_to_delete = validate_goal(id) @@ -60,7 +60,7 @@ def delete_goal(id): message = {"details": f'Goal 1 "{goal_to_delete.title}" successfully deleted'} return make_response(message, 200) -#POST taks ids to goal /goals/1/tasks [CREATE] +#POST tasks ids to goal /goals/1/tasks [CREATE] @goals_bp.route("//tasks", methods=["POST"]) def post_task_ids_to_goal(id): goal = validate_goal(id) From e4216fc3b5a0ad946ea8b28a8afa67822592bbd8 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Sat, 17 Aug 2024 16:46:33 -0700 Subject: [PATCH 23/24] minor chane in comment --- app/task_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/task_routes.py b/app/task_routes.py index 436d4611e..cf3f68ca7 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -61,7 +61,7 @@ def delete_task(id): message = {"details": f'Task 1 "{task_to_delete.title}" successfully deleted'} return make_response(message, 200) -#PATCH /tasks/1/mark_incomplete" [UPDATE] +#PATCH /tasks/1/mark_incomplete [UPDATE] @tasks_bp.route("//mark_incomplete", methods = ["PATCH"]) def mark_incompleted(id): task_to_incomplete = validate_task(id) From a342052777252c7238ce7ef2516cb4ec2ae7e264 Mon Sep 17 00:00:00 2001 From: Luwam Ghebremicael Date: Sat, 17 Aug 2024 16:47:36 -0700 Subject: [PATCH 24/24] instructions via comments --- app/models/goal.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/models/goal.py b/app/models/goal.py index 3a96d130a..648589b50 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,27 +1,52 @@ from app import db from flask import abort, make_response, jsonify +# Define the Goal class: it represents a goal in the database class Goal(db.Model): + # Define the goal_id column as the primary key for the Goal table goal_id = db.Column(db.Integer, primary_key=True) + + # Define the title column as a string that cannot be null title = db.Column(db.String, nullable = False) + + + # Establish a one-to-many relationship with the Task model(many tasks) + # The `tasks` attribute holds a list of Task objects related to this Goal + # `back_populates` refers to the "goal" relationship defined in the Task model tasks = db.relationship("Task", back_populates="goal", lazy=True) + + # Convert a Goal object to a JSON-serializable dictionary def to_json(self): return{ "id": self.goal_id, "title": self.title } + # Update the Goal object's attributes based on the provided request body def update_dict(self, request_body): self.title = request_body["title"] + + # @classmethod decorator indicates that create_dict is a class method associated + # with the class itself rather than any particular instance of the class + + # cls parameter: a reference to the class (Goal in this case) and is used + # to call the class’s constructor (cls(...)), allowing the method to create a new instance of the class. + + # create_dict method is designed to create a new Goal object using data provided in a dictionary (response_body). @classmethod + # When the create_dict method creates a new Goal object, it does so by calling the class constructor (cls(...)) def create_dict(cls, response_body): try: + # Create a new Goal object by calling the class constructor (cls(...)) + # Extract the "title" value from response_body and pass it to the Goal constructor + # to set the title attribute of the new Goal instance. new_goal = cls( title = response_body["title"] ) except KeyError: + # If the "title" key is missing from the response body, return a 400 error abort(make_response(jsonify({"details": "Invalid data"}), 400)) return new_goal