From f692c25bd93c36f5f638551dbc90a9c1e5cb4e73 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 10:59:49 -0700 Subject: [PATCH 01/24] comletes task model and other initial configurations --- app/models/task.py | 5 +- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/5157eef40b90_.py | 39 +++++++++++ tests/test_wave_01.py | 4 +- 7 files changed, 211 insertions(+), 3 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/5157eef40b90_.py diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..1c2a926a3 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, autoincrement=True) + title = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + completed_at = db.Column(db.DateTime, nullable=True) 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/5157eef40b90_.py b/migrations/versions/5157eef40b90_.py new file mode 100644 index 000000000..94a072cd2 --- /dev/null +++ b/migrations/versions/5157eef40b90_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 5157eef40b90 +Revises: +Create Date: 2023-05-10 10:58:29.312307 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5157eef40b90' +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=False), + sa.Column('description', sa.String(), nullable=False), + 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..73301af60 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 08947874e8915d05bfa52dac332501a04a2bbbf4 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 11:33:52 -0700 Subject: [PATCH 02/24] implements get all tasks --- app/__init__.py | 2 ++ app/models/task.py | 8 ++++++++ app/routes.py | 20 +++++++++++++++++++- tests/test_wave_01.py | 6 +++--- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..30052751d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 1c2a926a3..0e333fb87 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,3 +6,11 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) + + def to_dict(self): + return { + "task_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 3aae38d49..583290f41 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,19 @@ -from flask import Blueprint \ No newline at end of file +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response, request + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["GET"]) +def get_all_tasks(): + tasks = Task.query.all() + results = [task.to_dict() for task in tasks] + + return jsonify(results) + +# @tasks_bp.route("/", methods=["GET"]) +# def get_one_task(): +# tasks = Task.query.all() +# results = [task.to_dict() for task in tasks] + +# return jsonify(results) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 73301af60..6cc6f9771 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") @@ -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={ From f2df6b3bf8039cb64996e054d0d222dc9d927379 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 11:38:04 -0700 Subject: [PATCH 03/24] implements validate_model --- app/routes.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/routes.py b/app/routes.py index 583290f41..017d183d7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,6 +4,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(jsonify({"message":f"{cls.__name__} {model_id} invalid"}), 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} not found"}), 404)) + + return model + @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): tasks = Task.query.all() From 6e4ff9a789695d2703246df3c846bff197d32c64 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 11:51:34 -0700 Subject: [PATCH 04/24] implements get one task but does not pass tests yet --- app/routes.py | 21 ++++++++++++++++----- tests/test_wave_01.py | 5 +++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index 017d183d7..bbd92c149 100644 --- a/app/routes.py +++ b/app/routes.py @@ -24,9 +24,20 @@ def get_all_tasks(): return jsonify(results) -# @tasks_bp.route("/", methods=["GET"]) -# def get_one_task(): -# tasks = Task.query.all() -# results = [task.to_dict() for task in tasks] +@tasks_bp.route("/", methods=["GET"]) +def get_one_task(task_id): + task = validate_model(Task, task_id) + response = {"task": task.to_dict()} -# return jsonify(results) \ No newline at end of file + return jsonify(response) + +# @tasks_bp.route("", methods=["POST"]) +# def create_task(): +# request_body = request.get_json() +# new_planet = Planet.from_dict(request_body) +# db.session.add(new_planet) +# db.session.commit() + +# request_body = request.get_json() + +# return make_response(jsonify(f"Planet {new_planet.name} created successfully."), 201) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6cc6f9771..8bf18f16b 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -59,11 +59,12 @@ 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") From 79ec1b797f95ea310893616e05f506cc7d678e49 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 11:53:52 -0700 Subject: [PATCH 05/24] adds classmethod from_dict --- app/models/task.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 0e333fb87..ae1bb95ff 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -13,4 +13,12 @@ def to_dict(self): "title": self.title, "description": self.description, "completed_at": self.completed_at - } \ No newline at end of file + } + + @classmethod + def from_dict(cls, task_data): + return Task( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data["completed_at"] + ) \ No newline at end of file From dfcbd5660fe1afa436ce027d43978eee5f573efc Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 12:14:35 -0700 Subject: [PATCH 06/24] changes to_dict method to align with expected result from tests --- app/models/task.py | 4 ++-- app/routes.py | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index ae1bb95ff..1f03e9de7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,10 +9,10 @@ class Task(db.Model): def to_dict(self): return { - "task_id": self.task_id, + "id": self.task_id, "title": self.title, "description": self.description, - "completed_at": self.completed_at + "is_complete": bool(self.completed_at) } @classmethod diff --git a/app/routes.py b/app/routes.py index bbd92c149..fda32a7d6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -31,13 +31,12 @@ def get_one_task(task_id): return jsonify(response) -# @tasks_bp.route("", methods=["POST"]) -# def create_task(): -# request_body = request.get_json() -# new_planet = Planet.from_dict(request_body) -# db.session.add(new_planet) -# db.session.commit() +@tasks_bp.route("", methods=["POST"]) +def create_task(): -# request_body = request.get_json() + request_body = request.get_json() + new_task = Task.from_dict(request_body) + db.session.add(new_task) + db.session.commit() -# return make_response(jsonify(f"Planet {new_planet.name} created successfully."), 201) \ No newline at end of file + return make_response(jsonify(f"Task {new_task.name} created successfully."), 201) \ No newline at end of file From 92a47a1510b590af9dc7501b540be364fe10bc91 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 12:33:41 -0700 Subject: [PATCH 07/24] finishes POST method --- app/models/task.py | 3 +++ app/routes.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 1f03e9de7..552c4cc29 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -17,6 +17,9 @@ def to_dict(self): @classmethod def from_dict(cls, task_data): + if "completed_at" not in task_data: + task_data["completed_at"] = None + return Task( title=task_data["title"], description=task_data["description"], diff --git a/app/routes.py b/app/routes.py index fda32a7d6..88682b8fd 100644 --- a/app/routes.py +++ b/app/routes.py @@ -38,5 +38,7 @@ def create_task(): new_task = Task.from_dict(request_body) db.session.add(new_task) db.session.commit() + + response = {"task": new_task.to_dict()} - return make_response(jsonify(f"Task {new_task.name} created successfully."), 201) \ No newline at end of file + return make_response((jsonify(response)), 201) \ No newline at end of file From 8537c01018907475f20864e73bfde888ea9c981d Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 14:49:37 -0700 Subject: [PATCH 08/24] implements update method (PUT) --- app/routes.py | 16 +++++++++++++++- tests/test_wave_01.py | 29 +++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/app/routes.py b/app/routes.py index 88682b8fd..e4a3ed5ef 100644 --- a/app/routes.py +++ b/app/routes.py @@ -41,4 +41,18 @@ def create_task(): response = {"task": new_task.to_dict()} - return make_response((jsonify(response)), 201) \ No newline at end of file + return make_response((jsonify(response)), 201) + +@tasks_bp.route("/", methods=["PUT"]) +def update_one_task(task_id): + task = validate_model(Task, task_id) + updated_data = request.get_json() + + task.title = updated_data["title"] + task.description = updated_data["description"] + + db.session.commit() + + response = {"task": task.to_dict()} + + return make_response(response, 200) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 8bf18f16b..4afc60ae2 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,6 @@ import pytest -# @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 +12,6 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -# @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") @@ -31,8 +29,6 @@ def test_get_tasks_one_saved_tasks(client, one_task): } ] - -# @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 +47,6 @@ def test_get_task(client, one_task): } -# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -59,15 +54,9 @@ 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"] == "Task 1 not found" -# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -94,7 +83,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={ @@ -120,7 +109,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,14 +120,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"] == "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") @@ -153,7 +138,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") @@ -170,7 +155,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={ @@ -187,7 +172,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 cf4d0c97d227411e85925425d4da9b591e82403c Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 15:03:34 -0700 Subject: [PATCH 09/24] implements delete method --- app/routes.py | 12 +++++++++++- tests/test_wave_01.py | 13 +++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/routes.py b/app/routes.py index e4a3ed5ef..aa0fa3fb2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -55,4 +55,14 @@ def update_one_task(task_id): response = {"task": task.to_dict()} - return make_response(response, 200) \ No newline at end of file + return make_response(response, 200) + +@tasks_bp.route("", methods=["DELETE"]) +def delete_one_task(task_id): + task_to_delete = validate_model(Task, task_id) + + db.session.delete(task_to_delete) + db.session.commit() + + message = {"details":f"Task {task_id} \"{task_to_delete.title}\" successfully deleted"} + return make_response(message, 200) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 4afc60ae2..e40cff754 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -83,7 +83,6 @@ def test_create_task(client): assert new_task.completed_at == None -# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -109,7 +108,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -# @pytest.mark.skip(reason="No way to test this feature yet") + def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -123,7 +122,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 response = client.delete("/tasks/1") @@ -138,7 +137,6 @@ def test_delete_task(client, one_task): assert Task.query.get(1) == None -# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -146,12 +144,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":"Task 1 not found"} assert Task.query.all() == [] From 32c4222b5ae9813eb913fae5cb9d2b486b2de9c1 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 15:06:52 -0700 Subject: [PATCH 10/24] adds data validation to CREATE method --- app/routes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index aa0fa3fb2..e3944f4df 100644 --- a/app/routes.py +++ b/app/routes.py @@ -33,8 +33,12 @@ def get_one_task(task_id): @tasks_bp.route("", methods=["POST"]) def create_task(): - request_body = request.get_json() + + new_task_is_valid = "title" in request_body and "description" in request_body + if not new_task_is_valid: + abort(make_response(jsonify({"details":"Invalid data"}), 400)) + new_task = Task.from_dict(request_body) db.session.add(new_task) db.session.commit() From f9976f2cba3e18d5ae678e8cf4f03e502aa80bf8 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 16:16:37 -0700 Subject: [PATCH 11/24] adds sort for query params --- app/routes.py | 12 +++++++++++- tests/test_wave_02.py | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index e3944f4df..be9d237db 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request +from sqlalchemy import desc tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -19,7 +20,16 @@ def validate_model(cls, model_id): @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): - tasks = Task.query.all() + + sort_direction = request.args.get("sort") + + if sort_direction == "asc": + tasks = Task.query.order_by(Task.title) + elif sort_direction == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + results = [task.to_dict() for task in tasks] return jsonify(results) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..e03e5c99a 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,6 @@ import pytest -@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 +28,6 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@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 7b019b3342b18ee372644a5e153517a93b06fc51 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 17:52:22 -0700 Subject: [PATCH 12/24] begins wave 03 --- app/routes.py | 18 +++++++++++++++++- tests/test_wave_03.py | 12 ++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index be9d237db..c71b143f9 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request from sqlalchemy import desc +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -79,4 +80,19 @@ def delete_one_task(task_id): db.session.commit() message = {"details":f"Task {task_id} \"{task_to_delete.title}\" successfully deleted"} - return make_response(message, 200) \ No newline at end of file + return make_response(message, 200) + +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def complete_one_task(task_id): + task = validate_model(Task, task_id) + # if completed at is null + # change completed_at to be the current datetime + # return 200 + if not task.completed_at: + task.completed_at = datetime.date + task.is_complete = True + + # THIS WONT CHANGE + db.session.commit() + response = {"task": task.to_dict()} + return make_response(response, 200) \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..9233073df 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -134,7 +134,7 @@ def test_mark_complete_missing_task(client): # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") From 6db8193d33c3a582f8089a16edb12251d07bdca3 Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 18:08:17 -0700 Subject: [PATCH 13/24] adds is_complete to Task model and updates db --- app/models/task.py | 1 + ...d0c7fd01_adds_is_complete_to_task_model.py | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 migrations/versions/4847d0c7fd01_adds_is_complete_to_task_model.py diff --git a/app/models/task.py b/app/models/task.py index 552c4cc29..2e173dc45 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,7 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) + is_complete = db.Column(db.Boolean, nullable=True) def to_dict(self): return { diff --git a/migrations/versions/4847d0c7fd01_adds_is_complete_to_task_model.py b/migrations/versions/4847d0c7fd01_adds_is_complete_to_task_model.py new file mode 100644 index 000000000..1e97d1424 --- /dev/null +++ b/migrations/versions/4847d0c7fd01_adds_is_complete_to_task_model.py @@ -0,0 +1,28 @@ +"""adds is_complete to Task model + +Revision ID: 4847d0c7fd01 +Revises: 5157eef40b90 +Create Date: 2023-05-10 18:07:11.785147 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4847d0c7fd01' +down_revision = '5157eef40b90' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### From fc31131d38bdf7319bd3ccc3d75dd394a5f6bb8d Mon Sep 17 00:00:00 2001 From: nadia Date: Wed, 10 May 2023 18:39:02 -0700 Subject: [PATCH 14/24] restores model to original configuration --- app/models/task.py | 1 - app/routes.py | 21 ++++++++++---- ...774e90b2_changes_model_back_to_original.py | 28 +++++++++++++++++++ tests/test_wave_03.py | 27 ++++++------------ 4 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 migrations/versions/414f774e90b2_changes_model_back_to_original.py diff --git a/app/models/task.py b/app/models/task.py index 2e173dc45..552c4cc29 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,7 +6,6 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) - is_complete = db.Column(db.Boolean, nullable=True) def to_dict(self): return { diff --git a/app/routes.py b/app/routes.py index c71b143f9..2ab2bd52e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -85,14 +85,23 @@ def delete_one_task(task_id): @tasks_bp.route("//mark_complete", methods=["PATCH"]) def complete_one_task(task_id): task = validate_model(Task, task_id) - # if completed at is null - # change completed_at to be the current datetime - # return 200 + if not task.completed_at: - task.completed_at = datetime.date - task.is_complete = True + task.completed_at = datetime.now() + + + + db.session.commit() + response = {"task": task.to_dict()} + return make_response(response, 200) + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def incomplete_one_task(task_id): + task = validate_model(Task, task_id) + + if task.completed_at: + task.completed_at = None - # THIS WONT CHANGE db.session.commit() response = {"task": task.to_dict()} return make_response(response, 200) \ No newline at end of file diff --git a/migrations/versions/414f774e90b2_changes_model_back_to_original.py b/migrations/versions/414f774e90b2_changes_model_back_to_original.py new file mode 100644 index 000000000..dfe9e7242 --- /dev/null +++ b/migrations/versions/414f774e90b2_changes_model_back_to_original.py @@ -0,0 +1,28 @@ +"""changes model back to original + +Revision ID: 414f774e90b2 +Revises: 4847d0c7fd01 +Create Date: 2023-05-10 18:38:29.002944 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '414f774e90b2' +down_revision = '4847d0c7fd01' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) + # ### end Alembic commands ### diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 9233073df..ebd2f9f0e 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,6 @@ import pytest -# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -41,8 +40,6 @@ 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") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -61,8 +58,6 @@ 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") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -98,8 +93,6 @@ 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") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +112,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") + def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +120,13 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body == { + "message": "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") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +134,7 @@ 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 "message" in response_body + assert response_body == { + "message": "Task 1 not found" + } \ No newline at end of file From cbdee8e58059aab1722ea7449be873e13ed57a9d Mon Sep 17 00:00:00 2001 From: nadia Date: Thu, 11 May 2023 16:51:07 -0700 Subject: [PATCH 15/24] add slack api message bot to finish wave 04 --- app/routes.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 2ab2bd52e..e11120ee4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,8 +3,11 @@ from flask import Blueprint, jsonify, abort, make_response, request from sqlalchemy import desc from datetime import datetime +import os +import requests tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +SLACK_API_TOKEN = os.environ.get("SLACK_API_TOKEN") def validate_model(cls, model_id): try: @@ -89,9 +92,15 @@ def complete_one_task(task_id): if not task.completed_at: task.completed_at = datetime.now() + db.session.commit() + url = "https://slack.com/api/chat.postMessage" + headers = {"Authorization": f"Bearer {SLACK_API_TOKEN}"} + message = f"Someone just completed the task {task.title}" + data = {"channel": "random", "text": message} + + requests.post(url, headers=headers, data=data) - db.session.commit() response = {"task": task.to_dict()} return make_response(response, 200) From c3d1629047f050c04d0d1a3509bd1548f755ce99 Mon Sep 17 00:00:00 2001 From: nadia Date: Thu, 11 May 2023 17:03:24 -0700 Subject: [PATCH 16/24] add goal model and refactor repository --- app/__init__.py | 4 +++- app/helpers.py | 14 ++++++++++++ app/models/goal.py | 14 +++++++++++- app/routes/__init__.py | 0 app/routes/goal_routes.py | 10 +++++++++ app/{routes.py => routes/task_routes.py} | 15 +------------ migrations/versions/bfa003677cf1_.py | 28 ++++++++++++++++++++++++ 7 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 app/helpers.py create mode 100644 app/routes/__init__.py create mode 100644 app/routes/goal_routes.py rename app/{routes.py => routes/task_routes.py} (88%) create mode 100644 migrations/versions/bfa003677cf1_.py diff --git a/app/__init__.py b/app/__init__.py index 30052751d..5b0e88768 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,9 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import tasks_bp + from .routes.task_routes import tasks_bp app.register_blueprint(tasks_bp) + from .routes.goal_routes import goals_bp + app.register_blueprint(goals_bp) return app diff --git a/app/helpers.py b/app/helpers.py new file mode 100644 index 000000000..88da3e4ef --- /dev/null +++ b/app/helpers.py @@ -0,0 +1,14 @@ +from flask import jsonify, abort, make_response + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} invalid"}), 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} not found"}), 404)) + + return model \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..e3374d708 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,17 @@ from app import db - class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + + def to_dict(self): + return { + "id": self.goal_id, + "title": self.title + } + + @classmethod + def from_dict(cls, goal_data): + return Goal( + title=goal_data["title"], + ) \ No newline at end of file diff --git a/app/routes/__init__.py b/app/routes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py new file mode 100644 index 000000000..3344faec2 --- /dev/null +++ b/app/routes/goal_routes.py @@ -0,0 +1,10 @@ +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response, request +from datetime import datetime +from app.helpers import validate_model +import os +import requests + +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + diff --git a/app/routes.py b/app/routes/task_routes.py similarity index 88% rename from app/routes.py rename to app/routes/task_routes.py index e11120ee4..87379a557 100644 --- a/app/routes.py +++ b/app/routes/task_routes.py @@ -1,27 +1,14 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request -from sqlalchemy import desc from datetime import datetime +from app.helpers import validate_model import os import requests tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") SLACK_API_TOKEN = os.environ.get("SLACK_API_TOKEN") -def validate_model(cls, model_id): - try: - model_id = int(model_id) - except: - abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} invalid"}), 400)) - - model = cls.query.get(model_id) - - if not model: - abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} not found"}), 404)) - - return model - @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): diff --git a/migrations/versions/bfa003677cf1_.py b/migrations/versions/bfa003677cf1_.py new file mode 100644 index 000000000..20026ac3c --- /dev/null +++ b/migrations/versions/bfa003677cf1_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: bfa003677cf1 +Revises: 414f774e90b2 +Create Date: 2023-05-11 17:02:56.658321 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'bfa003677cf1' +down_revision = '414f774e90b2' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### From 4544c050b73a8169fa10c7a54596fe8ddfe94916 Mon Sep 17 00:00:00 2001 From: nadia Date: Thu, 11 May 2023 17:32:29 -0700 Subject: [PATCH 17/24] pass wave 04 tests --- app/routes/goal_routes.py | 54 ++++++++++++++++++++++++++++- tests/test_wave_05.py | 72 +++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 41 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3344faec2..527d267a2 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,5 @@ from app import db -from app.models.task import Task +from app.models.goal import Goal from flask import Blueprint, jsonify, abort, make_response, request from datetime import datetime from app.helpers import validate_model @@ -8,3 +8,55 @@ goals_bp = Blueprint("goals", __name__, url_prefix="/goals") +@goals_bp.route("", methods=["GET"]) +def get_all_goals(): + goals = Goal.query.all() + results = [goal.to_dict() for goal in goals] + + return jsonify(results) + +@goals_bp.route("/", methods=["GET"]) +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + response = {"goal": goal.to_dict()} + + return jsonify(response) + +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + new_goal_is_valid = "title" in request_body + if not new_goal_is_valid: + abort(make_response(jsonify({"details":"Invalid data"}), 400)) + + new_goal = Goal.from_dict(request_body) + db.session.add(new_goal) + db.session.commit() + + response = {"goal": new_goal.to_dict()} + + return make_response((jsonify(response)), 201) + +@goals_bp.route("", methods=["DELETE"]) +def delete_one_goal(goal_id): + goal_to_delete = validate_model(Goal, goal_id) + + db.session.delete(goal_to_delete) + db.session.commit() + + message = {"details":f"Goal {goal_id} \"{goal_to_delete.title}\" successfully deleted"} + return make_response(message, 200) + +@goals_bp.route("/", methods=["PUT"]) +def update_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + updated_data = request.get_json() + + goal.title = updated_data["title"] + + db.session.commit() + + response = {"goal": goal.to_dict()} + + return make_response(response, 200) \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..d643d8651 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ import pytest +from app.models.goal import Goal -@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,6 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +28,6 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@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,22 +44,17 @@ def test_get_goal(client, one_goal): } -@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") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +73,38 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + 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": "Updated Goal Title" + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" -@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": "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") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -122,29 +119,24 @@ 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") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.get("/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" + assert Goal.query.all() == [] + -@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 ba51bbf0aa6108ec86dda4cf036867b8b4655831 Mon Sep 17 00:00:00 2001 From: nadia Date: Thu, 11 May 2023 19:15:37 -0700 Subject: [PATCH 18/24] begin wave 06 --- app/models/goal.py | 1 + app/models/task.py | 2 ++ app/routes/goal_routes.py | 12 ++++++++++- migrations/versions/f4749869b553_.py | 30 ++++++++++++++++++++++++++++ tests/test_wave_06.py | 7 ------- 5 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 migrations/versions/f4749869b553_.py diff --git a/app/models/goal.py b/app/models/goal.py index e3374d708..9b5f21486 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,6 +3,7 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) + tasks = db.relationship("Task", back_populates="goal") def to_dict(self): return { diff --git a/app/models/task.py b/app/models/task.py index 552c4cc29..f0cc39630 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,8 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id")) + goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): return { diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 527d267a2..a3b903b72 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -59,4 +59,14 @@ def update_one_goal(goal_id): response = {"goal": goal.to_dict()} - return make_response(response, 200) \ No newline at end of file + return make_response(response, 200) + +@goals_bp.route("//tasks", methods=["GET"]) +def get_all_tasks_of_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + + # tasks_response = [task.to_dict() for task in goal.tasks] + + goal = goal.to_dict() + + return jsonify(goal) \ No newline at end of file diff --git a/migrations/versions/f4749869b553_.py b/migrations/versions/f4749869b553_.py new file mode 100644 index 000000000..f3c5e53b5 --- /dev/null +++ b/migrations/versions/f4749869b553_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: f4749869b553 +Revises: bfa003677cf1 +Create Date: 2023-05-11 19:01:31.755386 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f4749869b553' +down_revision = 'bfa003677cf1' +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/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..22aeb2abe 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,6 @@ import pytest -@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 +22,6 @@ 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") 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 +40,6 @@ 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") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -57,7 +54,6 @@ def test_get_tasks_for_specific_goal_no_goal(client): # ***************************************************************** -@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 +70,6 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@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") @@ -98,8 +93,6 @@ 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") 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 c2b7b4cb8376b9ab99f9f73ec1e19d4c5db60c27 Mon Sep 17 00:00:00 2001 From: nadia Date: Thu, 11 May 2023 20:46:48 -0700 Subject: [PATCH 19/24] pauses work on wave 06 --- app/models/goal.py | 10 +++++++--- app/models/task.py | 11 ++++++++--- app/routes/goal_routes.py | 23 ++++++++++++++++++++++- tests/test_wave_06.py | 1 - 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 9b5f21486..581255623 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,11 +5,15 @@ class Goal(db.Model): title = db.Column(db.String) tasks = db.relationship("Task", back_populates="goal") - def to_dict(self): - return { + def to_dict(self, tasks=False): + goal_as_dict = { "id": self.goal_id, - "title": self.title + "title": self.title, } + # if tasks: + # goal_as_dict["tasks"] = [task.to_dict() for task in self.tasks] + + return goal_as_dict @classmethod def from_dict(cls, goal_data): diff --git a/app/models/task.py b/app/models/task.py index f0cc39630..2b1cb890d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,13 +10,18 @@ class Task(db.Model): goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): - return { + # add goal_id only if there are goal + task_as_dict = { "id": self.task_id, "title": self.title, "description": self.description, "is_complete": bool(self.completed_at) - } - + } + + # if self.goal_id: + # task_as_dict["goal_id"] = self.goal_id + + return task_as_dict @classmethod def from_dict(cls, task_data): if "completed_at" not in task_data: diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index a3b903b72..9bcaab9e3 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -69,4 +69,25 @@ def get_all_tasks_of_one_goal(goal_id): goal = goal.to_dict() - return jsonify(goal) \ No newline at end of file + return jsonify(goal) + +# def to_json(self, tasks=False): +# goal_dict = { +# "id": self.goal_id, +# "title": self.title, +# } +# if tasks: +# goal_dict["tasks"] = [task.to_json() for task in self.tasks] +# return goal_dict + +# def to_json(self): +# task_dict = { +# "id": self.task_id, +# "title": self.title, +# "description": self.description, +# "is_complete": self.completed_at is not None +# } +# if self.goal_id: +# task_dict["goal_id"] = self.goal_id + +# return task_dict \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 22aeb2abe..9e8f4430b 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -53,7 +53,6 @@ def test_get_tasks_for_specific_goal_no_goal(client): # **Complete test with assertion about response body*************** # ***************************************************************** - def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") From 301bf025741893b097f599f18fa8bc5ce3dfba50 Mon Sep 17 00:00:00 2001 From: nadia Date: Thu, 11 May 2023 22:27:07 -0700 Subject: [PATCH 20/24] pass two tests wave 06 --- app/models/goal.py | 6 ++--- app/models/task.py | 4 ++-- app/routes/goal_routes.py | 48 ++++++++++++++++----------------------- tests/test_wave_06.py | 2 ++ 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 581255623..47b70d82e 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,13 +5,13 @@ class Goal(db.Model): title = db.Column(db.String) tasks = db.relationship("Task", back_populates="goal") - def to_dict(self, tasks=False): + def to_dict(self): goal_as_dict = { "id": self.goal_id, "title": self.title, } - # if tasks: - # goal_as_dict["tasks"] = [task.to_dict() for task in self.tasks] + if self.tasks: + goal_as_dict["task_ids"] = [task.to_dict() for task in self.tasks] return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index 2b1cb890d..44e331988 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,7 +6,7 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) - goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id")) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): @@ -20,7 +20,7 @@ def to_dict(self): # if self.goal_id: # task_as_dict["goal_id"] = self.goal_id - + return task_as_dict @classmethod def from_dict(cls, task_data): diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 9bcaab9e3..261a46475 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,10 +1,8 @@ from app import db from app.models.goal import Goal +from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request -from datetime import datetime from app.helpers import validate_model -import os -import requests goals_bp = Blueprint("goals", __name__, url_prefix="/goals") @@ -61,33 +59,27 @@ def update_one_goal(goal_id): return make_response(response, 200) +@goals_bp.route("//tasks", methods=["POST"]) +def create_tasks_for_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + + for task_id in request_body["task_ids"]: + task = validate_model(Task, task_id) + task.goal_id = goal.goal_id + db.session.commit() + + task_id_list = [task.task_id for task in goal.tasks] + + response_body = { + "id":goal.goal_id, + "task_ids": task_id_list + } + return jsonify(response_body) + @goals_bp.route("//tasks", methods=["GET"]) def get_all_tasks_of_one_goal(goal_id): goal = validate_model(Goal, goal_id) - # tasks_response = [task.to_dict() for task in goal.tasks] - goal = goal.to_dict() - - return jsonify(goal) - -# def to_json(self, tasks=False): -# goal_dict = { -# "id": self.goal_id, -# "title": self.title, -# } -# if tasks: -# goal_dict["tasks"] = [task.to_json() for task in self.tasks] -# return goal_dict - -# def to_json(self): -# task_dict = { -# "id": self.task_id, -# "title": self.title, -# "description": self.description, -# "is_complete": self.completed_at is not None -# } -# if self.goal_id: -# task_dict["goal_id"] = self.goal_id - -# return task_dict \ No newline at end of file + return jsonify(goal) \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 9e8f4430b..e75b3d9f5 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -47,12 +47,14 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") From 111448daa6fbdf4550d8b89a5aa1d9d033b4a34a Mon Sep 17 00:00:00 2001 From: nadia Date: Fri, 12 May 2023 08:34:02 -0700 Subject: [PATCH 21/24] finish wave 06 --- app/models/goal.py | 4 ++-- app/models/task.py | 4 ++-- app/routes/goal_routes.py | 6 +++++- tests/test_wave_06.py | 7 +------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 47b70d82e..e0c131907 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -10,8 +10,8 @@ def to_dict(self): "id": self.goal_id, "title": self.title, } - if self.tasks: - goal_as_dict["task_ids"] = [task.to_dict() for task in self.tasks] + # if self.tasks: + # goal_as_dict["task_ids"] = [task.to_dict() for task in self.tasks] return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index 44e331988..e44fc1447 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -18,8 +18,8 @@ def to_dict(self): "is_complete": bool(self.completed_at) } - # if self.goal_id: - # task_as_dict["goal_id"] = self.goal_id + if self.goal_id: + task_as_dict["goal_id"] = self.goal_id return task_as_dict @classmethod diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 261a46475..1cd313a82 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -80,6 +80,10 @@ def create_tasks_for_one_goal(goal_id): @goals_bp.route("//tasks", methods=["GET"]) def get_all_tasks_of_one_goal(goal_id): goal = validate_model(Goal, goal_id) - # tasks_response = [task.to_dict() for task in goal.tasks] + + tasks_this_goal = [task.to_dict() for task in goal.tasks] + goal = goal.to_dict() + goal["tasks"] = tasks_this_goal + return jsonify(goal) \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index e75b3d9f5..3938bbb73 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -47,12 +47,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - assert 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"} def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): From c3b2a6a3d2e488406da980d22f93da0a17c1e939 Mon Sep 17 00:00:00 2001 From: nadia Date: Fri, 12 May 2023 08:55:53 -0700 Subject: [PATCH 22/24] begin deploy to Render --- app/__init__.py | 2 +- app/routes/task_routes.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 5b0e88768..90d23dd04 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,7 +16,7 @@ def create_app(test_config=None): if test_config is None: app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + "RENDER_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 87379a557..5afaec615 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -7,7 +7,6 @@ import requests tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") -SLACK_API_TOKEN = os.environ.get("SLACK_API_TOKEN") @tasks_bp.route("", methods=["GET"]) def get_all_tasks(): @@ -80,8 +79,9 @@ def complete_one_task(task_id): task.completed_at = datetime.now() db.session.commit() - + url = "https://slack.com/api/chat.postMessage" + SLACK_API_TOKEN = os.environ.get("SLACK_API_TOKEN") headers = {"Authorization": f"Bearer {SLACK_API_TOKEN}"} message = f"Someone just completed the task {task.title}" data = {"channel": "random", "text": message} From 7ce979fabc3fc8454680147d151a2942fca77d81 Mon Sep 17 00:00:00 2001 From: nadia Date: Fri, 12 May 2023 09:34:49 -0700 Subject: [PATCH 23/24] minor changes --- app/routes/goal_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 1cd313a82..57f2303e7 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -70,7 +70,7 @@ def create_tasks_for_one_goal(goal_id): db.session.commit() task_id_list = [task.task_id for task in goal.tasks] - + response_body = { "id":goal.goal_id, "task_ids": task_id_list From bb3932eb9318c6cd822b244a61b5733347b99713 Mon Sep 17 00:00:00 2001 From: nadia Date: Sat, 13 May 2023 12:31:25 -0700 Subject: [PATCH 24/24] cleans up Goal model --- app/models/goal.py | 6 +++--- app/models/task.py | 1 - app/routes/goal_routes.py | 7 +------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index e0c131907..5a7299d95 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,13 +5,13 @@ class Goal(db.Model): title = db.Column(db.String) tasks = db.relationship("Task", back_populates="goal") - def to_dict(self): + def to_dict(self, tasks=False): goal_as_dict = { "id": self.goal_id, "title": self.title, } - # if self.tasks: - # goal_as_dict["task_ids"] = [task.to_dict() for task in self.tasks] + if tasks: + goal_as_dict["tasks"] = [task.to_dict() for task in self.tasks] return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index e44fc1447..ff7e5f670 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,7 +10,6 @@ class Task(db.Model): goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): - # add goal_id only if there are goal task_as_dict = { "id": self.task_id, "title": self.title, diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 57f2303e7..53bfd4f70 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -80,10 +80,5 @@ def create_tasks_for_one_goal(goal_id): @goals_bp.route("//tasks", methods=["GET"]) def get_all_tasks_of_one_goal(goal_id): goal = validate_model(Goal, goal_id) - - tasks_this_goal = [task.to_dict() for task in goal.tasks] - - goal = goal.to_dict() - goal["tasks"] = tasks_this_goal - + goal = goal.to_dict(tasks=True) return jsonify(goal) \ No newline at end of file