diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..51692c37a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,9 +14,13 @@ def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + + if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_DATABASE_URI") + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "RENDER_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( @@ -30,5 +34,11 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes.task_routes import bp + app.register_blueprint(bp) + + from .routes.goal_routes import bp + app.register_blueprint(bp) + # db.create_all() return app diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..9dc2bfcf8 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,14 @@ from app import db - class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String, nullable=False) + tasks = db.relationship("Task", back_populates="goal", lazy=True) + + def to_dict(self): + return (dict( + id=self.id, + title=self.title + )) + + diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..9e3f8d0d7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,37 @@ from app import db - class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + completed_at = db.Column(db.DateTime, nullable=True) + goal = db.relationship("Goal", back_populates="tasks") + goal_id = db.Column(db.Integer, db.ForeignKey("goal.id")) + + def to_dict_with_goal(self): + if not self.completed_at: + self.is_complete = False + return (dict( + id=self.id, + title=self.title, + description=self.description, + is_complete=self.is_complete, + goal_id=self.goal_id + )) + def to_dict(self): + if not self.completed_at: + self.is_complete = False + return (dict( + id=self.id, + title=self.title, + description=self.description, + is_complete=self.is_complete, + )) + + @classmethod + def from_dict(cls, data_dict): + return cls( + title = data_dict["title"], + description = data_dict["description"], + is_complete = data_dict["completed_at"] + ) 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/routes/goal_routes.py b/app/routes/goal_routes.py new file mode 100644 index 000000000..122755638 --- /dev/null +++ b/app/routes/goal_routes.py @@ -0,0 +1,81 @@ +from flask import Blueprint, make_response, jsonify, request, abort +from app.models.task import Task +from app.models.goal import Goal +from app import db +from .route_helpers import validate_model + +bp = Blueprint("goals", __name__, url_prefix="/goals") + + +@bp.route("", methods=["GET"]) +def get_all_goals(): + goals = Goal.query.all() + goals_list = [goal.to_dict() for goal in goals] + + return jsonify(goals_list), 200 + + +@bp.route("", methods=["POST"]) +def create_a_goal(): + request_body = request.get_json() + if "title" not in request_body or not request_body["title"]: + abort(make_response({"details": "Invalid data"}, 400)) + new_goal = Goal( + title=request_body["title"] + ) + db.session.add(new_goal) + db.session.commit() + + return {"goal": new_goal.to_dict()}, 201 + + +@bp.route("/", methods=["GET"]) +def get_one_goal(id): + goal = validate_model(Goal, id) + + return {"goal": goal.to_dict()}, 200 + + +@bp.route("/", methods=["PUT"]) +def update_a_goal(id): + goal = validate_model(Goal, id) + request_body = request.get_json() + goal.title = request_body["title"] + + db.session.commit() + + return {"goal": goal.to_dict()}, 200 + + +@bp.route("/", methods=["DELETE"]) +def delete_a_goal(id): + goal = validate_model(Goal, id) + db.session.delete(goal) + db.session.commit() + + return make_response({'details': f'Goal {goal.id} "{goal.title}" successfully deleted'}), 200 + + +@bp.route("//tasks", methods=["GET"]) +def get_all_tasks_for_one_goal(id): + goal = validate_model(Goal, id) + tasks_list = [(dict(id=task.id, title=task.title, description=task.description, + is_complete=False if task.completed_at is None else True, goal_id=goal.id)) for task in goal.tasks] + + return {"id": goal.id, "title": goal.title, "tasks": tasks_list}, 200 + + +@bp.route("//tasks", methods=["POST"]) +def post_task_ids_to_goal(id): + goal = validate_model(Goal, id) + request_body = request.get_json() + if "task_ids" not in request_body: + abort(make_response({"details": "Invalid data"}, 400)) + + task_ids = request_body["task_ids"] + tasks_list = [Task.query.get(task_id) for task_id in task_ids] + goal.tasks = tasks_list + + db.session.commit() + + return {"id": goal.id, "task_ids": task_ids}, 200 diff --git a/app/routes/route_helpers.py b/app/routes/route_helpers.py new file mode 100644 index 000000000..7a5414bc5 --- /dev/null +++ b/app/routes/route_helpers.py @@ -0,0 +1,17 @@ +from flask import abort, make_response + + +def validate_model(cls, id): + try: + id = int(id) + except: + abort(make_response( + {"details": f"{cls.__name__} number {id} not valid"}, 400)) + + model = cls.query.get(id) + + if not model: + abort(make_response( + {"details": f"{cls.__name__} number {id} was not found"}, 404)) + + return model diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py new file mode 100644 index 000000000..9032b2b43 --- /dev/null +++ b/app/routes/task_routes.py @@ -0,0 +1,118 @@ +from flask import Blueprint, make_response, jsonify, request, abort +from app.models.task import Task +from app import db +from datetime import datetime +import requests +from .route_helpers import validate_model +import os +from dotenv import load_dotenv + +load_dotenv() + +bp = Blueprint("tasks", __name__, url_prefix="/tasks") + + +@bp.route("", methods=["GET"]) +def get_all_tasks(): + sorted_query = request.args.get("sort") + if sorted_query == "asc": + tasks = Task.query.order_by("title") + elif sorted_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + + tasks_list = [task.to_dict() for task in tasks] + + return jsonify(tasks_list), 200 + + +@bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + if "title" not in request_body or not request_body["title"] or "description" not in request_body or not request_body["description"]: + abort(make_response({"details": "Invalid data"}, 400)) + + new_task = Task( + title=request_body["title"], + description=request_body["description"] + ) + + db.session.add(new_task) + db.session.commit() + + return {"task": new_task.to_dict()}, 201 + + +@bp.route("/", methods=["GET"]) +def get_one_task(id): + task = validate_model(Task, id) + if task.goal_id: + return {"task": task.to_dict_with_goal()}, 200 + return {"task": task.to_dict()}, 200 + + +@bp.route("/", methods=["PUT"]) +def update_task(id): + task = validate_model(Task, id) + request_body = request.get_json() + is_complete = request_body.get("is_complete", False) + + task.title = request_body["title"] + task.description = request_body["description"] + task.is_complete = is_complete + + db.session.commit() + + return {"task": task.to_dict()}, 200 + + +@bp.route("/", methods=["DELETE"]) +def delete_task(id): + task = validate_model(Task, id) + + db.session.delete(task) + db.session.commit() + + return {"details": f'Task {id} "{task.title}" successfully deleted'}, 200 + + +@bp.route("//mark_complete", methods=["PATCH"]) +def complete_task(id): + task = validate_model(Task, id) + if not task.completed_at: + task.completed_at = datetime.now() + task.is_complete = True + + PATH = "https://slack.com/api/chat.postMessage" + Authorization = os.environ.get( + "Authorization") + text = f"Someone just completed the task {task.title}" + + headers = { + "Authorization": Authorization, + "format": "json" + } + + body = { + "channel": "task-notifications", + "text": text, + } + requests.post(PATH, headers=headers, json=body) + + db.session.commit() + + return {"task": task.to_dict()}, 200 + + +@bp.route("//mark_incomplete", methods=["PATCH"]) +def incomplete_task(id): + task = validate_model(Task, id) + + if task.completed_at: + task.completed_at = None + task.is_complete = False + + db.session.commit() + + return {"task": task.to_dict()}, 200 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/1568cdd09a0e_.py b/migrations/versions/1568cdd09a0e_.py new file mode 100644 index 000000000..d550bd561 --- /dev/null +++ b/migrations/versions/1568cdd09a0e_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 1568cdd09a0e +Revises: cfe5d03c4a36 +Create Date: 2023-05-12 09:17:26.058099 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1568cdd09a0e' +down_revision = 'cfe5d03c4a36' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], ), + sa.PrimaryKeyConstraint('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/a12b01e09ed7_.py b/migrations/versions/a12b01e09ed7_.py new file mode 100644 index 000000000..9c8a8ce33 --- /dev/null +++ b/migrations/versions/a12b01e09ed7_.py @@ -0,0 +1,40 @@ +"""empty message + +Revision ID: a12b01e09ed7 +Revises: +Create Date: 2023-05-11 12:26:17.663732 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a12b01e09ed7' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('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/c2508a31947a_.py b/migrations/versions/c2508a31947a_.py new file mode 100644 index 000000000..8df7c0910 --- /dev/null +++ b/migrations/versions/c2508a31947a_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: c2508a31947a +Revises: 1568cdd09a0e +Create Date: 2023-05-12 09:39:24.083918 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c2508a31947a' +down_revision = '1568cdd09a0e' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], ), + sa.PrimaryKeyConstraint('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/cfe5d03c4a36_.py b/migrations/versions/cfe5d03c4a36_.py new file mode 100644 index 000000000..6dbf39430 --- /dev/null +++ b/migrations/versions/cfe5d03c4a36_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: cfe5d03c4a36 +Revises: a12b01e09ed7 +Create Date: 2023-05-11 12:26:43.698200 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cfe5d03c4a36' +down_revision = 'a12b01e09ed7' +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'], ['id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..7c1c563b7 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,18 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == { + "details" : "Task number 1 was not found" + } + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **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 +97,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 +123,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 +134,18 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == { + "details" : "Task number 1 was not found" + } - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **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 +160,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,16 +168,19 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == { + "details" : "Task number 1 was not found" + } - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** assert Task.query.all() == [] -@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 +197,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 32d379822..9ac24ac7a 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,17 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == { + "details" : "Task number 1 was not found" + } - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **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 +145,11 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == { + "details" : "Task number 1 was not found" + } - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..6c1684005 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +12,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +29,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +46,27 @@ 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 + assert response.status_code == 404 # assertion 2 goes here + # assert response.get_data(as_text=True) == "Goal number 1 was not found" + assert response_body == { + "details" : "Goal number 1 was not found" + } # ---- 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 +85,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 ---- - + respone = client.put("/goals/1", json={ + "title": "My Updated Goal" + }) + respone_body = respone.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert respone.status_code == 200 # assertion 2 goes here + assert "goal" in respone_body # assertion 3 goes here + assert respone_body == { + "goal":{ + "id":1, + "title": "My Updated Goal" + } + } # ---- 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") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here + assert response_body == { + "details" : "Goal number 1 was 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 +144,39 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + response_body = response.get_json() + assert response_body == { + "details" : "Goal number 1 was not found" + } + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **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 + assert response.status_code == 404 # assertion 2 goes here + assert response_body == { + "details" : "Goal number 1 was 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..3746f5227 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -51,13 +51,17 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "details" : "Goal number 1 was not found" + } + + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +78,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 +103,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()