From 6d442aca2b4b7e60ec58f208efa71949c21173e7 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Wed, 10 May 2023 13:44:22 -0700 Subject: [PATCH 01/14] Completed part of wave 01 --- app/__init__.py | 5 +- app/models/task.py | 33 +++++++++- app/routes.py | 78 +++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/80e0a9e7f5b2_.py | 38 +++++++++++ migrations/versions/8ad26d33569c_.py | 39 +++++++++++ tests/test_wave_01.py | 34 ++++------ 10 files changed, 367 insertions(+), 26 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/80e0a9e7f5b2_.py create mode 100644 migrations/versions/8ad26d33569c_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..53d9d4a7a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,6 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - - return app + from .routes import tasks_bp + app.register_blueprint(tasks_bp) + return app \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..8d1d8af93 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,34 @@ from app import db - +from datetime import datetime 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) + + # FROM_DICT (request) + @classmethod + def from_dict(cls, task_data): + return cls( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at") + ) + + # TASK TO_DICT (response should be a dict that is the value of key "task" in a dict) + def to_dict(self): + task_as_dict = {} + task_as_dict["id"] = self.task_id + task_as_dict["title"] = self.title + task_as_dict["description"] = self.description + task_as_dict["is_complete"] = self.completed_at != None + + return task_as_dict + + + # def make_task_dict(self): + # return dict(id=self.task_id, + # title=self.title, + # description=self.description, + # is_complete=self.completed_at != None) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 3aae38d49..b100ea7ff 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,77 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, jsonify, make_response, abort +from app import db +from app.models.task import Task + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +# VALIDATE MODEL +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + + return model + + +# CREATE TASK +@tasks_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + new_task = Task.from_dict(request_body) + + db.session.add(new_task) + db.session.commit() + + task_message = {} + task_message["task"] = new_task.to_dict() + + return jsonify(task_message), 201 + + +# GET SAVED TASKS +@tasks_bp.route("", methods=["GET"]) +def get_saved_tasks(): + tasks = Task.query.all() + tasks_list_response = [] + + for task in tasks: + tasks_list_response.append(task.to_dict()) + + return jsonify(tasks_list_response) + + +# GET ONE TASK +@tasks_bp.route("/", methods=["GET"]) +def get_one_task(task_id): + task = validate_model(Task, task_id) + + task_message = {"task": task.to_dict()} + + return jsonify(task_message) + + +# UPDATE TASK +@tasks_bp.route("/", methods=["PUT"]) +def update_task(task_id): + task = validate_model(Task, task_id) + + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + task_message = {"task": task.to_dict()} + + return jsonify(task_message) + + +# DELETE TASK 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/80e0a9e7f5b2_.py b/migrations/versions/80e0a9e7f5b2_.py new file mode 100644 index 000000000..e83161255 --- /dev/null +++ b/migrations/versions/80e0a9e7f5b2_.py @@ -0,0 +1,38 @@ +"""empty message + +Revision ID: 80e0a9e7f5b2 +Revises: 8ad26d33569c +Create Date: 2023-05-06 22:30:09.985236 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '80e0a9e7f5b2' +down_revision = '8ad26d33569c' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=False) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=True) + # ### end Alembic commands ### diff --git a/migrations/versions/8ad26d33569c_.py b/migrations/versions/8ad26d33569c_.py new file mode 100644 index 000000000..1bf4d82f2 --- /dev/null +++ b/migrations/versions/8ad26d33569c_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 8ad26d33569c +Revises: +Create Date: 2023-05-05 23:24:10.987853 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8ad26d33569c' +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/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..021d38ed0 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -13,7 +13,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -32,7 +32,7 @@ def test_get_tasks_one_saved_tasks(client, one_task): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -51,7 +51,7 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -59,14 +59,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": "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 +89,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 +115,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -130,14 +126,10 @@ def test_update_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": "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 +144,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") @@ -169,7 +161,7 @@ def test_delete_task_not_found(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -186,7 +178,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 b2301c963e9f857deb09a359f3a1512df276bd3f Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Wed, 10 May 2023 21:44:21 -0700 Subject: [PATCH 02/14] Completed wave 01 --- app/models/task.py | 9 +-------- app/routes.py | 18 +++++++++++++++++- tests/test_wave_01.py | 7 +------ tests/test_wave_02.py | 4 ++-- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 8d1d8af93..aafa9cdfe 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -24,11 +24,4 @@ def to_dict(self): task_as_dict["description"] = self.description task_as_dict["is_complete"] = self.completed_at != None - return task_as_dict - - - # def make_task_dict(self): - # return dict(id=self.task_id, - # title=self.title, - # description=self.description, - # is_complete=self.completed_at != None) \ No newline at end of file + return task_as_dict \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index b100ea7ff..76d631af3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -24,7 +24,12 @@ def validate_model(cls, model_id): def create_task(): request_body = request.get_json() - new_task = Task.from_dict(request_body) + try: + new_task = Task.from_dict(request_body) + + # if not (new_task.title and new_task.description): + except KeyError as err: + abort(make_response({"details": "Invalid data"}, 400)) db.session.add(new_task) db.session.commit() @@ -75,3 +80,14 @@ def update_task(task_id): # DELETE TASK +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = validate_model(Task, task_id) + + db.session.delete(task) + db.session.commit() + + task_message = {"details": f'Task {task.task_id} \"{task.title}\" successfully deleted'} + + return jsonify(task_message) + diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 021d38ed0..f4ce53dec 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -152,12 +152,7 @@ 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": "Task 1 not found"} assert Task.query.all() == [] 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 2297f923e62f39a7920a02d7b049a8131b479d94 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Thu, 11 May 2023 00:10:29 -0700 Subject: [PATCH 03/14] Completed wave 02 --- app/routes.py | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index 76d631af3..c00287a1e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -41,15 +41,15 @@ def create_task(): # GET SAVED TASKS -@tasks_bp.route("", methods=["GET"]) -def get_saved_tasks(): - tasks = Task.query.all() - tasks_list_response = [] +# @tasks_bp.route("", methods=["GET"]) +# def get_saved_tasks(): +# tasks = Task.query.all() +# tasks_list_response = [] - for task in tasks: - tasks_list_response.append(task.to_dict()) +# for task in tasks: +# tasks_list_response.append(task.to_dict()) - return jsonify(tasks_list_response) +# return jsonify(tasks_list_response) # GET ONE TASK @@ -91,3 +91,25 @@ def delete_task(task_id): return jsonify(task_message) + +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ WAVE 02 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Can this just replace GET SAVED TASKS??? + +# SORT TASKS BY TITLE +@tasks_bp.route("", methods=["GET"]) +def sort_by_title(): + # task_query = Task.query + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(Task.title) + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + + task_response = [task.to_dict() for task in tasks] + + return jsonify(task_response) From 02185f6c97006d278e53669d362558599d56c4f6 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Thu, 11 May 2023 11:32:08 -0700 Subject: [PATCH 04/14] Completed wave 03 --- app/__init__.py | 2 +- app/models/task.py | 2 +- app/{routes.py => task_routes.py} | 82 ++++++++++++++++++++----------- tests/test_wave_03.py | 24 +++------ 4 files changed, 62 insertions(+), 48 deletions(-) rename app/{routes.py => task_routes.py} (67%) diff --git a/app/__init__.py b/app/__init__.py index 53d9d4a7a..c41b24063 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,6 +30,6 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import tasks_bp + from .task_routes import tasks_bp app.register_blueprint(tasks_bp) return app \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index aafa9cdfe..9d7b03eb4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -24,4 +24,4 @@ def to_dict(self): task_as_dict["description"] = self.description task_as_dict["is_complete"] = self.completed_at != None - return task_as_dict \ No newline at end of file + return task_as_dict diff --git a/app/routes.py b/app/task_routes.py similarity index 67% rename from app/routes.py rename to app/task_routes.py index c00287a1e..0d4c8723e 100644 --- a/app/routes.py +++ b/app/task_routes.py @@ -1,6 +1,8 @@ -from flask import Blueprint, request, jsonify, make_response, abort +from flask import Blueprint, request, jsonify, make_response, abort from app import db from app.models.task import Task +from sqlalchemy.types import DateTime +from sqlalchemy.sql.functions import now tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -40,16 +42,21 @@ def create_task(): return jsonify(task_message), 201 -# GET SAVED TASKS -# @tasks_bp.route("", methods=["GET"]) -# def get_saved_tasks(): -# tasks = Task.query.all() -# tasks_list_response = [] - -# for task in tasks: -# tasks_list_response.append(task.to_dict()) - -# return jsonify(tasks_list_response) +# GET ALL AND SORT TASKS BY TITLE +@tasks_bp.route("", methods=["GET"]) +def sort_by_title(): + # task_query = Task.query + sort_query = request.args.get("sort") + if sort_query == "asc": + tasks = Task.query.order_by(Task.title) + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + + task_response = [task.to_dict() for task in tasks] + + return jsonify(task_response) # GET ONE TASK @@ -92,24 +99,39 @@ def delete_task(task_id): return jsonify(task_message) -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ WAVE 02 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# MARK COMPLETE ON AN INCOMPLETED TASK +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete(task_id): + task = validate_model(Task, task_id) + request_body = request.get_json() + + try: + task = Task.query.get(task_id) + task.completed_at = now() + + db.session.commit() + task_message = {"task": task.to_dict()} + return jsonify(task_message), 200 + + except: + abort(make_response({"message": f"{task_id} not found"}, 404)) + + +# MARK INCOMPLETE ON A COMPLETED TASK +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + task = validate_model(Task, task_id) + request_body = request.get_json() + + try: + task = Task.query.get(task_id) + task.completed_at = None + + db.session.commit() + task_message = {"task": task.to_dict()} + return jsonify(task_message), 200 + + except: + abort(make_response({"message": f"{task_id} not found"}, 404)) -# Can this just replace GET SAVED TASKS??? -# SORT TASKS BY TITLE -@tasks_bp.route("", methods=["GET"]) -def sort_by_title(): - # task_query = Task.query - sort_query = request.args.get("sort") - if sort_query == "asc": - tasks = Task.query.order_by(Task.title) - elif sort_query == "desc": - tasks = Task.query.order_by(Task.title.desc()) - else: - tasks = Task.query.all() - - task_response = [task.to_dict() for task in tasks] - - return jsonify(task_response) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..1f5902985 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +127,10 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "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_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +138,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": "Task 1 not found"} \ No newline at end of file From d8636c893eec3edac83b97ecc14ec43e869279a9 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Thu, 11 May 2023 20:59:26 -0700 Subject: [PATCH 05/14] Completed wave 04 --- app/__init__.py | 2 +- app/routes/helpers.py | 35 +++++++++++++++++++++++++++++++++ app/{ => routes}/task_routes.py | 25 ++++++++++++++++++----- 3 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 app/routes/helpers.py rename app/{ => routes}/task_routes.py (87%) diff --git a/app/__init__.py b/app/__init__.py index c41b24063..a9cd52b29 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,6 +30,6 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .task_routes import tasks_bp + from .routes.task_routes import tasks_bp app.register_blueprint(tasks_bp) return app \ No newline at end of file diff --git a/app/routes/helpers.py b/app/routes/helpers.py new file mode 100644 index 000000000..4caf0f0a5 --- /dev/null +++ b/app/routes/helpers.py @@ -0,0 +1,35 @@ +# from flask import abort, make_response, request +# from dotenv import load_dotenv +# load_dotenv() +# import os +# import requests + +# # VALIDATE MODEL +# def validate_model(cls, model_id): +# try: +# model_id = int(model_id) +# except: +# abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) + +# model = cls.query.get(model_id) + +# if not model: +# abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + +# return model + + +# def post_to_slack(title): +# slack_url = "https://slack.com/api/chat.postMessage" +# API_KEY = os.environ.get("API_KEY") +# headers = { +# "Authorization": f"Bearer {API_KEY}" +# } + +# data = { +# "channel": "api-test-channel", +# "text": f"Someone just completed the task {title}" +# } + +# response = request.post(slack_url, headers=headers, data=data) +# return response \ No newline at end of file diff --git a/app/task_routes.py b/app/routes/task_routes.py similarity index 87% rename from app/task_routes.py rename to app/routes/task_routes.py index 0d4c8723e..9463fbf88 100644 --- a/app/task_routes.py +++ b/app/routes/task_routes.py @@ -3,6 +3,7 @@ from app.models.task import Task from sqlalchemy.types import DateTime from sqlalchemy.sql.functions import now +import requests, os tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -20,7 +21,6 @@ def validate_model(cls, model_id): return model - # CREATE TASK @tasks_bp.route("", methods=["POST"]) def create_task(): @@ -29,7 +29,6 @@ def create_task(): try: new_task = Task.from_dict(request_body) - # if not (new_task.title and new_task.description): except KeyError as err: abort(make_response({"details": "Invalid data"}, 400)) @@ -99,7 +98,7 @@ def delete_task(task_id): return jsonify(task_message) -# MARK COMPLETE ON AN INCOMPLETED TASK +# MARK COMPLETE TASK @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_complete(task_id): task = validate_model(Task, task_id) @@ -110,6 +109,9 @@ def mark_complete(task_id): task.completed_at = now() db.session.commit() + + post_to_slack(task) + task_message = {"task": task.to_dict()} return jsonify(task_message), 200 @@ -117,11 +119,10 @@ def mark_complete(task_id): abort(make_response({"message": f"{task_id} not found"}, 404)) -# MARK INCOMPLETE ON A COMPLETED TASK +# MARK INCOMPLETE TASK @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_incomplete(task_id): task = validate_model(Task, task_id) - request_body = request.get_json() try: task = Task.query.get(task_id) @@ -135,3 +136,17 @@ def mark_incomplete(task_id): abort(make_response({"message": f"{task_id} not found"}, 404)) +def post_to_slack(task): + slack_url = "https://slack.com/api/chat.postMessage" + API_KEY = os.environ["API_KEY"] + headers = { + "Authorization": f"Bearer {API_KEY}" + } + + data = { + "channel": "api-test-channel", + "text": f"Someone just completed the task {task.title}" + } + + response = requests.post(slack_url, headers=headers, data=data) + return response \ No newline at end of file From 1376a89da70712737c75a9a1c3a616aba06c8eb8 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Thu, 11 May 2023 21:45:40 -0700 Subject: [PATCH 06/14] Updated models and cleaned up files --- app/routes/goal_routes.py | 6 ++++++ app/routes/helpers.py | 35 ----------------------------------- 2 files changed, 6 insertions(+), 35 deletions(-) create mode 100644 app/routes/goal_routes.py delete mode 100644 app/routes/helpers.py diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py new file mode 100644 index 000000000..810267f47 --- /dev/null +++ b/app/routes/goal_routes.py @@ -0,0 +1,6 @@ +from flask import Blueprint, request, jsonify, make_response, abort +from app import db +from app.models.goal import Goal + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + diff --git a/app/routes/helpers.py b/app/routes/helpers.py deleted file mode 100644 index 4caf0f0a5..000000000 --- a/app/routes/helpers.py +++ /dev/null @@ -1,35 +0,0 @@ -# from flask import abort, make_response, request -# from dotenv import load_dotenv -# load_dotenv() -# import os -# import requests - -# # VALIDATE MODEL -# def validate_model(cls, model_id): -# try: -# model_id = int(model_id) -# except: -# abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) - -# model = cls.query.get(model_id) - -# if not model: -# abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) - -# return model - - -# def post_to_slack(title): -# slack_url = "https://slack.com/api/chat.postMessage" -# API_KEY = os.environ.get("API_KEY") -# headers = { -# "Authorization": f"Bearer {API_KEY}" -# } - -# data = { -# "channel": "api-test-channel", -# "text": f"Someone just completed the task {title}" -# } - -# response = request.post(slack_url, headers=headers, data=data) -# return response \ No newline at end of file From cd9d208e69069eaf9d20b169827e6cd5fbb4f0bc Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Thu, 11 May 2023 22:59:35 -0700 Subject: [PATCH 07/14] Completed Wave 05 goal_routes and tests --- app/routes/goal_routes.py | 89 +++++++++++++++++++++++++++++++++++++++ app/routes/task_routes.py | 2 - 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 810267f47..231143aea 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -4,3 +4,92 @@ goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") +# VALIDATE MODEL +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + + return model + +# CREATE GOAL +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + try: + new_goal = Goal.from_dict(request_body) + except KeyError as err: + abort(make_response({"details": "Invalid data"}, 400)) + + db.session.add(new_goal) + db.session.commit() + + goal_message = {} + goal_message["goal"] = new_goal.to_dict() + + return jsonify(goal_message), 201 + + +# GET ALL AND SORT GOALS BY TITLE +@goals_bp.route("", methods=["GET"]) +def sort_by_title(): + sort_query = request.args.get("sort") + if sort_query == "asc": + goals = Goal.query.order_by(Goal.title) + elif sort_query == "desc": + goals = Goal.query.order_by(Goal.title.desc()) + else: + goals = Goal.query.all() + + goal_response = [goal.to_dict() for goal in goals] + + return jsonify(goal_response) + + +# GET ONE GOAL +@goals_bp.route("/", methods=["GET"]) +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + + goal_message = {"goal": goal.to_dict()} + + return jsonify(goal_message) + + +# UPDATE GOAL +@goals_bp.route("/", methods=["PUT"]) +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + + goal_message = {"goal": goal.to_dict()} + + return jsonify(goal_message) + + +# DELETE GOAL +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = validate_model(Goal, goal_id) + + db.session.delete(goal) + db.session.commit() + + goal_message = {"details": f'Goal {goal.goal_id} \"{goal.title}\" successfully deleted'} + + return jsonify(goal_message) + + + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 9463fbf88..71a7b710f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -28,7 +28,6 @@ def create_task(): try: new_task = Task.from_dict(request_body) - except KeyError as err: abort(make_response({"details": "Invalid data"}, 400)) @@ -44,7 +43,6 @@ def create_task(): # GET ALL AND SORT TASKS BY TITLE @tasks_bp.route("", methods=["GET"]) def sort_by_title(): - # task_query = Task.query sort_query = request.args.get("sort") if sort_query == "asc": tasks = Task.query.order_by(Task.title) From 33971c605d4175fed785fad69bcb58f0b48e6aa1 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Thu, 11 May 2023 23:00:34 -0700 Subject: [PATCH 08/14] "Updated migrations" --- app/__init__.py | 4 ++ app/models/goal.py | 16 ++++++ migrations/versions/dbe465946859_.py | 28 ++++++++++ tests/test_wave_01.py | 1 + tests/test_wave_05.py | 77 +++++++++++++--------------- 5 files changed, 85 insertions(+), 41 deletions(-) create mode 100644 migrations/versions/dbe465946859_.py diff --git a/app/__init__.py b/app/__init__.py index a9cd52b29..18f18e90c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -32,4 +32,8 @@ def create_app(test_config=None): # Register Blueprints here from .routes.task_routes import tasks_bp app.register_blueprint(tasks_bp) + + from .routes.goal_routes import goals_bp + app.register_blueprint(goals_bp) + return app \ No newline at end of file diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..bd48382c1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,19 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String, nullable=False) + + # FROM_DICT (request) + @classmethod + def from_dict(cls, goal_data): + return cls( + title=goal_data["title"] + ) + + # goal TO_DICT (response should be a dict that is the value of key "goal" in a dict) + def to_dict(self): + goal_as_dict = {} + goal_as_dict["id"] = self.goal_id + goal_as_dict["title"] = self.title + + return goal_as_dict \ No newline at end of file diff --git a/migrations/versions/dbe465946859_.py b/migrations/versions/dbe465946859_.py new file mode 100644 index 000000000..0d275ce9c --- /dev/null +++ b/migrations/versions/dbe465946859_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: dbe465946859 +Revises: 80e0a9e7f5b2 +Create Date: 2023-05-11 21:50:21.682552 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'dbe465946859' +down_revision = '80e0a9e7f5b2' +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_01.py b/tests/test_wave_01.py index f4ce53dec..7ac8df71b 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -141,6 +141,7 @@ def test_delete_task(client, one_task): assert response_body == { "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted' } + assert Task.query.get(1) == None diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..f5540161d 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +12,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +29,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +46,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": "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 +77,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": "Updated Goal Title" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } -@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 Goal 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": "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") @@ -123,28 +125,21 @@ 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 response_body == {'details': 'Goal 1 "Build a habit of going outside daily" successfully deleted'} -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From 02204b7e1392881a4655b0c1e7f6089d604582c1 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Sat, 13 May 2023 15:11:11 -0700 Subject: [PATCH 09/14] Completed wave 06 requirements --- app/__init__.py | 2 -- app/models/goal.py | 26 ++++++++------- app/models/task.py | 35 ++++++++++---------- app/routes/goal_routes.py | 48 +++++++++++++++++++++------- migrations/versions/61ca531a0e30_.py | 30 +++++++++++++++++ tests/test_wave_05.py | 1 - tests/test_wave_06.py | 18 ++++------- 7 files changed, 107 insertions(+), 53 deletions(-) create mode 100644 migrations/versions/61ca531a0e30_.py diff --git a/app/__init__.py b/app/__init__.py index 18f18e90c..2133571f0 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,14 +22,12 @@ 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) - # Register Blueprints here from .routes.task_routes import tasks_bp app.register_blueprint(tasks_bp) diff --git a/app/models/goal.py b/app/models/goal.py index bd48382c1..9c0bffa55 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,18 +4,20 @@ 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) - # FROM_DICT (request) - @classmethod - def from_dict(cls, goal_data): - return cls( - title=goal_data["title"] - ) + 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] - # goal TO_DICT (response should be a dict that is the value of key "goal" in a dict) - def to_dict(self): - goal_as_dict = {} - goal_as_dict["id"] = self.goal_id - goal_as_dict["title"] = self.title + return goal_dict - return goal_as_dict \ No newline at end of file + @classmethod + def from_dict(cls, goal_dict): + return Goal( + title=goal_dict["title"] + ) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 9d7b03eb4..b99c6afd4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,22 +6,25 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) + goal = db.relationship("Goal", back_populates="tasks") + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) - # FROM_DICT (request) - @classmethod - def from_dict(cls, task_data): - return cls( - title=task_data["title"], - description=task_data["description"], - completed_at=task_data.get("completed_at") - ) - - # TASK TO_DICT (response should be a dict that is the value of key "task" in a dict) def to_dict(self): - task_as_dict = {} - task_as_dict["id"] = self.task_id - task_as_dict["title"] = self.title - task_as_dict["description"] = self.description - task_as_dict["is_complete"] = self.completed_at != None + task_dict = {} + task_dict["id"] = self.task_id + task_dict["title"] = self.title + task_dict["description"] = self.description + task_dict["is_complete"] = self.completed_at != None + + if self.goal_id: + task_dict["goal_id"] = self.goal_id - return task_as_dict + return task_dict + + @classmethod + def from_dict(cls, task_dict): + return cls( + title=task_dict["title"], + description=task_dict["description"], + completed_at=task_dict.get("completed_at") + ) \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 231143aea..fe7021f5f 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,6 +1,7 @@ -from flask import Blueprint, request, jsonify, make_response, abort from app import db from app.models.goal import Goal +from app.models.task import Task +from flask import Blueprint, request, jsonify, make_response, abort goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @@ -31,10 +32,10 @@ def create_goal(): db.session.add(new_goal) db.session.commit() - goal_message = {} - goal_message["goal"] = new_goal.to_dict() + goal_dict = {} + goal_dict["goal"] = new_goal.to_dict() - return jsonify(goal_message), 201 + return jsonify(goal_dict), 201 # GET ALL AND SORT GOALS BY TITLE @@ -57,26 +58,24 @@ def sort_by_title(): @goals_bp.route("/", methods=["GET"]) def get_one_goal(goal_id): goal = validate_model(Goal, goal_id) + goal_dict = {"goal": goal.to_dict()} - goal_message = {"goal": goal.to_dict()} - - return jsonify(goal_message) + return jsonify(goal_dict) # UPDATE GOAL @goals_bp.route("/", methods=["PUT"]) def update_goal(goal_id): goal = validate_model(Goal, goal_id) - + request_body = request.get_json() - goal.title = request_body["title"] db.session.commit() - goal_message = {"goal": goal.to_dict()} + goal_dict = {"goal": goal.to_dict()} - return jsonify(goal_message) + return jsonify(goal_dict) # DELETE GOAL @@ -92,4 +91,31 @@ def delete_goal(goal_id): return jsonify(goal_message) +# GET GOAL AND TASKS +@goals_bp.route("//tasks", methods=["GET"]) +def get_all_tasks_for_goal(goal_id): + goal = validate_model(Goal, goal_id) + goal_response = goal.to_dict(tasks=True) + return make_response(goal_response), 200 + + +# POST GOAL AND TASKS +@goals_bp.route("//tasks", methods=["POST"]) +def post_tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + task_ids = request_body["task_ids"] + + for task in goal.tasks: + task.goal_id = None + + + for task_id in task_ids: + task = validate_model(Task, task_id) + task.goal_id = goal.goal_id + + goal.title = request.args.get("title", goal.title) + + db.session.commit() + return make_response({"id": goal.goal_id, "task_ids": task_ids}, 200) \ No newline at end of file diff --git a/migrations/versions/61ca531a0e30_.py b/migrations/versions/61ca531a0e30_.py new file mode 100644 index 000000000..739080d4c --- /dev/null +++ b/migrations/versions/61ca531a0e30_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 61ca531a0e30 +Revises: dbe465946859 +Create Date: 2023-05-11 23:40:05.161037 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '61ca531a0e30' +down_revision = 'dbe465946859' +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_05.py b/tests/test_wave_05.py index f5540161d..f826c4f26 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -57,7 +57,6 @@ def test_get_goal_not_found(client): assert response_body == {"message": "Goal 1 not found"} - # @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..b2286c8ef 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -50,14 +50,10 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Goal 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_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +70,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 +95,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 6be68e7ce3211215c140b39c52c6614fa917c3a4 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Sun, 14 May 2023 23:38:59 -0700 Subject: [PATCH 10/14] "Cleaned up comments" --- app/routes/goal_routes.py | 10 ++-------- app/routes/task_routes.py | 9 +-------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index fe7021f5f..4dfacaeed 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -5,7 +5,7 @@ goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") -# VALIDATE MODEL + def validate_model(cls, model_id): try: model_id = int(model_id) @@ -19,7 +19,7 @@ def validate_model(cls, model_id): return model -# CREATE GOAL + @goals_bp.route("", methods=["POST"]) def create_goal(): request_body = request.get_json() @@ -38,7 +38,6 @@ def create_goal(): return jsonify(goal_dict), 201 -# GET ALL AND SORT GOALS BY TITLE @goals_bp.route("", methods=["GET"]) def sort_by_title(): sort_query = request.args.get("sort") @@ -54,7 +53,6 @@ def sort_by_title(): return jsonify(goal_response) -# GET ONE GOAL @goals_bp.route("/", methods=["GET"]) def get_one_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -63,7 +61,6 @@ def get_one_goal(goal_id): return jsonify(goal_dict) -# UPDATE GOAL @goals_bp.route("/", methods=["PUT"]) def update_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -78,7 +75,6 @@ def update_goal(goal_id): return jsonify(goal_dict) -# DELETE GOAL @goals_bp.route("/", methods=["DELETE"]) def delete_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -91,7 +87,6 @@ def delete_goal(goal_id): return jsonify(goal_message) -# GET GOAL AND TASKS @goals_bp.route("//tasks", methods=["GET"]) def get_all_tasks_for_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -99,7 +94,6 @@ def get_all_tasks_for_goal(goal_id): return make_response(goal_response), 200 -# POST GOAL AND TASKS @goals_bp.route("//tasks", methods=["POST"]) def post_tasks_to_goal(goal_id): goal = validate_model(Goal, goal_id) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 71a7b710f..dbb4f0282 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -7,7 +7,6 @@ tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") -# VALIDATE MODEL def validate_model(cls, model_id): try: model_id = int(model_id) @@ -21,7 +20,7 @@ def validate_model(cls, model_id): return model -# CREATE TASK + @tasks_bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() @@ -40,7 +39,6 @@ def create_task(): return jsonify(task_message), 201 -# GET ALL AND SORT TASKS BY TITLE @tasks_bp.route("", methods=["GET"]) def sort_by_title(): sort_query = request.args.get("sort") @@ -56,7 +54,6 @@ def sort_by_title(): return jsonify(task_response) -# GET ONE TASK @tasks_bp.route("/", methods=["GET"]) def get_one_task(task_id): task = validate_model(Task, task_id) @@ -66,7 +63,6 @@ def get_one_task(task_id): return jsonify(task_message) -# UPDATE TASK @tasks_bp.route("/", methods=["PUT"]) def update_task(task_id): task = validate_model(Task, task_id) @@ -83,7 +79,6 @@ def update_task(task_id): return jsonify(task_message) -# DELETE TASK @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): task = validate_model(Task, task_id) @@ -96,7 +91,6 @@ def delete_task(task_id): return jsonify(task_message) -# MARK COMPLETE TASK @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_complete(task_id): task = validate_model(Task, task_id) @@ -117,7 +111,6 @@ def mark_complete(task_id): abort(make_response({"message": f"{task_id} not found"}, 404)) -# MARK INCOMPLETE TASK @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_incomplete(task_id): task = validate_model(Task, task_id) From bd82091cfa6f79c6bffe2c0a4f6fecfd33ba7df6 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Mon, 15 May 2023 00:10:26 -0700 Subject: [PATCH 11/14] Updates to deploy on Render --- app/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2133571f0..e7eaf4cf9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,13 +14,14 @@ def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + if test_config is None: app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + "RENDER_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + "RENDER_DATABASE_URI") from app.models.task import Task from app.models.goal import Goal From 83ce76b427accd266d983cb257556b891d77938a Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Mon, 15 May 2023 00:28:14 -0700 Subject: [PATCH 12/14] Undid Render updates due to error --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index e7eaf4cf9..6de12c372 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -17,11 +17,11 @@ def create_app(test_config=None): if test_config is None: app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "RENDER_DATABASE_URI") + "SQLALCHEMY_TEST_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "RENDER_DATABASE_URI") + "SQLALCHEMY_TEST_DATABASE_URI") from app.models.task import Task from app.models.goal import Goal From c1459ce2841aaa266dcf5c65dc0007799c5b94ad Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Mon, 15 May 2023 00:40:23 -0700 Subject: [PATCH 13/14] Updated __init__ --- app/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 6de12c372..7d637b040 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,8 +16,9 @@ def create_app(test_config=None): if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get("RENDER_DATABASE_URI") + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_TEST_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( From ba96899a3429339ba32eacbe9e83bc3795ce66b1 Mon Sep 17 00:00:00 2001 From: Erina Perez Date: Mon, 15 May 2023 15:18:51 -0700 Subject: [PATCH 14/14] Fixed errors in routes complete_task, post_to_slack, mark_complete. Tests passing. --- app/routes/task_routes.py | 17 +++++------ migrations/versions/8f674c9f730d_.py | 42 ++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 migrations/versions/8f674c9f730d_.py diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index dbb4f0282..c9084421c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, request, jsonify, make_response, abort from app import db from app.models.task import Task +from datetime import datetime from sqlalchemy.types import DateTime from sqlalchemy.sql.functions import now import requests, os @@ -94,18 +95,16 @@ def delete_task(task_id): @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_complete(task_id): task = validate_model(Task, task_id) - request_body = request.get_json() try: task = Task.query.get(task_id) - task.completed_at = now() + task.completed_at = datetime.now() - db.session.commit() + task_message = {"task": task.to_dict()} + db.session.commit() post_to_slack(task) - - task_message = {"task": task.to_dict()} - return jsonify(task_message), 200 + return make_response(jsonify(task_message), 200) except: abort(make_response({"message": f"{task_id} not found"}, 404)) @@ -129,10 +128,8 @@ def mark_incomplete(task_id): def post_to_slack(task): slack_url = "https://slack.com/api/chat.postMessage" - API_KEY = os.environ["API_KEY"] - headers = { - "Authorization": f"Bearer {API_KEY}" - } + token = os.environ.get("SLACK_BOT_TOKEN") + headers = {"Authorization": f"Bearer {token}"} data = { "channel": "api-test-channel", diff --git a/migrations/versions/8f674c9f730d_.py b/migrations/versions/8f674c9f730d_.py new file mode 100644 index 000000000..bec75a9f3 --- /dev/null +++ b/migrations/versions/8f674c9f730d_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 8f674c9f730d +Revises: 61ca531a0e30 +Create Date: 2023-05-15 15:12:36.689185 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8f674c9f730d' +down_revision = '61ca531a0e30' +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.Column('title', sa.String(), 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.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ), + 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 ###