From 5d4806ca842c35d1ea4165727feefec3a1a623ac Mon Sep 17 00:00:00 2001 From: Kallie Gannon Date: Sun, 6 Nov 2022 11:02:36 -0500 Subject: [PATCH 01/15] wave1-1 --- app/__init__.py | 4 +- app/models/goal.py | 14 +++- app/models/task.py | 15 ++++ app/routes.py | 110 ++++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++ migrations/env.py | 96 +++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/668ac666b731_.py | 39 ++++++++++ migrations/versions/e17a9723efb9_.py | 28 +++++++ tests/test_wave_01.py | 2 +- 11 files changed, 374 insertions(+), 4 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/668ac666b731_.py create mode 100644 migrations/versions/e17a9723efb9_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..efd732a47 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,7 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate -import os +import os from dotenv import load_dotenv @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..27bc474a2 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,17 @@ from app import db - class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + + + + + +# def to_dict(self): +# return { +# "id": self.id, +# "name": self.name, +# "breed": self.breed, +# "age": self.age, +# "gender": self.gender +# } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..80bfe5bd1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,3 +3,18 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime) + is_completed = db.Column(db.String) + + def to_dict(self): + return { + "id": self.id, + "title": self.title, + "is_completed": self.is_completed, + "description": self.description + + } + + diff --git a/app/routes.py b/app/routes.py index 3aae38d49..4c15869a1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,109 @@ -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 + +tasks_bp = Blueprint('tasks_bp', __name__, url_prefix='/tasks') + + +@tasks_bp.route("", methods=["POST"]) + +def create_task(): + request_body = request.get_json() + + + # if "title" not in request_body or "description" not in request_body: + # return make_response("Invalid Request, Title & description Can't Be Empty", 400) + + new_task = Task( + title = request_body["title"], + description = request_body["description"], + is_completed = request_body["is_completed"] + ) + + + db.session.add(new_task) + db.session.commit() + + + return make_response(f"Task {new_task.title} has been successfully created!", 201) + + + + + + + +@tasks_bp.route('/',methods=['PUT']) +def edit_task(task_id): + task = Task.query.get(task_id) + + request_body = request.get_json() + + task.title = request_body["title"] + task.is_complete = request_body["is_complete"] + task.description = request_body["description"] + + db.session.commit() + return make_response(f"task {task.title} succesfully updated",200) + + + + + + + + + +@tasks_bp.route('',methods=['GET']) +def get_task(): + task_query = Task.query + + descripiton_query = request.arg.get("description") + if descripiton_query: + task_query = task_query.filter_by(description = descripiton_query) + else: + task = Task.query.all() + + title_query = request.arg.get("title") + if title_query: + task_query = task_query.filter_by(title = title_query) + else: + task = Task.query.all() + + is_complete_query = request.arg.get("is_complete") + if is_complete_query: + task_query = task_query.filter_by(is_complete = is_complete_query) + else: + task = Task.query.all() + + by_id_query = request.arg.get(id) + if by_id_query: + by_id_query = by_id_query.filter_by(by_id = by_id_query) + else: + task = Task.query.all() + + tasks = task_query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append({ + "id": task.id, + "name": task.name, + "is_complete": task.is_complete, + "description": task.description + }) + if not tasks_response: + return make_response(jsonify(f"There are no {task_query} tasks")) + return jsonify(tasks_response) + + + + +@tasks_bp.route('/',methods=['DELETE']) +def delete_task(task_id): + task = Task.query.get(task_id) + + db.session.delete(task) + db.session.commit() + + return make_response(f"Task {task.title} succesfully deleted",202) \ 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/668ac666b731_.py b/migrations/versions/668ac666b731_.py new file mode 100644 index 000000000..5a6fcd280 --- /dev/null +++ b/migrations/versions/668ac666b731_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 668ac666b731 +Revises: +Create Date: 2022-11-05 12:46:29.329375 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '668ac666b731' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/migrations/versions/e17a9723efb9_.py b/migrations/versions/e17a9723efb9_.py new file mode 100644 index 000000000..1984e948a --- /dev/null +++ b/migrations/versions/e17a9723efb9_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: e17a9723efb9 +Revises: 668ac666b731 +Create Date: 2022-11-06 09:58:18.698453 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e17a9723efb9' +down_revision = '668ac666b731' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_completed', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_completed') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..9dd8fe3e6 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") From f4f1bb6f9018e7c3a03f161da1bff9a07337dca1 Mon Sep 17 00:00:00 2001 From: Kallie Gannon Date: Sun, 6 Nov 2022 11:10:29 -0500 Subject: [PATCH 02/15] wave1-2 --- app/routes.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4c15869a1..ef9e22532 100644 --- a/app/routes.py +++ b/app/routes.py @@ -47,9 +47,18 @@ def edit_task(task_id): return make_response(f"task {task.title} succesfully updated",200) - - +@tasks_bp.route("/", methods=["GET"]) +# GET /dog/id +def handle_task(task_id): + # Query our db to grab the task that has the id we want: + task = Task.query.get(task_id) + return { + "id": task.id, + "name": task.name, + "is_complete": task.is_complete, + "description": task.description + } From a7a52e09bc75ddf9743565420aa100ed2714aca4 Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Sun, 6 Nov 2022 11:52:46 -0500 Subject: [PATCH 03/15] wave 1 reset --- app/routes.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/routes.py b/app/routes.py index ef9e22532..57caf68d2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -27,12 +27,6 @@ def create_task(): return make_response(f"Task {new_task.title} has been successfully created!", 201) - - - - - - @tasks_bp.route('/',methods=['PUT']) def edit_task(task_id): task = Task.query.get(task_id) @@ -105,9 +99,6 @@ def get_task(): return make_response(jsonify(f"There are no {task_query} tasks")) return jsonify(tasks_response) - - - @tasks_bp.route('/',methods=['DELETE']) def delete_task(task_id): task = Task.query.get(task_id) From 8d10b6665839a0e4baf97784dc5a66a9767338c6 Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Mon, 7 Nov 2022 10:00:52 -0500 Subject: [PATCH 04/15] test_wave_1_1 passed --- app/routes.py | 23 +++++------------------ tests/test_wave_01.py | 3 ++- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/app/routes.py b/app/routes.py index 57caf68d2..601c2844d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,7 +10,6 @@ def create_task(): request_body = request.get_json() - # if "title" not in request_body or "description" not in request_body: # return make_response("Invalid Request, Title & description Can't Be Empty", 400) @@ -20,7 +19,6 @@ def create_task(): is_completed = request_body["is_completed"] ) - db.session.add(new_task) db.session.commit() @@ -55,35 +53,25 @@ def handle_task(task_id): } - - @tasks_bp.route('',methods=['GET']) def get_task(): task_query = Task.query - descripiton_query = request.arg.get("description") + descripiton_query = request.args.get("description") if descripiton_query: task_query = task_query.filter_by(description = descripiton_query) - else: - task = Task.query.all() - title_query = request.arg.get("title") + title_query = request.args.get("title") if title_query: task_query = task_query.filter_by(title = title_query) - else: - task = Task.query.all() - is_complete_query = request.arg.get("is_complete") + is_complete_query = request.args.get("is_complete") if is_complete_query: task_query = task_query.filter_by(is_complete = is_complete_query) - else: - task = Task.query.all() - by_id_query = request.arg.get(id) + by_id_query = request.args.get(id) if by_id_query: by_id_query = by_id_query.filter_by(by_id = by_id_query) - else: - task = Task.query.all() tasks = task_query.all() @@ -95,8 +83,7 @@ def get_task(): "is_complete": task.is_complete, "description": task.description }) - if not tasks_response: - return make_response(jsonify(f"There are no {task_query} tasks")) + return jsonify(tasks_response) @tasks_bp.route('/',methods=['DELETE']) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 9dd8fe3e6..fb48fef29 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -13,7 +13,8 @@ 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") From 2ac53c1c0fb6bbe5f0e5e765d5d7be0039dfda59 Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Mon, 7 Nov 2022 15:56:20 -0500 Subject: [PATCH 05/15] test wave 1 all passing, an attempt at wave 2 --- app/models/task.py | 10 ++--- app/routes.py | 87 +++++++++++++++++++++++++++++++------------ tests/test_wave_01.py | 36 ++++++------------ tests/test_wave_02.py | 2 +- 4 files changed, 81 insertions(+), 54 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 80bfe5bd1..45c003693 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,17 +2,17 @@ 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) description = db.Column(db.String) - completed_at = db.Column(db.DateTime) - is_completed = db.Column(db.String) + completed_at = db.Column(db.DateTime, default=None) + is_complete = db.Column(db.Boolean, default=False) def to_dict(self): return { - "id": self.id, + "id": self.task_id, "title": self.title, - "is_completed": self.is_completed, + "is_complete": self.is_complete, "description": self.description } diff --git a/app/routes.py b/app/routes.py index 601c2844d..8e8e5f64b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,55 +1,70 @@ +import string from app import db from app.models.task import Task from flask import Blueprint,jsonify,abort,make_response,request tasks_bp = Blueprint('tasks_bp', __name__, url_prefix='/tasks') +def validate_task(task_id): -@tasks_bp.route("", methods=["POST"]) + try: + task_id = int(task_id) + except: + abort(make_response({"message":f"Task {task_id} invalid"}, 400)) + + task = Task.query.get(task_id) + if not task: + abort(make_response({"message":f"Task {task_id} not found"}, 404)) + + return task + +@tasks_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() - # if "title" not in request_body or "description" not in request_body: - # return make_response("Invalid Request, Title & description Can't Be Empty", 400) + if "title" not in request_body or "description" not in request_body: + return make_response({"details": "Invalid data"}, 400) new_task = Task( title = request_body["title"], description = request_body["description"], - is_completed = request_body["is_completed"] ) db.session.add(new_task) db.session.commit() - - return make_response(f"Task {new_task.title} has been successfully created!", 201) + return make_response({"task":new_task.to_dict()}, 201) @tasks_bp.route('/',methods=['PUT']) -def edit_task(task_id): - task = Task.query.get(task_id) - +def update_task(task_id): request_body = request.get_json() + if "title" not in request_body or "description" not in request_body: + return make_response("Invalid Request, Title & Description Can't Be Empty", 400) + + task = validate_task(task_id) + task = Task.query.get(task_id) task.title = request_body["title"] - task.is_complete = request_body["is_complete"] + # task.is_complete = request_body["is_complete"] task.description = request_body["description"] db.session.commit() - return make_response(f"task {task.title} succesfully updated",200) + return make_response({"task":task.to_dict()}, 200) @tasks_bp.route("/", methods=["GET"]) -# GET /dog/id +# GET /task/id def handle_task(task_id): # Query our db to grab the task that has the id we want: + task = validate_task(task_id) task = Task.query.get(task_id) - return { - "id": task.id, - "name": task.name, + return {"task":{ + "id": task.task_id, + "title": task.title, "is_complete": task.is_complete, - "description": task.description + "description": task.description} } @@ -57,29 +72,52 @@ def handle_task(task_id): def get_task(): task_query = Task.query + sort_query = request.args.get("sort") + if sort_query: + task_response = [] + tasks = task_query.all() + for task in tasks: + task_response.append(task.to_dict()) + + task_titles = [] + + for task in task_response: + for key, value in task.items(): + if key == "title": + task_titles.append(value) + + response_body = [] + if sort_query == "asc": + sorted_tasks = sorted(task_titles) + while len(response_body) < len(task_response): + for task in task_response: + if task["title"] == sorted_tasks[0]: + response_body.append(task) + sorted_tasks.pop(0) + return make_response(jsonify(response_body), 200) + + if sort_query == "desc": + pass + descripiton_query = request.args.get("description") if descripiton_query: task_query = task_query.filter_by(description = descripiton_query) title_query = request.args.get("title") if title_query: - task_query = task_query.filter_by(title = title_query) + task_query = task_query.filter_by(name = title_query) is_complete_query = request.args.get("is_complete") if is_complete_query: task_query = task_query.filter_by(is_complete = is_complete_query) - by_id_query = request.args.get(id) - if by_id_query: - by_id_query = by_id_query.filter_by(by_id = by_id_query) - tasks = task_query.all() tasks_response = [] for task in tasks: tasks_response.append({ - "id": task.id, - "name": task.name, + "id": task.task_id, + "title": task.title, "is_complete": task.is_complete, "description": task.description }) @@ -88,9 +126,10 @@ def get_task(): @tasks_bp.route('/',methods=['DELETE']) def delete_task(task_id): + task = validate_task(task_id) task = Task.query.get(task_id) db.session.delete(task) db.session.commit() - return make_response(f"Task {task.title} succesfully deleted",202) \ No newline at end of file + return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index fb48fef29..5e1562a74 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -33,7 +33,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") @@ -52,7 +52,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,14 +60,10 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":f"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={ @@ -94,7 +90,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={ @@ -120,7 +116,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,14 +127,10 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message":f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -153,7 +145,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,16 +153,12 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":f"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={ @@ -187,7 +175,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..544ab5a00 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") From 9f75ceaea5bc790cd1f3101d9b1f6d0c5df472be Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Mon, 7 Nov 2022 16:04:41 -0500 Subject: [PATCH 06/15] test wave 2 passing --- app/routes.py | 14 ++++++++++++-- tests/test_wave_02.py | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 8e8e5f64b..679c90ee3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -89,15 +89,25 @@ def get_task(): response_body = [] if sort_query == "asc": sorted_tasks = sorted(task_titles) - while len(response_body) < len(task_response): + while len(response_body) < len(task_titles): for task in task_response: + if len(sorted_tasks) == 0: + break if task["title"] == sorted_tasks[0]: response_body.append(task) sorted_tasks.pop(0) return make_response(jsonify(response_body), 200) if sort_query == "desc": - pass + sorted_tasks = sorted(task_titles, reverse=True) + while len(response_body) < len(task_titles): + for task in task_response: + if len(sorted_tasks) == 0: + break + if task["title"] == sorted_tasks[0]: + response_body.append(task) + sorted_tasks.pop(0) + return make_response(jsonify(response_body), 200) descripiton_query = request.args.get("description") if descripiton_query: diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 544ab5a00..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -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 bd27fe913b4996bd61969aed6d538ba29c8d2491 Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Tue, 8 Nov 2022 10:50:48 -0500 Subject: [PATCH 07/15] added update_tasks, wave 3 passing --- app/routes.py | 66 ++++++++++++++++++++++++------------------- tests/test_wave_03.py | 25 ++++++---------- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/app/routes.py b/app/routes.py index 679c90ee3..71f23264e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,9 +1,10 @@ -import string +import datetime from app import db from app.models.task import Task from flask import Blueprint,jsonify,abort,make_response,request tasks_bp = Blueprint('tasks_bp', __name__, url_prefix='/tasks') +TASK_ID_PREFIX = '/' def validate_task(task_id): @@ -36,7 +37,7 @@ def create_task(): return make_response({"task":new_task.to_dict()}, 201) -@tasks_bp.route('/',methods=['PUT']) +@tasks_bp.route(TASK_ID_PREFIX,methods=['PUT']) def update_task(task_id): request_body = request.get_json() if "title" not in request_body or "description" not in request_body: @@ -46,26 +47,20 @@ def update_task(task_id): task = Task.query.get(task_id) task.title = request_body["title"] - # task.is_complete = request_body["is_complete"] task.description = request_body["description"] db.session.commit() return make_response({"task":task.to_dict()}, 200) -@tasks_bp.route("/", methods=["GET"]) +@tasks_bp.route(TASK_ID_PREFIX, methods=["GET"]) # GET /task/id def handle_task(task_id): # Query our db to grab the task that has the id we want: task = validate_task(task_id) task = Task.query.get(task_id) - return {"task":{ - "id": task.task_id, - "title": task.title, - "is_complete": task.is_complete, - "description": task.description} - } + return {"task": task.to_dict()} @tasks_bp.route('',methods=['GET']) @@ -89,25 +84,16 @@ def get_task(): response_body = [] if sort_query == "asc": sorted_tasks = sorted(task_titles) - while len(response_body) < len(task_titles): - for task in task_response: - if len(sorted_tasks) == 0: - break - if task["title"] == sorted_tasks[0]: - response_body.append(task) - sorted_tasks.pop(0) - return make_response(jsonify(response_body), 200) - if sort_query == "desc": sorted_tasks = sorted(task_titles, reverse=True) - while len(response_body) < len(task_titles): - for task in task_response: - if len(sorted_tasks) == 0: - break - if task["title"] == sorted_tasks[0]: - response_body.append(task) - sorted_tasks.pop(0) - return make_response(jsonify(response_body), 200) + while len(response_body) < len(task_titles): + for task in task_response: + if len(sorted_tasks) == 0: + break + if task["title"] == sorted_tasks[0]: + response_body.append(task) + sorted_tasks.pop(0) + return make_response(jsonify(response_body), 200) descripiton_query = request.args.get("description") if descripiton_query: @@ -134,7 +120,7 @@ def get_task(): return jsonify(tasks_response) -@tasks_bp.route('/',methods=['DELETE']) +@tasks_bp.route(TASK_ID_PREFIX,methods=['DELETE']) def delete_task(task_id): task = validate_task(task_id) task = Task.query.get(task_id) @@ -142,4 +128,26 @@ def delete_task(task_id): db.session.delete(task) db.session.commit() - return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) \ No newline at end of file + return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) + +@tasks_bp.route(TASK_ID_PREFIX + '/mark_complete', methods=['PATCH']) +def update_task_complete(task_id): + task = validate_task(task_id) + task = Task.query.get(task_id) + + task.is_complete = True + task.completed_at = datetime.datetime.now() + + db.session.commit() + return make_response({"task":task.to_dict()}, 200) + +@tasks_bp.route(TASK_ID_PREFIX + '/mark_incomplete', methods=['PATCH']) +def update_task_incomplete(task_id): + task = validate_task(task_id) + task = Task.query.get(task_id) + + task.is_complete = False + task.completed_at = None + + db.session.commit() + return make_response({"task":task.to_dict()}, 200) \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..746e87476 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -4,8 +4,7 @@ from app.models.task import Task 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 +41,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 +61,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 +98,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 +118,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 +126,10 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":f"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") @@ -142,8 +137,4 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":f"Task 1 not found"} From 601fd086e8ea3186373048743f758849201dbc3f Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Tue, 8 Nov 2022 12:43:58 -0500 Subject: [PATCH 08/15] goals routes completed, test wave 5 passing --- app/__init__.py | 3 ++ app/goals_routes.py | 77 +++++++++++++++++++++++++++++++++++++++++ app/models/goal.py | 18 ++++------ app/routes.py | 1 - tests/test_wave_05.py | 80 ++++++++++++++++++++----------------------- 5 files changed, 124 insertions(+), 55 deletions(-) create mode 100644 app/goals_routes.py diff --git a/app/__init__.py b/app/__init__.py index efd732a47..522c59ad6 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -33,4 +33,7 @@ def create_app(test_config=None): from .routes import tasks_bp app.register_blueprint(tasks_bp) + from .goals_routes import goals_bp + app.register_blueprint(goals_bp) + return app diff --git a/app/goals_routes.py b/app/goals_routes.py new file mode 100644 index 000000000..3e4c84a72 --- /dev/null +++ b/app/goals_routes.py @@ -0,0 +1,77 @@ +from app import db +from app.models.goal import Goal +from flask import Blueprint,jsonify,abort,make_response,request + +goals_bp = Blueprint('goals_bp', __name__, url_prefix='/goals') +GOAL_ID_PREFIX = '/' + +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except: + abort(make_response({"message":f"Goal {goal_id} invalid"}, 400)) + + goal = Goal.query.get(goal_id) + + if not goal: + abort(make_response({"message":f"Goal {goal_id} not found"}, 404)) + + return goal + +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + if "title" not in request_body: + return make_response({"details": "Invalid data"}, 400) + + new_goal = Goal(title = request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + + return make_response({"goal":new_goal.to_dict()}, 201) + +@goals_bp.route("", methods=["GET"]) +def get_goals(): + goal_query = Goal.query + goals = goal_query.all() + + goals_response = [] + for goal in goals: + goals_response.append({ + "id": goal.goal_id, + "title": goal.title, + }) + + return make_response(jsonify(goals_response), 200) +@goals_bp.route(GOAL_ID_PREFIX, methods=["GET"]) +def get_one_goal(goal_id): + goal = validate_goal(goal_id) + goal = Goal.query.get(goal_id) + + return {"goal": goal.to_dict()} + +@goals_bp.route(GOAL_ID_PREFIX,methods=['PUT']) +def update_task(goal_id): + request_body = request.get_json() + if "title" not in request_body: + return make_response("Invalid Request, Goal Must Have Title", 400) + + goal = validate_goal(goal_id) + goal = Goal.query.get(goal_id) + + goal.title = request_body["title"] + + db.session.commit() + return make_response({"goal":goal.to_dict()}, 200) + +@goals_bp.route(GOAL_ID_PREFIX, methods=['DELETE']) +def delete_goal(goal_id): + goal = validate_goal(goal_id) + goal = Goal.query.get(goal_id) + + db.session.delete(goal) + db.session.commit() + + return make_response({"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}, 200) diff --git a/app/models/goal.py b/app/models/goal.py index 27bc474a2..a1e8f669b 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,16 +2,10 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) - - - - -# def to_dict(self): -# return { -# "id": self.id, -# "name": self.name, -# "breed": self.breed, -# "age": self.age, -# "gender": self.gender -# } \ No newline at end of file + def to_dict(self): + return { + "id": self.goal_id, + "title": self.title + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 71f23264e..9923bf3a1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -7,7 +7,6 @@ TASK_ID_PREFIX = '/' def validate_task(task_id): - try: task_id = int(task_id) except: diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..a77374384 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ +from app.models.goal import Goal 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 +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,19 @@ 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") # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == {"message":f"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_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") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={"title": "My Updated New Goal"}) + 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": "My Updated New Goal" + } + } + goal = Goal.query.get(1) + assert goal.title == "My Updated New Goal" -@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") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Task Title" + }) + 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":f"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_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -121,30 +124,23 @@ def test_delete_goal(client, one_goal): } # 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*************** - # ***************************************************************** + 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") - # 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":f"Goal 1 not found"} + + assert Goal.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_goal_missing_title(client): # Act response = client.post("/goals", json={}) From bf97c99c32afe39a1407d6924d817ee487503720 Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Tue, 8 Nov 2022 12:46:01 -0500 Subject: [PATCH 09/15] clarified route files --- app/__init__.py | 2 +- app/{routes.py => tasks_routes.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/{routes.py => tasks_routes.py} (100%) diff --git a/app/__init__.py b/app/__init__.py index 522c59ad6..1a970f6ea 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import tasks_bp + from .tasks_routes import tasks_bp app.register_blueprint(tasks_bp) from .goals_routes import goals_bp diff --git a/app/routes.py b/app/tasks_routes.py similarity index 100% rename from app/routes.py rename to app/tasks_routes.py From 09302f2fc2bb7ddf0576a01b3de3982d6b95fb7b Mon Sep 17 00:00:00 2001 From: Kallie Gannon Date: Tue, 8 Nov 2022 19:59:54 -0500 Subject: [PATCH 10/15] wave_4 --- app/models/task.py | 8 ++++---- app/tasks_routes.py | 37 ++++++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 45c003693..12e30666c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,15 +5,15 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) description = db.Column(db.String) - completed_at = db.Column(db.DateTime, default=None) - is_complete = db.Column(db.Boolean, default=False) + completed_at = db.Column(db.DateTime, nullable=True) + is_completed = db.Column(db.Boolean, default=False) def to_dict(self): return { "id": self.task_id, "title": self.title, - "is_complete": self.is_complete, - "description": self.description + "description": self.description, + "is_complete": self.is_completed } diff --git a/app/tasks_routes.py b/app/tasks_routes.py index 9923bf3a1..c51af6ded 100644 --- a/app/tasks_routes.py +++ b/app/tasks_routes.py @@ -2,6 +2,10 @@ from app import db from app.models.task import Task from flask import Blueprint,jsonify,abort,make_response,request +import requests +from datetime import datetime +import os +from dotenv import load_dotenv tasks_bp = Blueprint('tasks_bp', __name__, url_prefix='/tasks') TASK_ID_PREFIX = '/' @@ -102,9 +106,9 @@ def get_task(): if title_query: task_query = task_query.filter_by(name = title_query) - is_complete_query = request.args.get("is_complete") + is_complete_query = request.args.get("is_completed") if is_complete_query: - task_query = task_query.filter_by(is_complete = is_complete_query) + task_query = task_query.filter_by(is_completed= is_complete_query) tasks = task_query.all() @@ -113,7 +117,7 @@ def get_task(): tasks_response.append({ "id": task.task_id, "title": task.title, - "is_complete": task.is_complete, + "is_complete": task.is_completed, "description": task.description }) @@ -132,20 +136,35 @@ def delete_task(task_id): @tasks_bp.route(TASK_ID_PREFIX + '/mark_complete', methods=['PATCH']) def update_task_complete(task_id): task = validate_task(task_id) - task = Task.query.get(task_id) + date_time_assign = datetime.now() + if task.is_completed == False: + task.completed_at = date_time_assign + task.is_completed = True + task_response = {"task": task.to_dict()} + db.session.commit() + load_dotenv() + + URL = "https://slack.com/api/chat.postMessage" + + payload={"channel":"slack-bot-test-channel", + "text": f"Someone just completed the task {task.title}"} + + headers = { + "Authorization": os.environ.get('SLACK_TOKEN') + } + + + requests.post(URL, data=payload, headers=headers) + return jsonify(task_response),200 - task.is_complete = True - task.completed_at = datetime.datetime.now() - db.session.commit() - return make_response({"task":task.to_dict()}, 200) @tasks_bp.route(TASK_ID_PREFIX + '/mark_incomplete', methods=['PATCH']) def update_task_incomplete(task_id): task = validate_task(task_id) task = Task.query.get(task_id) - task.is_complete = False + task.is_completed= False task.completed_at = None db.session.commit() From f4459f74aa9099497b892e6e2c2c07bd7ed2ea8f Mon Sep 17 00:00:00 2001 From: Kallie Gannon Date: Wed, 9 Nov 2022 15:42:54 -0500 Subject: [PATCH 11/15] wave6/1 --- app/goals_routes.py | 32 ++++++++++++++++++++++++++++ app/models/goal.py | 1 + app/models/task.py | 3 +++ migrations/versions/bb0889afab0d_.py | 32 ++++++++++++++++++++++++++++ tests/test_wave_06.py | 12 +++++------ 5 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 migrations/versions/bb0889afab0d_.py diff --git a/app/goals_routes.py b/app/goals_routes.py index 3e4c84a72..f5687a87a 100644 --- a/app/goals_routes.py +++ b/app/goals_routes.py @@ -1,6 +1,7 @@ from app import db from app.models.goal import Goal from flask import Blueprint,jsonify,abort,make_response,request +from app.models.task import Task goals_bp = Blueprint('goals_bp', __name__, url_prefix='/goals') GOAL_ID_PREFIX = '/' @@ -75,3 +76,34 @@ def delete_goal(goal_id): db.session.commit() return make_response({"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}, 200) + + +@goals_bp.route(GOAL_ID_PREFIX + "/tasks", methods=['GET']) + +def read_tasks (goal_id): + goal = Goal.query.get(goal_id) + + task_response = [] + for task in goal.task: + task_response.append( + { + "id": task.task_id, + "title": task.title, + "description": task.description + } + ) + return jsonify(task_response) + + +@goals_bp.route(GOAL_ID_PREFIX + "/tasks", methods=['POST']) +def create_task(goal_id): + + goal = Goal.query.get(goal_id) + request_body = request.get_json() + new_task = Task( + task_id=request_body["task_ids"]) + + db.session.add(new_task) + db.session.commit() + + return make_response(jsonify(f”id: {goal_id}, + {request_body}"), 201) \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index a1e8f669b..e22e4ac3c 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,6 +3,7 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) + tasks = db.relationship("Task", back_populates="goal") def to_dict(self): return { diff --git a/app/models/task.py b/app/models/task.py index 12e30666c..8c4e00921 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,6 +7,9 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) is_completed = db.Column(db.Boolean, default=False) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) + goal = db.relationship("Goal", back_populates="tasks") + def to_dict(self): return { diff --git a/migrations/versions/bb0889afab0d_.py b/migrations/versions/bb0889afab0d_.py new file mode 100644 index 000000000..2b1d696c4 --- /dev/null +++ b/migrations/versions/bb0889afab0d_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: bb0889afab0d +Revises: e17a9723efb9 +Create Date: 2022-11-09 15:13:22.907483 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'bb0889afab0d' +down_revision = 'e17a9723efb9' +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=True)) + 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') + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..0b0e67577 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") @@ -57,7 +57,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # ***************************************************************** -@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 +74,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 +99,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 ee050bc0f14b3520adb81b13162b9a3c002ce06c Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Wed, 9 Nov 2022 16:52:44 -0500 Subject: [PATCH 12/15] half of wave 6 passing --- app/goals_routes.py | 34 +++++++++++++++++----------------- app/models/task.py | 9 +++------ app/tasks_routes.py | 4 +--- tests/test_wave_06.py | 1 + 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/app/goals_routes.py b/app/goals_routes.py index f5687a87a..92d131fb4 100644 --- a/app/goals_routes.py +++ b/app/goals_routes.py @@ -79,31 +79,31 @@ def delete_goal(goal_id): @goals_bp.route(GOAL_ID_PREFIX + "/tasks", methods=['GET']) - def read_tasks (goal_id): + goal = validate_goal(goal_id) goal = Goal.query.get(goal_id) - task_response = [] - for task in goal.task: - task_response.append( - { - "id": task.task_id, - "title": task.title, - "description": task.description - } - ) - return jsonify(task_response) + return_body = goal.to_dict() + return_body["tasks"] = [task.to_dict() for task in goal.tasks] + return make_response(jsonify(return_body), 200) -@goals_bp.route(GOAL_ID_PREFIX + "/tasks", methods=['POST']) -def create_task(goal_id): +@goals_bp.route(GOAL_ID_PREFIX + "/tasks", methods=['POST']) +def add_tasks_to_goal(goal_id): + goal = validate_goal(goal_id) goal = Goal.query.get(goal_id) + request_body = request.get_json() - new_task = Task( - task_id=request_body["task_ids"]) + tasks_to_assign = request_body["task_ids"] + + for task in tasks_to_assign: + task.goal_id = goal.goal_id - db.session.add(new_task) db.session.commit() - return make_response(jsonify(f”id: {goal_id}, + {request_body}"), 201) \ No newline at end of file + return_body = {} + return_body["id"] = goal_id + return_body["task_ids"] = goal.tasks + + return make_response({goal.to_dict()}, 200) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 8c4e00921..a46ec6d82 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,17 +7,14 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) is_completed = db.Column(db.Boolean, default=False) - goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) + 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 { "id": self.task_id, + "goal_id": self.goal_id, "title": self.title, "description": self.description, "is_complete": self.is_completed - - } - - + } \ No newline at end of file diff --git a/app/tasks_routes.py b/app/tasks_routes.py index c51af6ded..9ad7558b1 100644 --- a/app/tasks_routes.py +++ b/app/tasks_routes.py @@ -133,7 +133,7 @@ def delete_task(task_id): return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) -@tasks_bp.route(TASK_ID_PREFIX + '/mark_complete', methods=['PATCH']) +@tasks_bp.route(TASK_ID_PREFIX + 'mark_complete', methods=['PATCH']) def update_task_complete(task_id): task = validate_task(task_id) date_time_assign = datetime.now() @@ -157,8 +157,6 @@ def update_task_complete(task_id): requests.post(URL, data=payload, headers=headers) return jsonify(task_response),200 - - @tasks_bp.route(TASK_ID_PREFIX + '/mark_incomplete', methods=['PATCH']) def update_task_incomplete(task_id): task = validate_task(task_id) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 0b0e67577..13762d2c0 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -42,6 +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") def test_get_tasks_for_specific_goal_no_goal(client): # Act From 261b2fa323845a101dea5deb7ebb75a93917533e Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Wed, 9 Nov 2022 17:00:16 -0500 Subject: [PATCH 13/15] wave 6 passed --- app/goals_routes.py | 9 +++++---- tests/test_wave_06.py | 6 +----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/goals_routes.py b/app/goals_routes.py index 92d131fb4..9ef201c13 100644 --- a/app/goals_routes.py +++ b/app/goals_routes.py @@ -97,13 +97,14 @@ def add_tasks_to_goal(goal_id): request_body = request.get_json() tasks_to_assign = request_body["task_ids"] - for task in tasks_to_assign: + for task_id in tasks_to_assign: + task = Task.query.get(task_id) task.goal_id = goal.goal_id db.session.commit() return_body = {} - return_body["id"] = goal_id - return_body["task_ids"] = goal.tasks + return_body["id"] = goal.goal_id + return_body["task_ids"] = tasks_to_assign - return make_response({goal.to_dict()}, 200) \ No newline at end of file + return make_response(return_body, 200) \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 13762d2c0..0d07316ea 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -51,11 +51,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":f"Goal 1 not found"} # @pytest.mark.skip(reason="No way to test this feature yet") From 908a61a5a014894e43b77dca9cf293dd0d6339de Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Wed, 9 Nov 2022 17:14:33 -0500 Subject: [PATCH 14/15] added procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile 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 From 9dd82c4d1c1c67440d031959b5fe7080ed393b98 Mon Sep 17 00:00:00 2001 From: Billie Betts Date: Mon, 28 Nov 2022 10:28:44 -0500 Subject: [PATCH 15/15] all tests passing --- app/goals_routes.py | 2 +- app/models/task.py | 8 ++++++++ app/tasks_routes.py | 7 +++++-- tests/test_wave_03.py | 8 ++++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/goals_routes.py b/app/goals_routes.py index 9ef201c13..5d48374f5 100644 --- a/app/goals_routes.py +++ b/app/goals_routes.py @@ -84,7 +84,7 @@ def read_tasks (goal_id): goal = Goal.query.get(goal_id) return_body = goal.to_dict() - return_body["tasks"] = [task.to_dict() for task in goal.tasks] + return_body["tasks"] = [task.to_dict_in_goal() for task in goal.tasks] return make_response(jsonify(return_body), 200) diff --git a/app/models/task.py b/app/models/task.py index a46ec6d82..a8e50cb53 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -11,6 +11,14 @@ class Task(db.Model): goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_completed + } + + def to_dict_in_goal(self): return { "id": self.task_id, "goal_id": self.goal_id, diff --git a/app/tasks_routes.py b/app/tasks_routes.py index 9ad7558b1..b294efb37 100644 --- a/app/tasks_routes.py +++ b/app/tasks_routes.py @@ -63,7 +63,10 @@ def handle_task(task_id): task = validate_task(task_id) task = Task.query.get(task_id) - return {"task": task.to_dict()} + if task.goal_id is not None: + return{"task": task.to_dict_in_goal()} + else: + return {"task": task.to_dict()} @tasks_bp.route('',methods=['GET']) @@ -133,7 +136,7 @@ def delete_task(task_id): return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) -@tasks_bp.route(TASK_ID_PREFIX + 'mark_complete', methods=['PATCH']) +@tasks_bp.route(TASK_ID_PREFIX + '/mark_complete', methods=['PATCH']) def update_task_complete(task_id): task = validate_task(task_id) date_time_assign = datetime.now() diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 746e87476..276a5fed2 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -22,8 +22,8 @@ def test_mark_complete_on_incomplete_task(client, one_task): with patch("requests.post") as mock_get: mock_get.return_value.status_code = 200 - # Act - response = client.patch("/tasks/1/mark_complete") + # Act + response = client.patch("/tasks/1/mark_complete") response_body = response.get_json() # Assert @@ -79,8 +79,8 @@ def test_mark_complete_on_completed_task(client, completed_task): with patch("requests.post") as mock_get: mock_get.return_value.status_code = 200 - # Act - response = client.patch("/tasks/1/mark_complete") + # Act + response = client.patch("/tasks/1/mark_complete") response_body = response.get_json() # Assert