diff --git a/.gitignore b/.gitignore index 4e9b18359..8734759fe 100644 --- a/.gitignore +++ b/.gitignore @@ -126,6 +126,7 @@ venv.bak/ # mkdocs documentation /site +play.py # mypy .mypy_cache/ .dmypy.json 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..137f1ae5d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -23,12 +23,17 @@ def create_app(test_config=None): "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup - from app.models.task import Task + from app.models.task import Task from app.models.goal import Goal db.init_app(app) migrate.init_app(app, db) - + # Register Blueprints here + from .routes import tasks_bp + app.register_blueprint(tasks_bp) + + from .goal_routes import goals_bp + app.register_blueprint(goals_bp) return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..e1d850301 --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,176 @@ +from app.models.goal import Goal +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response,request +from app import db +from datetime import datetime, date, time, timezone +import requests + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +# Helper Function +def validate_goal(id): + try: + goal_id = int(id) + except ValueError: + abort(make_response(jsonify(dict(details=f"Invalid id {goal_id}")), 400)) + + + goal = Goal.query.get(id) + if goal: + return goal + + abort(make_response(jsonify(dict(details=f"No goal with id {goal_id} found")), 404)) + +# CREATE NEW TASK +@goals_bp.route("", methods=[ "POST"]) +def create_goal(): + request_body = request.get_json() + + if request_body == {}: + + response_body = { + "details": "Invalid data" + }, 400 + + return response_body + + + new_goal = Goal( + title=request_body["title"]) + + + db.session.add(new_goal) + db.session.commit() + + response_body = { "goal": + { + "id": new_goal.goal_id, + "title": new_goal.title + } + }, 201 + + return response_body + + +@goals_bp.route("/", methods=["GET"]) +# return dictionary with "goal" as key and the value is a nested dictionary + +def get_task_by_id(goal_id): + goal = validate_goal(goal_id) + + if goal == None: + return [] + response_body = { "goal": + { + "id": goal.goal_id, + "title": goal.title, + } + } + + return response_body + +# GET ALL ROUTE +@goals_bp.route("", methods=["GET"]) +def get_all_goals(): + + goals = Goal.query.all() + + if goals == None: + return [] + else: + response_body = [] + for goal in goals: + response_body.append({ + "id": goal.goal_id, + "title": goal.title, + }) + + return jsonify(response_body) + +# # Update ONE Goal +@goals_bp.route("/", methods=["PUT"]) + +def update_task_by_id(goal_id): + + goal = validate_goal(goal_id) + request_body = request.get_json() + + goal.title = request_body["title"] + + + response_body = { "goal": + { + "id": goal.goal_id, + "title": goal.title, + } + } + + db.session.commit() + + return response_body + + +@goals_bp.route("/", methods=["DELETE"]) + +def delete_goal_by_id(goal_id): + goal = validate_goal(goal_id) + + db.session.delete(goal) + db.session.commit() + + response_body = { + "details": + f"Goal {goal.goal_id} \ {goal.title} \" successfully deleted" + } + + return response_body + + +# NESTED ROUTE CREATE BY GOAL AND TASK + # CREATE A GOAL THATS LINKED TO A TASK + # USE THE GOALS bp + +@goals_bp.route("//tasks", methods=["POST"]) + +def post_tasks_to_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + + for task_id in request_body["task_ids"]: + linked_task = Task.query.get(task_id) + linked_task.goal_id = goal_id + + db.session.commit() + + + linked_task_ids = [] + for task in goal.tasks: + linked_task_ids.append(task.task_id) + + return {"id":goal.goal_id, "task_ids":linked_task_ids}, 200 + + +@goals_bp.route("//tasks", methods=["GET"]) +def get_tasks_one_goal(goal_id): + + goal = validate_goal(goal_id) + response = { + "id": goal.goal_id, + "title": goal.title, + "tasks": [] + } + # tasks_response = [] + for task in goal.tasks: + response["tasks"].append( + + + { + "id": task.task_id, + "goal_id": goal.goal_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + } + + ) + return jsonify(response) \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..3addc29aa 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,4 +2,8 @@ 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.Text) + + tasks = db.relationship("Task", back_populates ="goal", lazy=True) diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..7abc361ac 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +2,10 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String) + title = db.Column(db.Text) + description = db.Column(db.Text) + completed_at = db.Column(db.DateTime, nullable= True) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) + goal = db.relationship("Goal", back_populates = "tasks") diff --git a/app/routes.py b/app/routes.py index 3aae38d49..a36d8cc37 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,249 @@ -from flask import Blueprint \ No newline at end of file +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response,request +from app import db +from datetime import datetime, date, time, timezone +import requests +import os +# import app.models.goal import Goal + + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +# Helper Function +def validate_task(id): + try: + task_id = int(id) + except ValueError: + abort(make_response(jsonify(dict(details=f"Invalid id {task_id}")), 400)) + + + task = Task.query.get(id) + if task: + return task + + abort(make_response(jsonify(dict(details=f"No task with id {id} found")), 404)) + + +# CREATE 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"]) + + if "completed_at" in request_body: + new_task.completed_at = request_body["completed_at"] + + except KeyError: + abort(make_response(jsonify(dict(details="Invalid data")), 400)) + + + db.session.add(new_task) + db.session.commit() + + response_body = { "task": + { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": True if new_task.completed_at else False + } + }, 201 + + + return response_body + # return make_response(jsonify(response_body), 201) + + + +# GET ONE BY ID METHOD + +@tasks_bp.route("/", methods=["GET"]) +# return dictionary with "task" as key and the value is a nested dictionary + +def get_task_by_id(task_id): + task = validate_task(task_id) + + if task == None: + return [] + response_body = { "task": + { + "id": task.task_id, + "goal_id":task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + } + } + + return response_body + + + +# GET ALL ROUTE +@tasks_bp.route("", methods=["GET"]) +def get_all_tasks(): + + sort_query = request.args.get("sort") + + if sort_query: + if sort_query == "asc": + tasks = Task.query.order_by(Task.title.asc()) + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + + tasks = Task.query.all() + + if tasks == None: + return [] + else: + response_body = [] + for task in tasks: + response_body.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + }) + + return jsonify(response_body) + + + +# # Update ONE TASK +@tasks_bp.route("/", methods=["PUT"]) + +def update_task_by_id(task_id): + + task = validate_task(task_id) + request_body = request.get_json() + + # task.task_id = request_body["task_id"] + task.title = request_body["title"] + task.description = request_body["description"] + + if request_body["completed_at"]: + task.completed_at = datetime.utcnow() + # task.completed_at = request_body["completed_at"] + + + response_body = { "task": + { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete":True if task.completed_at else False + } + } + + + + db.session.commit() + + return response_body + + +#Helper Function for Slack API call + +def send_api_call(task_title): + path = "https://slack.com/api/chat.postMessage" + SLACK_API_KEY = os.environ.get("SLACK_API_KEY") + + headers = {"Authorization": f"Bearer {SLACK_API_KEY}", + "Content-Type": "application/json"} + json_body = {"channel":"task-notifications", + "text": f"Someone just completed the task {task_title}" + } + + requests.post(path, headers=headers, json=json_body) + # data = {} + # data=data, + # ?channel=task-notifications&text=Someone just completed the task {title}" +#-https://slack.com/api/chat.postMessage?channel=task-notifications&text=Namaste + + +# Mark Complete +@tasks_bp.route("//mark_complete", methods=["PATCH"]) + +def mark_complete(task_id): + + task = validate_task(task_id) + request_body = request.get_json() + + send_api_call(task.title) + + task.completed_at = datetime.now() + + response_body = { "task": + { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + } + }, 200 + + db.session.add(task) + db.session.commit() + + return response_body + + +# Mark Inomplete +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) + +def mark_incomplete(task_id): + + task = validate_task(task_id) + request_body = request.get_json() + + task.completed_at = None + + response_body = { "task": + { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + } + }, 200 + + db.session.add(task) + db.session.commit() + + return response_body + + # .datetime.now() to mark field with current time + + # slack message "Someone just completed the task My Beautiful Task". + # Example of Slack post url -https://slack.com/api/chat.postMessage?channel=task-notifications&text=Namaste + + +# Delete +@tasks_bp.route("/", methods=["DELETE"]) + +def delete_task_by_id(task_id): + task = validate_task(task_id) + + db.session.delete(task) + db.session.commit() + + response_body = { + "details": + f"Task {task.task_id} \ {task.description} \" successfully deleted" + } + + return response_body + + + + + + + + + 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/35f55aa536f0_update_task_model.py b/migrations/versions/35f55aa536f0_update_task_model.py new file mode 100644 index 000000000..4174c1254 --- /dev/null +++ b/migrations/versions/35f55aa536f0_update_task_model.py @@ -0,0 +1,28 @@ +"""update Task model + +Revision ID: 35f55aa536f0 +Revises: bbbd05ac9577 +Create Date: 2022-05-11 18:25:21.197990 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '35f55aa536f0' +down_revision = 'bbbd05ac9577' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('name', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'name') + # ### end Alembic commands ### diff --git a/migrations/versions/518900a9cb26_adds_goal_model.py b/migrations/versions/518900a9cb26_adds_goal_model.py new file mode 100644 index 000000000..de15b5204 --- /dev/null +++ b/migrations/versions/518900a9cb26_adds_goal_model.py @@ -0,0 +1,32 @@ +"""adds Goal Model + +Revision ID: 518900a9cb26 +Revises: 35f55aa536f0 +Create Date: 2022-05-12 16:14:29.261165 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '518900a9cb26' +down_revision = '35f55aa536f0' +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(), autoincrement=True, nullable=False), + sa.Column('title', sa.Text(), nullable=True), + sa.PrimaryKeyConstraint('goal_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/migrations/versions/9ad02a7fa164_adds_updates_task_and_goal_models.py b/migrations/versions/9ad02a7fa164_adds_updates_task_and_goal_models.py new file mode 100644 index 000000000..a23bbc1d4 --- /dev/null +++ b/migrations/versions/9ad02a7fa164_adds_updates_task_and_goal_models.py @@ -0,0 +1,30 @@ +"""adds updates Task and Goal models + +Revision ID: 9ad02a7fa164 +Revises: 518900a9cb26 +Create Date: 2022-05-13 14:38:14.533411 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9ad02a7fa164' +down_revision = '518900a9cb26' +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/bbbd05ac9577_adds_task_model.py b/migrations/versions/bbbd05ac9577_adds_task_model.py new file mode 100644 index 000000000..6bf28ea84 --- /dev/null +++ b/migrations/versions/bbbd05ac9577_adds_task_model.py @@ -0,0 +1,34 @@ +"""adds Task Model + +Revision ID: bbbd05ac9577 +Revises: +Create Date: 2022-05-07 18:00:10.996959 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'bbbd05ac9577' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.Text(), nullable=True), + sa.Column('description', sa.Text(), 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') + # ### end Alembic commands ### diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..878997766 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,34 @@ +from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +from dotenv import load_dotenv +import os + + +db = SQLAlchemy() +migrate = Migrate() +load_dotenv() + +def create_app(test_config=None): + app = Flask(__name__) + if not test_config: + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( "SQLALCHEMY_DATABASE_URI") + + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") + + from app.models.task import Task + + db.init_app(app) + migrate.init_app(app, db) + + + + + # from .routes import books_bp app.register_blueprint(books_bp) + + return app + diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..c3d76e76c 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -1,8 +1,9 @@ + from app.models.task import Task import pytest -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -13,7 +14,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -32,7 +33,7 @@ def test_get_tasks_one_saved_tasks(client, one_task): ] -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -51,22 +52,22 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") + def test_get_task_not_found(client): # Act response = client.get("/tasks/1") response_body = response.get_json() + # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body["details"] == "No task with id 1 found" + # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -86,6 +87,7 @@ def test_create_task(client): "is_complete": False } } + new_task = Task.query.get(1) assert new_task assert new_task.title == "A Brand New Task" @@ -93,7 +95,7 @@ def test_create_task(client): assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") + def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -119,7 +121,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") + def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -130,14 +132,14 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body["details"] == "No task with id 1 found" + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") + def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -147,12 +149,12 @@ def test_delete_task(client, one_task): assert response.status_code == 200 assert "details" in response_body assert response_body == { - "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted' + "details": 'Task 1 \\ Notice something new every day " successfully deleted' } assert Task.query.get(1) == None -@pytest.mark.skip(reason="No way to test this feature yet") + def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -160,8 +162,9 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body["details"] == "No task with id 1 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") + 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") + 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..41f3eccde 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") + 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") + 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..f31fab277 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") + 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") + 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") + def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -82,7 +82,7 @@ def test_mark_complete_on_completed_task(client, completed_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 @@ -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") + 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") + 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 response_body["details"] == "No task with id 1 found" + # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") + def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +142,9 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body["details"] == "No task with id 1 found" - raise Exception("Complete test with assertion about response body") + # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -151,7 +152,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") + def test_create_task_with_valid_completed_at(client): # Act response = client.post("/tasks", json={ @@ -181,7 +182,6 @@ 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") 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..6218899dd 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") 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") + 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") + 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") + def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # Assert # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body["details"] == "No goal with id 1 found" # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") + def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +81,45 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") + def test_update_goal(client, one_goal): - raise Exception("Complete test") + # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title", + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title", + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" + -@pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title", + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body["details"] == "No goal with id 1 found" # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") + def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -116,35 +128,31 @@ def test_delete_goal(client, one_goal): # Assert assert response.status_code == 200 assert "details" in response_body + assert response_body == { - "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted' + "details": 'Goal 1 \\ Build a habit of going outside daily " successfully deleted' } + assert Goal.query.get(1) == None - # Check that the goal was deleted - response = client.get("/goals/1") - assert response.status_code == 404 - 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("/goals/1") + response_body = response.get_json() # Assert + assert response.status_code == 404 + assert response_body["details"] == "No goal with id 1 found" # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- -@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..690d34bd1 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,6 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +22,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") + 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 +41,6 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -50,14 +48,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*************** # ***************************************************************** -@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") + 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") + def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json()