From b9c7d4a0752f4af362e7541c58f6d6397660827a Mon Sep 17 00:00:00 2001 From: La Tasha Pollard Date: Thu, 11 May 2023 15:47:13 -0500 Subject: [PATCH 1/6] completes wave one with all test passing --- app/__init__.py | 9 ++- app/models/task.py | 22 ++++++- app/routes.py | 75 +++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/2ae0a0f97858_.py | 39 +++++++++++ requirements.txt | 2 + tests/test_wave_01.py | 31 +++++---- 10 files changed, 325 insertions(+), 19 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/2ae0a0f97858_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..11674caf2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,13 +22,16 @@ def create_app(test_config=None): app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") - # Import models here for Alembic setup - from app.models.task import Task - from app.models.goal import Goal db.init_app(app) migrate.init_app(app, db) + # Import models here for Alembic setup + from app.models.task import Task + from app.models.goal import Goal + # Register Blueprints here + from .routes import task_bp + app.register_blueprint(task_bp) return app diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..8595defc7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +2,24 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id=db.Column(db.Integer, primary_key=True, autoincrement=True) + title=db.Column(db.String, nullable=False) + description=db.Column(db.String, nullable=False) + completed_at=db.Column(db.DateTime, nullable=True, default=None) + + def to_dict(self): + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + + @classmethod + def from_dict(cls, task_data): + return Task( + title=task_data["title"], + description=task_data["description"] + ) + + diff --git a/app/routes.py b/app/routes.py index 3aae38d49..74a7f3a20 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,74 @@ -from flask import Blueprint \ No newline at end of file +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response, request + +task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} invalid"}), 400)) + + model = cls.query.get(model_id) + if not model: + abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} not found"}), 404)) + + return model + + +@task_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + try: + request_body["title"] and request_body["description"] + except: + abort(make_response(jsonify({"details":"Invalid data"}), 400)) + + new_task = Task.from_dict(request_body) + + db.session.add(new_task) + db.session.commit() + + response_body = {"task":new_task.to_dict()} + + return make_response(jsonify(response_body), 201) + + +@task_bp.route("", methods=["GET"]) +def get_task(): + tasks = Task.query.all() + results = [task.to_dict() for task in tasks] + + return jsonify(results) + + +@task_bp.route("/", methods=["GET"]) +def get_one_task(task_id): + task = validate_model(Task, task_id) + response_body = {"task":task.to_dict()} + + return response_body + + +@task_bp.route("/", methods=["PUT"]) +def update_task(task_id): + task = validate_model(Task, task_id) + task_updates = request.get_json() + task.title = task_updates["title"] + task.description = task_updates["description"] + response_body = {"task":task.to_dict()} + db.session.commit() + + return response_body + +@task_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task_to_delete = validate_model(Task, task_id) + db.session.delete(task_to_delete) + db.session.commit() + response_body = {"details": f'Task {task_to_delete.task_id} "{task_to_delete.title}" successfully deleted'} + + + return make_response(jsonify(response_body)) \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/2ae0a0f97858_.py b/migrations/versions/2ae0a0f97858_.py new file mode 100644 index 000000000..140f2e6ae --- /dev/null +++ b/migrations/versions/2ae0a0f97858_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 2ae0a0f97858 +Revises: +Create Date: 2023-05-11 10:01:13.849916 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2ae0a0f97858' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/requirements.txt b/requirements.txt index 453f0ef6a..552c57235 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==7.2.5 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 @@ -30,5 +31,6 @@ requests==2.25.1 six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.5 Werkzeug==1.0.1 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..b9c587da5 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") @@ -60,13 +60,14 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - 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*************** # ***************************************************************** + response_body["message"] == "Task 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_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={ @@ -131,13 +132,14 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - 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*************** # ***************************************************************** + assert response_body["message"] == "Task 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_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") @@ -161,15 +163,16 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - 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*************** # ***************************************************************** + assert response_body["message"] == "Task 1 not found" 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={ From c6151de1f1380aa5af239704822c6a0dc4da88b3 Mon Sep 17 00:00:00 2001 From: La Tasha Pollard Date: Thu, 11 May 2023 19:00:30 -0500 Subject: [PATCH 2/6] completes wave 2 with all test passing --- app/routes.py | 9 ++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 74a7f3a20..bdb587adf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -38,7 +38,14 @@ def create_task(): @task_bp.route("", methods=["GET"]) def get_task(): - tasks = Task.query.all() + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(Task.title).all() + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + + else: + tasks = Task.query.all() results = [task.to_dict() for task in tasks] return jsonify(results) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From bc41c3e13bbf2d648e221030b6d272160c8ab1ad Mon Sep 17 00:00:00 2001 From: La Tasha Pollard Date: Thu, 11 May 2023 21:52:15 -0500 Subject: [PATCH 3/6] completes wave 3 with all test passing --- app/routes.py | 25 ++++++++++++++++++++++++- tests/test_wave_03.py | 18 ++++++++++-------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/routes.py b/app/routes.py index bdb587adf..3d132e514 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request +import datetime task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -78,4 +79,26 @@ def delete_task(task_id): response_body = {"details": f'Task {task_to_delete.task_id} "{task_to_delete.title}" successfully deleted'} - return make_response(jsonify(response_body)) \ No newline at end of file + return make_response(jsonify(response_body)) + +@task_bp.route("//mark_complete", methods=["PATCH"]) +def mark_task_complete(task_id): + task = validate_model(Task, task_id) + + task.completed_at = datetime.datetime.now() + + response_body = {"task": task.to_dict()} + db.session.commit() + + return response_body + +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_task_incomplete(task_id): + task = validate_model(Task, task_id) + + task.completed_at = None + + response_body = {"task": task.to_dict()} + db.session.commit() + + return response_body diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..59ff6dc97 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") @@ -128,13 +128,14 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - 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*************** # ***************************************************************** + assert response_body["message"] == "Task 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_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -143,7 +144,8 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - 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*************** # ***************************************************************** + assert response_body["message"] == "Task 1 not found" From d6ce93903786ef9d04b0fe050c2507e4b36155b3 Mon Sep 17 00:00:00 2001 From: La Tasha Pollard Date: Fri, 12 May 2023 08:38:28 -0500 Subject: [PATCH 4/6] completes wave 5 with all test passing --- app/__init__.py | 5 +- app/goal_routes.py | 70 ++++++++++++++++++++++++++ app/models/goal.py | 14 ++++++ app/{routes.py => task_routes.py} | 13 ++++- migrations/versions/8e98053d9e5d_.py | 28 +++++++++++ tests/test_wave_05.py | 74 ++++++++++++++++++---------- 6 files changed, 176 insertions(+), 28 deletions(-) create mode 100644 app/goal_routes.py rename app/{routes.py => task_routes.py} (86%) create mode 100644 migrations/versions/8e98053d9e5d_.py diff --git a/app/__init__.py b/app/__init__.py index 11674caf2..911939ae3 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -31,7 +31,10 @@ def create_app(test_config=None): from app.models.goal import Goal # Register Blueprints here - from .routes import task_bp + from .task_routes import task_bp app.register_blueprint(task_bp) + from .goal_routes import goal_bp + app.register_blueprint(goal_bp) + return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..411e3558a --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,70 @@ +from app import db +from app.models.goal import Goal +from flask import Blueprint, jsonify, abort, make_response, request +import datetime, requests, os + +goal_bp = Blueprint("goals", __name__, url_prefix="/goals") + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} invalid"}), 400)) + + model = cls.query.get(model_id) + if not model: + abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} not found"}), 404)) + + return model + +@goal_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + try: + request_body["title"] + except: + abort(make_response(jsonify({"details":"Invalid data"}), 400)) + + new_goal = Goal.from_dict(request_body) + + db.session.add(new_goal) + db.session.commit() + + response_body = {"goal":new_goal.to_dict()} + + return make_response(jsonify(response_body), 201) + +@goal_bp.route("", methods=["GET"]) +def get_goals(): + goals = Goal.query.all() + results = [goal.to_dict() for goal in goals] + + return jsonify(results) + +@goal_bp.route("/", methods=["GET"]) +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + response_body = {"goal":goal.to_dict()} + + return response_body + +@goal_bp.route("/", methods=["PUT"]) +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + goal_updates = request.get_json() + goal.title = goal_updates["title"] + response_body = {"goal":goal.to_dict()} + db.session.commit() + + return response_body + +@goal_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal_to_delete = validate_model(Goal, goal_id) + db.session.delete(goal_to_delete) + db.session.commit() + response_body = {"details": f'Goal {goal_to_delete.goal_id} "{goal_to_delete.title}" successfully deleted'} + + + return make_response(jsonify(response_body)) \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..d6aba5634 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,17 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String, nullable=False) + + def to_dict(self): + return { + "id": self.goal_id, + "title": self.title + } + + @classmethod + def from_dict(cls, task_data): + return Goal( + title=task_data["title"] + ) + diff --git a/app/routes.py b/app/task_routes.py similarity index 86% rename from app/routes.py rename to app/task_routes.py index 3d132e514..e315439d2 100644 --- a/app/routes.py +++ b/app/task_routes.py @@ -1,7 +1,7 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request -import datetime +import datetime, requests, os task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -89,6 +89,17 @@ def mark_task_complete(task_id): response_body = {"task": task.to_dict()} db.session.commit() + + # path = "https://slack.com/api/chat.postMessage?channel=task-notifications&text=Hey%20there!&pretty=1" + path = "https://slack.com/api/chat.postMessage" + api_key = os.environ.get("SLACKBOT_API_TOKEN") + headers = { + "header": f"Bearer {api_key}", + "channel":"C0572HAGWUX", + "text": f"Someone just completed the task {task.title}" + } + + requests.post(path, headers=headers) return response_body diff --git a/migrations/versions/8e98053d9e5d_.py b/migrations/versions/8e98053d9e5d_.py new file mode 100644 index 000000000..eb96b8aa3 --- /dev/null +++ b/migrations/versions/8e98053d9e5d_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 8e98053d9e5d +Revises: 2ae0a0f97858 +Create Date: 2023-05-12 07:55:33.814181 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8e98053d9e5d' +down_revision = '2ae0a0f97858' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=False)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..57a1d4c4b 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ import pytest +from app.models.goal import Goal -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +47,22 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # raise Exception("Complete test") # Assert # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here + assert response_body["message"] == "Goal 1 not found" + assert response.status_code == 404 # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +81,51 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + # raise Exception("Complete test") + + #Act + + response = client.put("/goals/1", json={ + "title": "Build a habit of going outside daily", + }) + response_body = response.get_json() + # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Build a habit of going outside daily" + } + } + goal = Goal.query.get(1) + assert goal.title == "Build a habit of going outside daily" # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Build a habit of going outside daily", + }) + 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["message"] == "Goal 1 not found" # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -124,27 +142,31 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 - 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*************** # ***************************************************************** + assert Goal.query.get(1) == None -@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("/tasks/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body["message"] == "Task 1 not found" + assert Goal.query.all() == [] # ---- 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={}) From 7553b6797822097f2111d4e777fe415af60e06b6 Mon Sep 17 00:00:00 2001 From: La Tasha Pollard Date: Sat, 13 May 2023 13:19:00 -0500 Subject: [PATCH 5/6] completes wave 6 with all test passing --- app/goal_routes.py | 66 ++++++++++++++++++++++------ app/models/goal.py | 18 ++++++-- app/models/task.py | 21 +++++---- app/task_routes.py | 13 +++--- migrations/versions/4f55703be353_.py | 30 +++++++++++++ tests/test_wave_06.py | 15 ++++--- 6 files changed, 124 insertions(+), 39 deletions(-) create mode 100644 migrations/versions/4f55703be353_.py diff --git a/app/goal_routes.py b/app/goal_routes.py index 411e3558a..e00791850 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -1,40 +1,48 @@ from app import db -from app.models.goal import Goal from flask import Blueprint, jsonify, abort, make_response, request -import datetime, requests, os +from app.models.goal import Goal +from app.models.task import Task +import datetime +import requests +import os goal_bp = Blueprint("goals", __name__, url_prefix="/goals") + def validate_model(cls, model_id): try: model_id = int(model_id) except: - abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} invalid"}), 400)) - + abort(make_response( + jsonify({"message": f"{cls.__name__} {model_id} invalid"}), 400)) + model = cls.query.get(model_id) if not model: - abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} not found"}), 404)) + abort(make_response( + jsonify({"message": f"{cls.__name__} {model_id} not found"}), 404)) return model + @goal_bp.route("", methods=["POST"]) def create_goal(): request_body = request.get_json() try: - request_body["title"] + request_body["title"] except: - abort(make_response(jsonify({"details":"Invalid data"}), 400)) + abort(make_response(jsonify({"details": "Invalid data"}), 400)) new_goal = Goal.from_dict(request_body) - + db.session.add(new_goal) db.session.commit() - response_body = {"goal":new_goal.to_dict()} + response_body = {"goal": new_goal.to_dict()} return make_response(jsonify(response_body), 201) + @goal_bp.route("", methods=["GET"]) def get_goals(): goals = Goal.query.all() @@ -42,29 +50,59 @@ def get_goals(): return jsonify(results) + @goal_bp.route("/", methods=["GET"]) def get_one_goal(goal_id): goal = validate_model(Goal, goal_id) - response_body = {"goal":goal.to_dict()} + response_body = {"goal": goal.to_dict()} return response_body + @goal_bp.route("/", methods=["PUT"]) def update_goal(goal_id): goal = validate_model(Goal, goal_id) goal_updates = request.get_json() goal.title = goal_updates["title"] - response_body = {"goal":goal.to_dict()} + response_body = {"goal": goal.to_dict()} db.session.commit() return response_body + @goal_bp.route("/", methods=["DELETE"]) def delete_goal(goal_id): goal_to_delete = validate_model(Goal, goal_id) db.session.delete(goal_to_delete) db.session.commit() - response_body = {"details": f'Goal {goal_to_delete.goal_id} "{goal_to_delete.title}" successfully deleted'} - + response_body = { + "details": f'Goal {goal_to_delete.goal_id} "{goal_to_delete.title}" successfully deleted'} + + return make_response(jsonify(response_body)) + + +@goal_bp.route("//tasks", methods=["POST"]) +def post_task_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + for task_id in request_body["task_ids"]: + task = validate_model(Task, task_id) + task.goal_id = goal.goal_id + db.session.commit() + task_id_list = [] + for task in goal.tasks: + task_id_list.append(task.task_id) + + response_body = { + "id": goal.goal_id, + "task_ids": task_id_list + } + return make_response(jsonify(response_body)) + + +@goal_bp.route("//tasks", methods=["GET"]) +def get_tasks_of_goal(goal_id): + goal = validate_model(Goal, goal_id) + response_body = goal.to_dict(tasks=True) - return make_response(jsonify(response_body)) \ No newline at end of file + return make_response(jsonify(response_body)) diff --git a/app/models/goal.py b/app/models/goal.py index d6aba5634..b4d515221 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,16 +4,26 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String, nullable=False) + tasks = db.relationship("Task", back_populates="goal", lazy=True) + - def to_dict(self): - return { + def to_dict(self, tasks=False): + goal_dict = { "id": self.goal_id, "title": self.title + } + if tasks: + goal_dict["tasks"]= [task.to_dict() for task in self.tasks] + + return goal_dict + + + @classmethod - def from_dict(cls, task_data): + def from_dict(cls, goal_data): return Goal( - title=task_data["title"] + title=goal_data["title"] ) diff --git a/app/models/task.py b/app/models/task.py index 8595defc7..c381dbf78 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,24 +2,29 @@ class Task(db.Model): - task_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, default=None) + task_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, default=None) + goal_id = db.Column(db.Integer, db.ForeignKey( + 'goal.goal_id'), nullable=True) + goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): - return { + task_dict = { "id": self.task_id, "title": self.title, "description": self.description, "is_complete": bool(self.completed_at) } - + if self.goal_id: + task_dict["goal_id"] = self.goal_id + + return task_dict + @classmethod def from_dict(cls, task_data): return Task( title=task_data["title"], description=task_data["description"] ) - - diff --git a/app/task_routes.py b/app/task_routes.py index e315439d2..224e37499 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -90,17 +90,18 @@ def mark_task_complete(task_id): response_body = {"task": task.to_dict()} db.session.commit() - # path = "https://slack.com/api/chat.postMessage?channel=task-notifications&text=Hey%20there!&pretty=1" path = "https://slack.com/api/chat.postMessage" api_key = os.environ.get("SLACKBOT_API_TOKEN") headers = { - "header": f"Bearer {api_key}", - "channel":"C0572HAGWUX", - "text": f"Someone just completed the task {task.title}" + "authorization": f"Bearer {api_key}" } - requests.post(path, headers=headers) - + data = { + "channel": "C0572HAGWUX", + "text": f"Someone just completed the task {task.title}" + } + requests.post(path, headers=headers, data=data) + return response_body @task_bp.route("//mark_incomplete", methods=["PATCH"]) diff --git a/migrations/versions/4f55703be353_.py b/migrations/versions/4f55703be353_.py new file mode 100644 index 000000000..d9dfea51d --- /dev/null +++ b/migrations/versions/4f55703be353_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 4f55703be353 +Revises: 8e98053d9e5d +Create Date: 2023-05-12 11:36:36.290506 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4f55703be353' +down_revision = '8e98053d9e5d' +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/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..184caf8ce 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,14 @@ 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") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body["message"] == "Goal 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_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +75,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -99,7 +100,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From eaa10e6119af4c93fac14a55f539cffa786ec26e Mon Sep 17 00:00:00 2001 From: La Tasha Pollard Date: Sat, 13 May 2023 13:42:19 -0500 Subject: [PATCH 6/6] configures for render and is connected to render database --- app/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 911939ae3..6f949730a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,12 +15,16 @@ def create_app(test_config=None): 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") + "RENDER_DATABASE_URI") else: app.config["TESTING"] = True + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_TEST_DATABASE_URI") app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + "RENDER_DATABASE_URI") db.init_app(app)