From 7dca5d51579afc7c030272e30aac697d6e5ecd71 Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Wed, 2 Nov 2022 14:21:26 -0700 Subject: [PATCH 1/9] setup --- app/models/task.py | 5 +- app/routes.py | 2 +- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/5206a89f6d20_.py | 39 +++++++++++ 7 files changed, 210 insertions(+), 2 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/5206a89f6d20_.py diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..659ee61d4 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) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 3aae38d49..2ba007eba 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1 @@ -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/5206a89f6d20_.py b/migrations/versions/5206a89f6d20_.py new file mode 100644 index 000000000..6101a589c --- /dev/null +++ b/migrations/versions/5206a89f6d20_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 5206a89f6d20 +Revises: +Create Date: 2022-11-02 14:19:32.031084 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5206a89f6d20' +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 ### From 68358a6453bea0b20b38d56b4386acfb823ddd63 Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Tue, 8 Nov 2022 14:40:19 -0800 Subject: [PATCH 2/9] wave 1 : CRUD for One model --- app/routes_helper.py | 14 +++++++++ migrations/versions/0a363700b466_.py | 30 +++++++++++++++++++ migrations/versions/0c706e9b4aec_.py | 28 +++++++++++++++++ .../versions/647dc5256ecc_added_bike_model.py | 30 +++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 app/routes_helper.py create mode 100644 migrations/versions/0a363700b466_.py create mode 100644 migrations/versions/0c706e9b4aec_.py create mode 100644 migrations/versions/647dc5256ecc_added_bike_model.py diff --git a/app/routes_helper.py b/app/routes_helper.py new file mode 100644 index 000000000..a8511ecbf --- /dev/null +++ b/app/routes_helper.py @@ -0,0 +1,14 @@ +from flask import jsonify, abort, make_response + +def get_one_obj_or_abort(cls, obj_id): + try: + obj_id = int(obj_id) + except ValueError: + abort(make_response(jsonify({"details": "Invalid data"}), 400)) + + matching_obj = cls.query.get(obj_id) + + if not matching_obj: + response_str = f"{cls.__name__} with id `{obj_id}` was not found in the database." + abort(make_response(jsonify({"message":response_str}), 404)) + return matching_obj \ No newline at end of file diff --git a/migrations/versions/0a363700b466_.py b/migrations/versions/0a363700b466_.py new file mode 100644 index 000000000..cf6ccf906 --- /dev/null +++ b/migrations/versions/0a363700b466_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 0a363700b466 +Revises: 647dc5256ecc +Create Date: 2022-11-08 12:34:03.104314 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '0a363700b466' +down_revision = '647dc5256ecc' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True)) + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', postgresql.TIMESTAMP(), autoincrement=False, nullable=True)) + op.drop_column('task', 'completed_at') + # ### end Alembic commands ### diff --git a/migrations/versions/0c706e9b4aec_.py b/migrations/versions/0c706e9b4aec_.py new file mode 100644 index 000000000..2cebc19ea --- /dev/null +++ b/migrations/versions/0c706e9b4aec_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 0c706e9b4aec +Revises: 0a363700b466 +Create Date: 2022-11-08 12:51:51.180278 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0c706e9b4aec' +down_revision = '0a363700b466' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### diff --git a/migrations/versions/647dc5256ecc_added_bike_model.py b/migrations/versions/647dc5256ecc_added_bike_model.py new file mode 100644 index 000000000..51cc3e05d --- /dev/null +++ b/migrations/versions/647dc5256ecc_added_bike_model.py @@ -0,0 +1,30 @@ +"""Added bike model + +Revision ID: 647dc5256ecc +Revises: 5206a89f6d20 +Create Date: 2022-11-07 01:44:59.822546 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '647dc5256ecc' +down_revision = '5206a89f6d20' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.DateTime(), nullable=True)) + op.drop_column('task', 'completed_at') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True)) + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### From 814aa8a686cac31e745915a309144062f1bfec9a Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Tue, 8 Nov 2022 20:58:00 -0800 Subject: [PATCH 3/9] Wave 2: Using query params --- app/__init__.py | 2 ++ app/models/task.py | 30 +++++++++++++++- app/routes.py | 80 ++++++++++++++++++++++++++++++++++++++++++- tests/test_wave_01.py | 44 +++++++++--------------- tests/test_wave_02.py | 4 +-- 5 files changed, 129 insertions(+), 31 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..14b242cca 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 app.routes import task_bp + app.register_blueprint(task_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 659ee61d4..74aafde95 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,4 +5,32 @@ 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) - completed_at = db.Column(db.DateTime) \ No newline at end of file + completed_at = db.Column(db.DateTime, nullable=True) + is_complete = db.Column(db.Boolean, default = False) + + def to_dict(self): + if self.completed_at is None: + task_dict = { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": False + } + else: + task_dict = { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": True + } + return task_dict + + @classmethod + def from_dict(cls, data_dict): + if "title" in data_dict and "description" in data_dict and "is_complete" in data_dict: + new_obj = cls( + title=data_dict["title"], + description=data_dict["description"], + is_complete=data_dict["is_complete"]) + + return new_obj \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 2ba007eba..eb9020ceb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,79 @@ -from flask import Blueprint +from flask import Blueprint, jsonify, request, abort, make_response +from app import db +from app.models.task import Task +from app.routes_helper import get_one_obj_or_abort + +task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") + + +@task_bp.route("", methods=["POST"]) +def create_task(): + response_body = request.get_json() + + # new_task = Task.from_dict(request_body) + if "title" not in response_body or\ + "description" not in response_body: + # “is_complete” not in respnse_body + return jsonify({"details": "Invalid data"}), 400 + new_task = Task( + title = response_body["title"], + description = response_body["description"],) + + db.session.add(new_task) + db.session.commit() + + return jsonify({"task": new_task.to_dict()}), 201 + +@task_bp.route("", methods=["GET"]) +def get_all_tasks(): + title_param = request.args.get("sort") + + if title_param == "asc": + tasks = Task.query.order_by(Task.title.asc()) + + elif title_param == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + + response = [task.to_dict() for task in tasks] + + return jsonify(response), 200 + +@task_bp.route("/", methods=["GET"]) +def get_one_task(task_id): + + chosen_task = get_one_obj_or_abort(Task, task_id) + + return jsonify({ + "task": chosen_task.to_dict()}), 200 + + +@task_bp.route("/", methods=["PUT"]) +def update_task_with_new_vals(task_id): + + chosen_task = get_one_obj_or_abort(Task, task_id) + + request_body = request.get_json() + + if "title" not in request_body or \ + "description" not in request_body: + return jsonify({"message":"Request must include title, description"}), 400 + + chosen_task.title = request_body["title"] + chosen_task.description = request_body["description"] + + + db.session.commit() + + return jsonify({f"task": chosen_task.to_dict()}), 200 + +@task_bp.route("/", methods=["DELETE"]) +def delete_one_task(task_id): + chosen_task = get_one_obj_or_abort(Task, task_id) + + db.session.delete(chosen_task) + + db.session.commit() + + return jsonify({"details": f'Task {chosen_task.task_id} "{chosen_task.title}" successfully deleted'}), 200 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..6d0b31423 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") @@ -59,19 +59,17 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + #add test with assertion about response body + # assert response_body == {"message": "Task with id 1 was not found in the database."} + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ "title": "A Brand New Task", "description": "Test Description", + }) response_body = response.get_json() @@ -93,7 +91,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 +117,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,13 +129,9 @@ 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 == {"details": "Invalid data"} - -@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 +146,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 +155,11 @@ 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 == {"details": "Invalid data"} 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 +176,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={ diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From 1da2879d6031161b451a4fe97486fd96976e5d46 Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Tue, 8 Nov 2022 22:12:41 -0800 Subject: [PATCH 4/9] modified test --- app/models/task.py | 28 ++++++++++++++-------------- tests/test_wave_01.py | 4 +++- tests/test_wave_03.py | 8 ++++---- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 74aafde95..6e9dee09f 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,22 +8,22 @@ class Task(db.Model): completed_at = db.Column(db.DateTime, nullable=True) is_complete = db.Column(db.Boolean, default = False) - def to_dict(self): - if self.completed_at is None: - task_dict = { - "id": self.task_id, - "title": self.title, - "description": self.description, - "is_complete": False - } + def check_is_complete(self): + if self.completed_at: + return True else: - task_dict = { - "id": self.task_id, - "title": self.title, - "description": self.description, - "is_complete": True - } + return False + + def to_dict(self): + task_dict = { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.check_is_complete() + } + return task_dict + @classmethod def from_dict(cls, data_dict): diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6d0b31423..5874263f7 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -60,6 +60,7 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 #add test with assertion about response body + assert "message" in response_body # assert response_body == {"message": "Task with id 1 was not found in the database."} @@ -128,7 +129,8 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - + #add test with assertion about response body + assert "details" in response_body assert response_body == {"details": "Invalid data"} # @pytest.mark.skip(reason="No way to test this feature yet") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..da8e6ba1e 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") From 8ecf60bb3803d270e6f64061ed3d77e59dbd567a Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Wed, 9 Nov 2022 21:32:55 -0800 Subject: [PATCH 5/9] Wave 3,4 Create custom endpoint & Using an external web API --- app/__init__.py | 3 + app/models/goal.py | 21 +++++ app/models/task.py | 17 ++-- app/routes.py | 112 ++++++++++++++++++++++++++- app/routes_helper.py | 2 +- migrations/versions/829f78d1e6ab_.py | 32 ++++++++ tests/test_wave_01.py | 2 +- tests/test_wave_03.py | 14 ++-- tests/test_wave_04.py | 7 ++ tests/test_wave_05.py | 52 +++++++------ 10 files changed, 219 insertions(+), 43 deletions(-) create mode 100644 migrations/versions/829f78d1e6ab_.py diff --git a/app/__init__.py b/app/__init__.py index 14b242cca..16bd03e57 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -33,4 +33,7 @@ def create_app(test_config=None): from app.routes import task_bp app.register_blueprint(task_bp) + from app.routes import goal_bp + app.register_blueprint(goal_bp) + return app diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..3747f8fc9 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,24 @@ 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): + goal_dict = { + "id": self.goal_id, + "title": self.title + } + + return goal_dict + + + @classmethod + def from_dict(cls, data_dict): + if "title" in data_dict: + new_obj = cls( + title=data_dict["title"] + ) + + return new_obj + diff --git a/app/models/task.py b/app/models/task.py index 6e9dee09f..707dd58b0 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,19 +7,16 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) is_complete = db.Column(db.Boolean, default = False) - - def check_is_complete(self): - if self.completed_at: - return True - else: - return False + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) + goal = db.relationship("Goal", back_populates = 'tasks' ) + def to_dict(self): task_dict = { "id": self.task_id, "title": self.title, "description": self.description, - "is_complete": self.check_is_complete() + "is_complete": False if self.completed_at is None else True } return task_dict @@ -31,6 +28,8 @@ def from_dict(cls, data_dict): new_obj = cls( title=data_dict["title"], description=data_dict["description"], - is_complete=data_dict["is_complete"]) + is_complete= data_dict["is_complete"]) - return new_obj \ No newline at end of file + return new_obj + + diff --git a/app/routes.py b/app/routes.py index eb9020ceb..0087bb3b3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,7 +1,10 @@ from flask import Blueprint, jsonify, request, abort, make_response from app import db from app.models.task import Task +from app.models.goal import Goal from app.routes_helper import get_one_obj_or_abort +from datetime import datetime +import requests, os task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") @@ -12,8 +15,8 @@ def create_task(): # new_task = Task.from_dict(request_body) if "title" not in response_body or\ - "description" not in response_body: - # “is_complete” not in respnse_body + "description" not in response_body: + # “is_complete” not in respnse_body return jsonify({"details": "Invalid data"}), 400 new_task = Task( title = response_body["title"], @@ -77,3 +80,108 @@ def delete_one_task(task_id): db.session.commit() return jsonify({"details": f'Task {chosen_task.task_id} "{chosen_task.title}" successfully deleted'}), 200 + +# def check_is_complete(self): +# if self.completed_at: +# return True +# else: +# return False + +# ******** Wave 3 ******** + +@task_bp.route("/mark_complete", methods=["PATCH"]) +def mark_complite_task(task_id): + chosen_task = get_one_obj_or_abort(Task, task_id) + + task = Task.query.get(task_id) + if task is None: + return make_response("The task was not found", 404) + task.completed_at = datetime.now() + db.session.commit() + + PATH = "https://slack.com/api/chat.postMessage" + + SLACKBOT_TOKEN = os.environ.get("SLACKBOT_TOKEN") + + query_params = { + "token": SLACKBOT_TOKEN, + "channel": "task-notifications", + "text": f"Someone just completed the task {task.title}" + } + + requests.post(url=PATH, data=query_params, headers={"Authorization": SLACKBOT_TOKEN}) + + return jsonify({"task":chosen_task.to_dict()}), 200 + +@task_bp.route("/mark_incomplete", methods=["PATCH"]) +def mark_incomplite_task(task_id): + chosen_task = get_one_obj_or_abort(Task,task_id) + task = Task.query.get(task_id) + if task is None: + return make_response("The task was not found", 404) + task.completed_at = None + db.session.commit() + return jsonify({"task":chosen_task.to_dict()}), 200 + +# ******** Wave 5 ******** +goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals") + +@goal_bp.route("", methods=["POST"]) +def create_goal(): + response_body = request.get_json() + + if "title" not in response_body: + return jsonify({"details": "Invalid data"}), 400 + new_goal = Goal( + title = response_body["title"], + ) + + db.session.add(new_goal) + db.session.commit() + + return jsonify({"goal": new_goal.to_dict()}), 201 + +@goal_bp.route("", methods=["GET"]) +def get_all_goals(): + + goals = Goal.query.all() + + response = [goal.to_dict() for goal in goals] + + return jsonify(response), 200 + +@goal_bp.route("/", methods=["GET"]) +def get_one_goal(goal_id): + + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + + return jsonify({ + "goal": chosen_goal.to_dict()}), 200 + +@goal_bp.route("/", methods=["PUT"]) +def update_goal_with_new_vals(goal_id): + + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + + request_body = request.get_json() + + if "title" not in request_body: + return jsonify({"message":"Request must include title"}), 400 + + chosen_goal.title = request_body["title"] + + db.session.commit() + + return jsonify({f"goal": chosen_goal.to_dict()}), 200 + +@goal_bp.route("/", methods=["DELETE"]) +def delete_one_goal(goal_id): + chosen_goal = get_one_obj_or_abort(Goal, goal_id) + + db.session.delete(chosen_goal) + + db.session.commit() + + return jsonify({"details": f'Goal {chosen_goal.goal_id} "{chosen_goal.title}" successfully deleted'}), 200 + +# ******** Wave 6 ******** \ No newline at end of file diff --git a/app/routes_helper.py b/app/routes_helper.py index a8511ecbf..007183846 100644 --- a/app/routes_helper.py +++ b/app/routes_helper.py @@ -9,6 +9,6 @@ def get_one_obj_or_abort(cls, obj_id): matching_obj = cls.query.get(obj_id) if not matching_obj: - response_str = f"{cls.__name__} with id `{obj_id}` was not found in the database." + response_str = f"{cls.__name__} with id \'{obj_id}\' was not found in the database." abort(make_response(jsonify({"message":response_str}), 404)) return matching_obj \ No newline at end of file diff --git a/migrations/versions/829f78d1e6ab_.py b/migrations/versions/829f78d1e6ab_.py new file mode 100644 index 000000000..0a3da401c --- /dev/null +++ b/migrations/versions/829f78d1e6ab_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 829f78d1e6ab +Revises: 0c706e9b4aec +Create Date: 2022-11-09 03:13:50.313785 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '829f78d1e6ab' +down_revision = '0c706e9b4aec' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 5874263f7..a2d5733b1 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -61,7 +61,7 @@ def test_get_task_not_found(client): assert response.status_code == 404 #add test with assertion about response body assert "message" in response_body - # assert response_body == {"message": "Task with id 1 was not found in the database."} + assert response_body == {"message": "Task with id '1' was not found in the database."} # @pytest.mark.skip(reason="No way to test this feature yet") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index da8e6ba1e..f556ee3f3 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -25,7 +25,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_complete") - response_body = response.get_json() + response_body = response.get_json() # Assert assert response.status_code == 200 @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +127,14 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert "message" in response_body + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +142,8 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert "message" in response_body + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index d0b26b2d1..5b15df4e3 100644 --- a/tests/test_wave_04.py +++ b/tests/test_wave_04.py @@ -1 +1,8 @@ # There are no tests for wave 4. + +# What is the responsibility of this endpoint? chat.postMessage +# What is the URL and HTTP method for this endpoint? POST +# What are the two required arguments for this endpoint? token, channel +# How does this endpoint relate to the Slackbot API key (token) we just created? +# Authentication token bearing required scopes. Tokens should be passed as an HTTP Authorization header or alternatively, as a POST parameter. + diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..ffc010d3f 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ +from app.models.task import Goal import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +47,22 @@ 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.status_code == 404 + assert "message" in response_body + assert response_body == {"message": "Goal with id '1' was not found in the database."} + -@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,25 +81,29 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- - + response = client.put("/goal/1", json={ + "title": "Wake up early" + }) + 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": "Wake up early"} -@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") + pass + # raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goal/1", json={ + "title": "Wake up early" + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- @@ -107,7 +112,7 @@ def test_update_goal_not_found(client): # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -123,8 +128,9 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + assert "details" in response_body - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From a7ef6c04bab43afd8c7a6365479a26dea1c16633 Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Wed, 9 Nov 2022 22:13:57 -0800 Subject: [PATCH 6/9] Wave 5 Create a scond model --- tests/test_wave_05.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index ffc010d3f..994ddd9b2 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,4 +1,4 @@ -from app.models.task import Goal +from app.models.goal import Goal import pytest @@ -84,16 +84,22 @@ def test_create_goal(client): # @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): # Act - response = client.put("/goal/1", json={ - "title": "Wake up early" + response = client.put("/goals/1", json={ + "title": "Updata My New Goal" }) response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- assert response.status_code == 200 - # assert "goal" in response_body - # assert response_body == {"goal": "Wake up early"} - + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updata My New Goal" + } + } + goal = Goal.query.get(1) + assert goal.title == "Updata My New Goal" # @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): @@ -130,19 +136,15 @@ def test_delete_goal(client, one_goal): assert response.status_code == 404 assert "details" in response_body - # raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - + @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): raise Exception("Complete test") # Act - # ---- Complete Act Here ---- - + response = client.delete("/s/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here From 8a864c6293d17ff9a5bc7df0e2f66133fcf6bd20 Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Thu, 10 Nov 2022 02:58:27 -0800 Subject: [PATCH 7/9] Added guicorn config to Procfile --- Procfile | 1 + app/models/goal.py | 11 +++++------ app/models/task.py | 5 +++-- app/routes.py | 26 +++++++++++++++++++++++++- tests/test_wave_06.py | 20 +++++++++----------- 5 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index 3747f8fc9..3e7ac6d86 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,25 +2,24 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement = True) title = db.Column(db.String) tasks = db.relationship("Task", back_populates="goal") def to_dict(self): + tasks_list = [task.to_dict() for task in self.tasks] goal_dict = { "id": self.goal_id, - "title": self.title + "title": self.title, + "tasks": tasks_list } - return goal_dict @classmethod def from_dict(cls, data_dict): if "title" in data_dict: - new_obj = cls( - title=data_dict["title"] - ) + new_obj = cls(title = data_dict["title"]) return new_obj diff --git a/app/models/task.py b/app/models/task.py index 707dd58b0..f4eee7b90 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,13 +7,14 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) is_complete = db.Column(db.Boolean, default = False) - goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) - goal = db.relationship("Goal", back_populates = 'tasks' ) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'), nullable=True) + goal = db.relationship("Goal", back_populates = "tasks" ) def to_dict(self): task_dict = { "id": self.task_id, + "goal_id":self.goal_id, "title": self.title, "description": self.description, "is_complete": False if self.completed_at is None else True diff --git a/app/routes.py b/app/routes.py index 0087bb3b3..aeeb83816 100644 --- a/app/routes.py +++ b/app/routes.py @@ -184,4 +184,28 @@ def delete_one_goal(goal_id): return jsonify({"details": f'Goal {chosen_goal.goal_id} "{chosen_goal.title}" successfully deleted'}), 200 -# ******** Wave 6 ******** \ No newline at end of file +# ******** Wave 6 ******** + +@goal_bp.route("//tasks", methods=["GET"]) +def get_all_tasks_belonging_to_a_goal(goal_id): + goal = get_one_obj_or_abort(Goal, goal_id) + + tasks_response = [task.to_dict() for task in goal.tasks] + + return jsonify(tasks_response), 200 + + +@goal_bp.route("//tasks", methods=["POST"]) +def post_task_belonging_to_a_goal(goal_id): + parent_goal = get_one_obj_or_abort(Goal, goal_id) + + request_body = request.get_json() + + + new_task = Task.from_dict(request_body) + new_task.goal = parent_goal + + db.session.add(new_task) + db.session.commit() + + return jsonify(new_task), 200 \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..f56f6f20f 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={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -50,14 +50,12 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert "details" in response_body + assert response_body == {"details": "Invalid data"} + # raise Exception("Complete test with assertion about response body") + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - - -@pytest.mark.skip(reason="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 +72,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 +97,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 815242c78415a1b256008df208dc07beaeefe055 Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Thu, 10 Nov 2022 09:41:13 -0800 Subject: [PATCH 8/9] Wave 6: Establishing a one-to-many relationship between two models --- app/models/goal.py | 11 ++++++----- app/models/task.py | 13 +++++++------ app/routes.py | 33 +++++++++++++++++++-------------- app/routes_helper.py | 3 +-- tests/test_wave_01.py | 5 ++--- tests/test_wave_03.py | 16 +++++----------- tests/test_wave_05.py | 29 ++++++++++++----------------- tests/test_wave_06.py | 10 +++++++--- 8 files changed, 59 insertions(+), 61 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 3e7ac6d86..3747f8fc9 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,24 +2,25 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True, autoincrement = True) + 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): - tasks_list = [task.to_dict() for task in self.tasks] goal_dict = { "id": self.goal_id, - "title": self.title, - "tasks": tasks_list + "title": self.title } + return goal_dict @classmethod def from_dict(cls, data_dict): if "title" in data_dict: - new_obj = cls(title = data_dict["title"]) + new_obj = cls( + title=data_dict["title"] + ) return new_obj diff --git a/app/models/task.py b/app/models/task.py index f4eee7b90..4a7de4ff2 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,24 +2,25 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key = True, autoincrement = True) + task_id = db.Column(db.Integer, primary_key = True) title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) is_complete = db.Column(db.Boolean, default = False) - goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'), nullable=True) - goal = db.relationship("Goal", back_populates = "tasks" ) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) + goal = db.relationship("Goal", back_populates = 'tasks' ) + - def to_dict(self): task_dict = { "id": self.task_id, - "goal_id":self.goal_id, "title": self.title, "description": self.description, "is_complete": False if self.completed_at is None else True } - + if self.goal_id: + task_dict["goal_id"] = self.goal_id + return task_dict diff --git a/app/routes.py b/app/routes.py index aeeb83816..281060890 100644 --- a/app/routes.py +++ b/app/routes.py @@ -165,10 +165,9 @@ def update_goal_with_new_vals(goal_id): request_body = request.get_json() - if "title" not in request_body: - return jsonify({"message":"Request must include title"}), 400 - - chosen_goal.title = request_body["title"] + if "title" in request_body: + # return jsonify({"details":"Request must include title"}), 400 + chosen_goal.title = request_body["title"] db.session.commit() @@ -188,11 +187,16 @@ def delete_one_goal(goal_id): @goal_bp.route("//tasks", methods=["GET"]) def get_all_tasks_belonging_to_a_goal(goal_id): - goal = get_one_obj_or_abort(Goal, goal_id) + chosen_goal = get_one_obj_or_abort(Goal, goal_id) - tasks_response = [task.to_dict() for task in goal.tasks] + tasks_list = [] + for task in chosen_goal.tasks: + tasks_list.append(task.to_dict()) - return jsonify(tasks_response), 200 + # tasks_response = [task.to_dict() for task in goal.tasks] + response_dict = chosen_goal.to_dict() + response_dict["tasks"] = tasks_list + return jsonify(response_dict), 200 @goal_bp.route("//tasks", methods=["POST"]) @@ -201,11 +205,12 @@ def post_task_belonging_to_a_goal(goal_id): request_body = request.get_json() - - new_task = Task.from_dict(request_body) - new_task.goal = parent_goal - - db.session.add(new_task) - db.session.commit() + for task in request_body["task_ids"]: + select_task = get_one_obj_or_abort(Task,task) + select_task.goal = parent_goal + + db.session.add(select_task) + db.session.commit() + - return jsonify(new_task), 200 \ No newline at end of file + return jsonify({"id": int(goal_id), "task_ids": request_body["task_ids"]}), 200 \ No newline at end of file diff --git a/app/routes_helper.py b/app/routes_helper.py index 007183846..5bc4292e6 100644 --- a/app/routes_helper.py +++ b/app/routes_helper.py @@ -9,6 +9,5 @@ def get_one_obj_or_abort(cls, obj_id): matching_obj = cls.query.get(obj_id) if not matching_obj: - response_str = f"{cls.__name__} with id \'{obj_id}\' was not found in the database." - abort(make_response(jsonify({"message":response_str}), 404)) + abort(make_response(jsonify({"details": "Invalid data"}), 404)) return matching_obj \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index a2d5733b1..8cb28fb57 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -60,8 +60,8 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 #add test with assertion about response body - assert "message" in response_body - assert response_body == {"message": "Task with id '1' was not found in the database."} + assert "details" in response_body + assert response_body == {"details":"Invalid data"} # @pytest.mark.skip(reason="No way to test this feature yet") @@ -160,7 +160,6 @@ def test_delete_task_not_found(client): assert response_body == {"details": "Invalid data"} assert Task.query.all() == [] - # @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index f556ee3f3..1167898a1 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -127,12 +127,8 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - assert "message" in response_body - # raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - + assert "details" in response_body + # @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): @@ -142,8 +138,6 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - assert "message" in response_body - # raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert "details" in response_body + assert response_body == {"details": "Invalid data"} + \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 994ddd9b2..f2945d24c 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -58,8 +58,8 @@ def test_get_goal_not_found(client): # Assert # ---- Complete Test ---- assert response.status_code == 404 - assert "message" in response_body - assert response_body == {"message": "Goal with id '1' was not found in the database."} + assert "details" in response_body + assert response_body == {"details":"Invalid data"} # @pytest.mark.skip(reason="No way to test this feature yet") @@ -103,19 +103,17 @@ def test_update_goal(client, one_goal): # @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - pass # raise Exception("Complete test") # Act - response = client.put("/goal/1", json={ + response = client.put("/goals/3", json={ "title": "Wake up early" }) 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 "details" in response_body + # assert response_body == {"details": "Invalid data"} # @pytest.mark.skip(reason="No way to test this feature yet") @@ -138,21 +136,18 @@ def test_delete_goal(client, one_goal): -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") # Act - response = client.delete("/s/1") + 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 "details" in response_body + # assert response_body == {"details": "Invalid data"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index f56f6f20f..834c022bf 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -51,9 +51,13 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 assert "details" in response_body - assert response_body == {"details": "Invalid data"} - # raise Exception("Complete test with assertion about response body") + assert response_body == {"details":"Invalid data"} + # 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_get_tasks_for_specific_goal_no_tasks(client, one_goal): From dddb42df14c03dd231fde38462f808f5486ed5eb Mon Sep 17 00:00:00 2001 From: JuliaPark Date: Thu, 10 Nov 2022 12:38:11 -0800 Subject: [PATCH 9/9] added test --- app/routes.py | 6 +++--- tests/test_wave_05.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/routes.py b/app/routes.py index 281060890..4ebf62e63 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,7 +8,7 @@ task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") - +# ******** Wave 1 ******** @task_bp.route("", methods=["POST"]) def create_task(): response_body = request.get_json() @@ -26,7 +26,7 @@ def create_task(): db.session.commit() return jsonify({"task": new_task.to_dict()}), 201 - +# ******** Wave 2 ******** @task_bp.route("", methods=["GET"]) def get_all_tasks(): title_param = request.args.get("sort") @@ -211,6 +211,6 @@ def post_task_belonging_to_a_goal(goal_id): db.session.add(select_task) db.session.commit() - + return jsonify({"id": int(goal_id), "task_ids": request_body["task_ids"]}), 200 \ No newline at end of file diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index f2945d24c..0ecc86ff2 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -113,7 +113,7 @@ def test_update_goal_not_found(client): # Assert assert response.status_code == 404 assert "details" in response_body - # assert response_body == {"details": "Invalid data"} + assert response_body == {"details": "Invalid data"} # @pytest.mark.skip(reason="No way to test this feature yet") @@ -145,7 +145,7 @@ def test_delete_goal_not_found(client): # Assert assert response.status_code == 404 assert "details" in response_body - # assert response_body == {"details": "Invalid data"} + assert response_body == {"details": "Invalid data"} # @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client):