diff --git a/ada-project-docs/wave_04.md b/ada-project-docs/wave_04.md index 8fbf9e2ae..827c41b5f 100644 --- a/ada-project-docs/wave_04.md +++ b/ada-project-docs/wave_04.md @@ -193,4 +193,4 @@ Send `PATCH` requests to `localhost:5000/tasks//mark_complete` (use the ![](assets/postman_patch.png) -![](assets/slack_notification_feature.png) +![](assets/slIntegack_notification_feature.png) diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..052e11ea3 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,5 +1,7 @@ from flask import Flask from .db import db, migrate +from .routes.task_routes import bp as tasks_bp +from .routes.goal_routes import bp as goals_bp from .models import task, goal import os @@ -10,13 +12,13 @@ def create_app(config=None): app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') if config: - # Merge `config` into the app's configuration - # to override the app's default settings for testing app.config.update(config) db.init_app(app) migrate.init_app(app, db) - # Register Blueprints here + app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app + diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..23b917862 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,17 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +# from app.models.task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + tasks: Mapped[list["Task"]] = relationship("Task", back_populates="goal") + def to_dict(self): + return { + "id": self.id, + "title": self.title + } + @classmethod + def from_dict(cls, goal_data): + new_goal = cls(title=goal_data["title"]) + return new_goal \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..8fccf8953 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,39 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from datetime import datetime +from sqlalchemy import ForeignKey +from typing import Optional class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] = mapped_column(nullable=False) + description: Mapped[Optional[str]] = mapped_column(nullable=True) + completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") + + + def to_dict(self, include_goal=False, include_goal_id=False): + task_dict = dict( + id=self.id, + title=self.title, + description=self.description, + is_complete=self.completed_at is not None + ) + if include_goal_id: + task_dict["goal_id"] = self.goal_id + + if include_goal and self.goal: + task_dict['goal'] = self.goal.title + + + return task_dict + + @classmethod + def from_dict(cls, task_data): + return cls( + title = task_data["title"], + description = task_data["description"], + completed_at = task_data.get("completed_at"), + goal_id=task_data.get("goal_id", None) + ) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..f1e506354 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,160 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, abort, make_response +from app.models.goal import Goal +from ..db import db +from .route_utilities import validate_model, get_model_with_filters, create_model + + + +bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@bp.post("") +def create_goal(): + request_body = request.get_json() + if "title" not in request_body: + abort(make_response({"details": "Invalid data"}, 400)) + + new_goal = Goal.from_dict(request_body) + db.session.add(new_goal) + db.session.commit() + + response = { + "goal": new_goal.to_dict() + } + return response, 201 + +@bp.post("//tasks") +def create_task_with_goal_id(goal_id): + from app.models.goal import Goal + from app.models.task import Task + + goal = validate_model(Goal, goal_id) + if not goal: + response = {"message": f"Goal with ID {goal_id} not found"} + abort(make_response(response, 404)) + + request_body = request.get_json() + task_ids = request_body.get("task_ids") + + if not task_ids: + response = {"message": "Invalid request: missing 'task_ids'"} + abort(make_response(response, 400)) + + tasks = Task.query.filter(Task.id.in_(task_ids)).all() + + if len(tasks) != len(task_ids): + response = {"message": "One or more tasks not found"} + abort(make_response(response, 404)) + + for task in tasks: + if task not in goal.tasks: + goal.tasks.append(task) + + db.session.commit() + + goal_data = { + "id": goal.id, + "task_ids": [task.id for task in goal.tasks] + } + + response = goal_data + return response, 200 + + +@bp.get("//tasks") +def get_tasks_for_goal(goal_id): + from app.models.goal import Goal + from app.models.task import Task + goal = validate_model(Goal, goal_id) + + + if goal.tasks: + task_data = [task.to_dict() for task in goal.tasks] + else: + tasks = Task.query.filter_by(goal_id=goal.id).all() + task_data = [ + task.to_dict() for task in tasks + ] + + task_data = task_data or [] + + for task in task_data: + task["is_complete"] = bool(task.get("is_complete", False)) # Explicitly cast to bool + + response = { + "id": goal.id, + "title": goal.title, + "tasks": task_data + } + + return response, 200 + +@bp.get("/tasks/") +def get_task_by_id(task_id): + from app.models.task import Task + from app.models.goal import Goal + + # Validate that the task exists + task = Task.query.get(task_id) + if not task: + response = {"message": f"task id {task_id} not found"} + abort(make_response(response, 404)) + + task_data = { + "id": task.id, + "goal_id": task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": task.completed_at is not None + } + + return {"task": task_data}, 200 + + + +@bp.get("") +def get_all_goal(): + return get_model_with_filters(Goal, request.args) + +@bp.get("/") +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + if not goal: + abort(make_response({"message": f"goal_id {goal_id} not found"}, 404)) + goal_response = { + "goal": goal.to_dict() + } + + return goal_response, 200 + + +@bp.put("/") +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + if not goal: + abort(make_response({"message": f"goal_id {goal_id} not found"}, 404)) + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + + response = { + "goal": goal.to_dict() + } + + return response, 200 + +@bp.delete("/") +def delete_goal(goal_id): + goal = validate_model(Goal, goal_id) + if not goal: + abort(make_response({"message": f"goal_id {goal_id} not found"}, 404)) + + db.session.delete(goal) + db.session.commit() + + response = { + "details": f'Goal {goal.id} "{goal.title}" successfully deleted' + } + + return response, 200 diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..4248fb36c --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,40 @@ +from flask import abort, make_response +from ..db import db + +def validate_model(cls, model_id): + model_prefix = 'goal' if cls.__name__.lower() == 'goal' else 'task' + + try: + model_id = int(model_id) + except ValueError: + abort(make_response({"message": f"{model_prefix}_id {model_id} invalid"}, 400)) + + # query = db.select(cls).where(cls.id == model_id) + # model = db.session.scalar(query) + model = cls.query.get(model_id) + if not model: + abort(make_response({"message": f"{model_prefix}_id {model_id} not found"}, 404)) + + return model + + +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + except KeyError as error: + response = {"message": f"Invalid request: missing {error.args[0]}"} + abort(make_response(response, 400)) + +def get_model_with_filters(cls, filters=None): + query = db.select(cls) + + if filters: + for attribute, value in filters.items(): + if isinstance(value, list): + query = query.where(getattr(cls, attribute).in_(value)) + else: + query = query.where(getattr(cls, attribute).ilike(f"%{value}%") if isinstance(value, str) else getattr(cls, attribute) == value) + models = db.session.scalars(query.order_by(cls.id)) + models_response = [model.to_dict() for model in models] + + return models_response \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..f24dffc2a 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,126 @@ -from flask import Blueprint \ No newline at end of file +import requests +from flask import Blueprint, abort, make_response, request +from ..db import db +from app.models.task import Task +from datetime import datetime +import os +from dotenv import load_dotenv +from .route_utilities import validate_model + +load_dotenv() + +bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +@bp.post("") +def create_task(): + request_body = request.get_json() + if "title" not in request_body or "description" not in request_body: + abort(make_response({"details": "Invalid data"}, 400)) + + completed_at = request_body.get("completed_at", None) + + new_task = Task.from_dict(request_body) + db.session.add(new_task) + db.session.commit() + + response = { + "task": new_task.to_dict() + } + return response, 201 + +@bp.get("") +def get_all_tasks(): + sort_order = request.args.get('sort') + + if sort_order == 'asc': + query = db.select(Task).order_by(Task.title.asc()) + elif sort_order == 'desc': + query = db.select(Task).order_by(Task.title.desc()) + else: + query = db.select(Task).order_by(Task.id) + + tasks = db.session.scalars(query) + + tasks_response = [task.to_dict() for task in tasks] + return tasks_response, 200 + +@bp.get("/") +def get_one_task(task_id): + task = validate_model(Task, task_id) + task_response = { + "task": task.to_dict() + } + + return task_response, 200 + +@bp.put("/") +def update_task(task_id): + task = validate_model(Task, task_id) + if not task: + abort(make_response({"message": f"task_id {task_id} not found"}, 404)) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body.get("description", task.description) + task.completed_at = request_body.get("completed_at", task.completed_at) + + db.session.commit() + + response = { + "task": task.to_dict() + } + + return response, 200 + +@bp.patch("//mark_complete") +def complete_task(task_id): + task = validate_model(Task, task_id) + + task.completed_at = datetime.now() + db.session.commit() + + url = "https://slack.com/api/chat.postMessage" + slack_token = os.environ.get("SLACK_BOT_TOKEN") + headers = { + "Authorization": f"Bearer {slack_token}", + "Content-Type": "application/json" + } + request_body = { + "channel": "C07US894WRL", + "text": f"Someone just completed the task {task.title}" + } + response = requests.post(url, json=request_body, headers=headers) + + if response.status_code == 200: + return{"task": task.to_dict()}, 200 + else: + return {"error": "Failed to send Slack notification"}, 500 + + +@bp.patch("//mark_incomplete") +def mark_task_incomplete(task_id): + task = validate_model(Task, task_id) + + task.completed_at = None + db.session.commit() + + return {"task": task.to_dict()}, 200 + + +@bp.delete("/") +def delete_task(task_id): + task = validate_model(Task, task_id) + if not task: + abort(make_response({"message": f"task_id {task_id} not found"}, 404)) + + db.session.delete(task) + db.session.commit() + + response = { + "details": f'Task {task.id} "{task.title}" successfully deleted' + } + + return response, 200 + + + diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# 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,flask_migrate + +[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 + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[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..4c9709271 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +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') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# 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', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# 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 get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +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=get_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.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_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/39a814b5bcfb_add_relationship_to_goal_and_task_models.py b/migrations/versions/39a814b5bcfb_add_relationship_to_goal_and_task_models.py new file mode 100644 index 000000000..a3bf963da --- /dev/null +++ b/migrations/versions/39a814b5bcfb_add_relationship_to_goal_and_task_models.py @@ -0,0 +1,34 @@ +"""Add relationship to goal and task models + +Revision ID: 39a814b5bcfb +Revises: a6a407d0e304 +Create Date: 2024-11-07 15:07:17.926648 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '39a814b5bcfb' +down_revision = 'a6a407d0e304' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True)) + batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id']) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_constraint(None, type_='foreignkey') + batch_op.drop_column('goal_id') + + # ### end Alembic commands ### diff --git a/migrations/versions/6f3f20ffb139_.py b/migrations/versions/6f3f20ffb139_.py new file mode 100644 index 000000000..e7e79c1ab --- /dev/null +++ b/migrations/versions/6f3f20ffb139_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 6f3f20ffb139 +Revises: +Create Date: 2024-11-01 15:27:41.270448 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6f3f20ffb139' +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.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=True), + 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/a6a407d0e304_add_goal_model.py b/migrations/versions/a6a407d0e304_add_goal_model.py new file mode 100644 index 000000000..377eaa25f --- /dev/null +++ b/migrations/versions/a6a407d0e304_add_goal_model.py @@ -0,0 +1,32 @@ +"""Add goal model + +Revision ID: a6a407d0e304 +Revises: 6f3f20ffb139 +Create Date: 2024-11-06 15:18:37.745000 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a6a407d0e304' +down_revision = '6f3f20ffb139' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..1866ca837 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 == {"message": "task_id 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 == {"message": "task_id 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 == {"message": "task_id 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 32d379822..b9f8e9ca8 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 == {"message": "task_id 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 == {"message": "task_id 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*************** # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..55833415d 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,20 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # raise Exception("Complete test") # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == {"message": "goal_id 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +78,39 @@ 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() # 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 response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } -@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 - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "goal_id 1 not found"} + -@pytest.mark.skip(reason="No way to test this feature yet") + +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -123,28 +126,25 @@ 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() == {"message": "goal_id 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") - - # 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 - # ---- Complete Assertions Here ---- - + assert response.status_code == 404 + assert response_body == {"message": "goal_id 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_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..b1d65b906 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,16 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body["message"] == "goal_id 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 +76,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 +101,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() @@ -116,3 +118,4 @@ def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): "is_complete": False } } +