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/__init__.py b/app/__init__.py index 2764c4cc8..4d510c552 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,10 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .task_routes import tasks_bp + app.register_blueprint(tasks_bp) + + from .goal_routes import goals_bp + app.register_blueprint(goals_bp) return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..99e736af4 --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,90 @@ +from flask import Blueprint, request, jsonify, make_response, abort +from app import db +from app.models.goal import Goal +from app.models.task import Task +from app.route_helpers import error_message, validate_model_instance + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +# create a new goal +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + # check for request body + try: + new_goal = Goal(title=request_body["title"]) + except: + error_message("Invalid data", 400) + + # update database + db.session.add(new_goal) + db.session.commit() + + response_body = {"goal": new_goal.to_dict()} + + return make_response(jsonify(response_body), 201) + +# get all goals +@goals_bp.route("", methods=["GET"]) +def get_all_goals(): + goals = Goal.query.all() + goals_response = [goal.to_dict() for goal in goals] + + return make_response(jsonify(goals_response)) + +# get goal by id +@goals_bp.route("/", methods=["GET"]) +def get_goal_by_id(goal_id): + goal = validate_model_instance(Goal, goal_id) + return {"goal": goal.to_dict()} + +# update goal by id +@goals_bp.route("/", methods=["PUT"]) +def update_goal(goal_id): + goal = validate_model_instance(Goal, goal_id) + + request_body = request.get_json() + goal.title = request_body["title"] + + db.session.commit() + return {"goal": goal.to_dict()} + +# delete goal by id +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = validate_model_instance(Goal, goal_id) + + db.session.delete(goal) + db.session.commit() + + return make_response({"details": f'Goal {goal_id} \"{goal.title}\" successfully deleted'}) + +# get tasks by goal id +@goals_bp.route("//tasks", methods=["GET"]) +def get_tasks_for_goal(goal_id): + goal = validate_model_instance(Goal, goal_id) + task_list = [task.to_dict() for task in goal.tasks] + + goal_dict = goal.to_dict() + goal_dict["tasks"] = task_list + + return jsonify(goal_dict) + +# post tasks to goal by goal id +@goals_bp.route("//tasks", methods=["POST"]) +def post_tasks_to_goal(goal_id): + goal = validate_model_instance(Goal, goal_id) + request_body = request.get_json() + + for task_id in request_body["task_ids"]: + task = Task.query.get(task_id) + task.goal_id = goal_id + task.goal = goal + + db.session.commit() + + return make_response({ + "id": goal.goal_id, + "task_ids": request_body["task_ids"] + }) \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..5af9115b3 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,17 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String, nullable=False) + tasks = db.relationship("Task", back_populates="goal") + + def to_dict(self): + goal_dict = { + "id": self.goal_id, + "title": self.title + } + + if self.tasks: + goal_dict["tasks"] = [task.task_id for task in self.tasks] + # goal_dict["tasks"] = [] + + return goal_dict \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..266cee6ec 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,3 +3,25 @@ class Task(db.Model): 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, default=None) + 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, + } + + if not self.completed_at: + task_dict["is_complete"] = False + else: + task_dict["is_complete"] = True + + if self.goal_id: + task_dict["goal_id"] = self.goal_id + + return task_dict \ No newline at end of file diff --git a/app/route_helpers.py b/app/route_helpers.py new file mode 100644 index 000000000..1811c26e6 --- /dev/null +++ b/app/route_helpers.py @@ -0,0 +1,41 @@ +from flask import jsonify, make_response, abort +from app.models.goal import Goal +from app.models.task import Task +import requests, os + +# helper function to generate error message +def error_message(message, status_code): + abort(make_response(jsonify(dict(details=message)), status_code)) + +# class/model-agnostic helper function to validate model instances +def validate_model_instance(model, id): + if model == Task: + model_name = "Task" + elif model == Goal: + model_name = "Goal" + + try: + id = int(id) + except: + error_message(f"{model_name} #{id} invalid", 400) + + model_instance = model.query.get(id) + + if not model_instance: + error_message(f"{model_name} #{id} not found", 404) + + return model_instance + +# helper function to post completion message to slack +def post_slack_completion_message(task_id): + task = validate_model_instance(Task, task_id) + path = "https://slack.com/api/chat.postMessage" + SLACK_API_KEY = os.environ.get("SLACK_BOT_TOKEN") + + request_headers = {"Authorization": f"Bearer {SLACK_API_KEY}"} + request_body = { + "channel": "C03EP2Q0WK1", + "text": f"Someone just completed the task {task.title}" + } + + requests.post(path, headers=request_headers, json=request_body) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py deleted file mode 100644 index 3aae38d49..000000000 --- a/app/routes.py +++ /dev/null @@ -1 +0,0 @@ -from flask import Blueprint \ No newline at end of file diff --git a/app/task_routes.py b/app/task_routes.py new file mode 100644 index 000000000..93685f659 --- /dev/null +++ b/app/task_routes.py @@ -0,0 +1,101 @@ +from flask import Blueprint, request, jsonify, make_response, abort +from sqlalchemy import desc +from app import db +from app.models.task import Task +from datetime import date +from app.route_helpers import error_message, validate_model_instance, post_slack_completion_message + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +# create a new task +@tasks_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + try: + new_task = Task( + title=request_body["title"], + description=request_body["description"] + ) + except: + error_message("Invalid data", 400) + + if request_body.get("completed_at"): + new_task.completed_at = request_body.get("completed_at") + + db.session.add(new_task) + db.session.commit() + + response_body = {"task": new_task.to_dict()} + + return make_response(jsonify(response_body), 201) + +# retrieve all tasks +@tasks_bp.route("", methods=["GET"]) +def get_all_tasks(): + sort_param = request.args.get("sort") + + if sort_param == "asc": + tasks = Task.query.order_by(Task.title).all() + elif sort_param == "desc": + tasks = Task.query.order_by(desc(Task.title)).all() + else: + tasks = Task.query.all() + + tasks_response = [task.to_dict() for task in tasks] + + return jsonify(tasks_response) + +# retrieve one task by id +@tasks_bp.route("/", methods=["GET"]) +def get_one_task_by_id(task_id): + task = validate_model_instance(Task, task_id) + + return {"task": task.to_dict()} + +# update one task by id +@tasks_bp.route("/", methods=["PUT"]) +def update_one_task_by_id(task_id): + task = validate_model_instance(Task, task_id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return {"task": task.to_dict()} + +# delete one task by id +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task_by_id(task_id): + task = validate_model_instance(Task, task_id) + + db.session.delete(task) + db.session.commit() + + return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}) + +# mark one task complete by id +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_task_complete(task_id): + task = validate_model_instance(Task, task_id) + + task.completed_at = date.today() + response_body = {"task": task.to_dict()} + + db.session.commit() + post_slack_completion_message(task_id) + + return make_response(jsonify(response_body), 200) + +# mark one task incomplete by id +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_task_incomplete(task_id): + task = validate_model_instance(Task, task_id) + + task.completed_at = None + response_body = {"task": task.to_dict()} + + db.session.commit() + return make_response(jsonify(response_body), 200) \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/00eaa6151070_create_one_to_many_relationship_between_.py b/migrations/versions/00eaa6151070_create_one_to_many_relationship_between_.py new file mode 100644 index 000000000..97126854c --- /dev/null +++ b/migrations/versions/00eaa6151070_create_one_to_many_relationship_between_.py @@ -0,0 +1,30 @@ +"""Create one-to-many relationship between goals and tasks + +Revision ID: 00eaa6151070 +Revises: c568882e1c90 +Create Date: 2022-05-12 22:04:45.113669 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '00eaa6151070' +down_revision = 'c568882e1c90' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/4f06f64382a7_.py b/migrations/versions/4f06f64382a7_.py new file mode 100644 index 000000000..9ae31e048 --- /dev/null +++ b/migrations/versions/4f06f64382a7_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 4f06f64382a7 +Revises: +Create Date: 2022-05-05 16:59:55.390214 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4f06f64382a7' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/migrations/versions/c568882e1c90_add_goal_model.py b/migrations/versions/c568882e1c90_add_goal_model.py new file mode 100644 index 000000000..9c1aacf86 --- /dev/null +++ b/migrations/versions/c568882e1c90_add_goal_model.py @@ -0,0 +1,28 @@ +"""Add Goal model + +Revision ID: c568882e1c90 +Revises: 4f06f64382a7 +Create Date: 2022-05-12 14:56:34.152688 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c568882e1c90' +down_revision = '4f06f64382a7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=False)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/requirements.txt b/requirements.txt index 30ff414fe..4e3b88829 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==6.3.2 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 @@ -28,6 +29,7 @@ python-dotenv==0.15.0 python-editor==1.0.4 requests==2.25.1 six==1.15.0 +slack-sdk==3.16.1 SQLAlchemy==1.3.23 toml==0.10.2 urllib3==1.26.5 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..c94404da5 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,14 +59,15 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"details": f"Task #1 not found"} - 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_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +94,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 +120,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={ @@ -130,14 +131,15 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"details": f"Task #1 not found"} - 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_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -152,7 +154,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") @@ -160,8 +162,9 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"details": f"Task #1 not found"} - 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*************** # ***************************************************************** @@ -169,7 +172,7 @@ def test_delete_task_not_found(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -186,7 +189,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") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 959176ceb..5ded30417 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +127,15 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"details": f"Task #1 not found"} - 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_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +143,9 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"details": f"Task #1 not found"} - 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*************** # ***************************************************************** @@ -151,7 +153,7 @@ def test_mark_incomplete_missing_task(client): # Let's add this test for creating tasks, now that # the completion functionality has been implemented -@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_with_valid_completed_at(client): # Act response = client.post("/tasks", json={ @@ -181,7 +183,7 @@ def test_create_task_with_valid_completed_at(client): # Let's add this test for updating tasks, now that # the completion functionality has been implemented -@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_with_completed_at_date(client, completed_task): # Act response = client.put("/tasks/1", json={ diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..237640075 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ import pytest +from app.models.goal import 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_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,23 @@ 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 + assert response_body == {"details": f"Goal #1 not found"} + assert response.status_code == 404 # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +82,50 @@ 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") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() + goal = Goal.query.get(1) # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } + assert goal.title == "Updated Goal Title" + # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # 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 + assert response.status_code == 404 + assert response_body == {"details": f"Goal #1 not found"} # ---- 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,28 +141,31 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + assert response.get_json() == {"details": "Goal #1 not found"} - 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="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == {"details": f"Goal #1 not found"} # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..c42d70c18 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -50,14 +50,15 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"details": f"Goal #1 not found"} - 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 +75,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 +100,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()