From ecc97c8327a676ad7eda8ef938a7ad49c1dc9e97 Mon Sep 17 00:00:00 2001 From: cathos Date: Tue, 10 May 2022 21:50:45 -0700 Subject: [PATCH 01/10] started wave 1, created heroku Procfile --- Procfile | 1 + app/__init__.py | 2 + app/models/task.py | 15 ++++- app/routes.py | 37 ++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/5096a76ba403_.py | 39 +++++++++++ 9 files changed, 258 insertions(+), 2 deletions(-) create mode 100644 Procfile 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/5096a76ba403_.py diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..d37f13a47 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn app:create_app() diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..30052751d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -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/task.py b/app/models/task.py index c91ab281f..aed5e41d8 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +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) + + def to_dict(self): + return { + "task": { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 3aae38d49..41a2dee10 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,36 @@ -from flask import Blueprint \ No newline at end of file +from xmlrpc.client import boolean +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() + new_task = Task( + title=request_body["title"], + description=request_body["description"] + ) + + db.session.add(new_task) + db.session.commit() + db.session.expire(new_task) + + return make_response(new_task.to_dict(), 201) + +@tasks_bp.route("", methods=["GET"]) +def read_all_tasks(): + + tasks = Task.query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append( + { + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at) + } + ) + return jsonify(tasks_response) \ 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/5096a76ba403_.py b/migrations/versions/5096a76ba403_.py new file mode 100644 index 000000000..4fe648c49 --- /dev/null +++ b/migrations/versions/5096a76ba403_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 5096a76ba403 +Revises: +Create Date: 2022-05-09 18:55:48.217609 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5096a76ba403' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=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 ### From fd458f0bbdb9ddcae2207938c277e2205a1a8e85 Mon Sep 17 00:00:00 2001 From: cathos Date: Wed, 11 May 2022 17:02:53 -0700 Subject: [PATCH 02/10] passed wave 1 tests --- app/models/task.py | 26 +++++--- app/routes.py | 95 ++++++++++++++++++++++------ migrations/versions/8a6cc2fcd4f0_.py | 38 +++++++++++ tests/test_wave_01.py | 44 +++++-------- 4 files changed, 148 insertions(+), 55 deletions(-) create mode 100644 migrations/versions/8a6cc2fcd4f0_.py diff --git a/app/models/task.py b/app/models/task.py index aed5e41d8..5d6bfc36b 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,18 +1,26 @@ from app import db - 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) + title = db.Column(db.String, nullable = False) + description = db.Column(db.String, nullable = False) completed_at = db.Column(db.DateTime) def to_dict(self): return { - "task": { - "id": self.task_id, - "title": self.title, - "description": self.description, - "is_complete": bool(self.completed_at) + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) } - } \ No newline at end of file + + ## previous version + # return { + # "task": { + # "id": self.task_id, + # "title": self.title, + # "description": self.description, + # "is_complete": bool(self.completed_at) + # } + # } + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 41a2dee10..d19d5ecf6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,3 +1,4 @@ +from datetime import datetime from xmlrpc.client import boolean from app import db from app.models.task import Task @@ -5,32 +6,88 @@ tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +def validate(input_id): + try: + int_id = int(input_id) + except: + abort(make_response({"message":f"Task {input_id} invalid"}, 400)) + task = Task.query.get(int_id) + if not task: + abort(make_response({"message":f"Task {int_id} not found"}, 404)) + return task + @tasks_bp.route("", methods=["POST"]) def create_task(): - request_body = request.get_json() - new_task = Task( - title=request_body["title"], - description=request_body["description"] - ) + try: + request_body = request.get_json() + new_task = Task( + title=request_body["title"], + description=request_body["description"] + ) - db.session.add(new_task) - db.session.commit() - db.session.expire(new_task) - - return make_response(new_task.to_dict(), 201) + ##try these instead of using expire: + #return make_response({ + # "task": new_task.to_dict() + # }, 201) + # return { + # "task": new_task.to_json() + # }, 200 + + db.session.add(new_task) + db.session.commit() + db.session.expire(new_task) + + return make_response(jsonify({"task":new_task.to_dict()}), 201) + + except KeyError: + return make_response(jsonify({"details":"Invalid data"}), 400) @tasks_bp.route("", methods=["GET"]) def read_all_tasks(): - tasks = Task.query.all() tasks_response = [] for task in tasks: - tasks_response.append( - { - "title": task.title, - "description": task.description, - "is_complete": bool(task.completed_at) - } - ) - return jsonify(tasks_response) \ No newline at end of file + tasks_response.append(task.to_dict()) + + return make_response(jsonify(tasks_response), 200) + +@tasks_bp.route("/", methods=["GET"]) +def read_one_task(task_id): + task = validate(task_id) + + return make_response(jsonify({"task":task.to_dict()}), 200) + +@tasks_bp.route("/", methods=["PUT"]) +def update_one_task(task_id): + task = validate(task_id) + request_body = request.get_json() + request_body_keys = request_body.keys() + + if "title" in request_body_keys: + task.title = request_body["title"] + if "description" in request_body_keys: + task.description = request_body["description"] + if "completed_at" in request_body_keys: + task.completed_at = request_body["completed_at"] + elif "is_complete" in request_body_keys: + if request_body["is_complete"] == True: + task.completed_at = datetime.utcnow() + elif request_body["is_complete"] == False: + task.completed_at = None + + db.session.commit() + db.session.expire(task) + + return make_response(jsonify({"task":task.to_dict()}), 200) + +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = validate(task_id) + + response = {"details":f"Task {task.task_id} \"{task.title}\" successfully deleted"} +# "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted' + db.session.delete(task) + db.session.commit() + + return make_response(jsonify(response), 200) \ No newline at end of file diff --git a/migrations/versions/8a6cc2fcd4f0_.py b/migrations/versions/8a6cc2fcd4f0_.py new file mode 100644 index 000000000..173d4e0ec --- /dev/null +++ b/migrations/versions/8a6cc2fcd4f0_.py @@ -0,0 +1,38 @@ +"""empty message + +Revision ID: 8a6cc2fcd4f0 +Revises: 5096a76ba403 +Create Date: 2022-05-11 14:44:32.816656 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8a6cc2fcd4f0' +down_revision = '5096a76ba403' +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/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..93c843351 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,11 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task 1 not found"} + # added above assertion - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +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={ @@ -119,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={ @@ -130,14 +127,11 @@ 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"} + # added above assertion -@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 +146,7 @@ def test_delete_task(client, one_task): assert Task.query.get(1) == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -160,16 +154,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": "Task 1 not found"} + # added above assertion 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 +176,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 5a2d5f0ad0d8944b7a84a48b50863c2eae5f7c41 Mon Sep 17 00:00:00 2001 From: cathos Date: Wed, 11 May 2022 19:49:38 -0700 Subject: [PATCH 03/10] messing with heroku deployment create_app --- app/__init__.py | 2 ++ app/models/task.py | 5 +++++ app/routes.py | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 30052751d..cf206177b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -11,7 +11,9 @@ def create_app(test_config=None): + print('foobar') app = Flask(__name__) + print('after foobar') app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: diff --git a/app/models/task.py b/app/models/task.py index 5d6bfc36b..934646c7d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -13,6 +13,11 @@ def to_dict(self): "description": self.description, "is_complete": bool(self.completed_at) } + + def single_dict(self): + return { + "task":self.to_dict() + } ## previous version # return { diff --git a/app/routes.py b/app/routes.py index d19d5ecf6..56fec7120 100644 --- a/app/routes.py +++ b/app/routes.py @@ -37,7 +37,7 @@ def create_task(): db.session.commit() db.session.expire(new_task) - return make_response(jsonify({"task":new_task.to_dict()}), 201) + return make_response(jsonify(new_task.single_dict()), 201) except KeyError: return make_response(jsonify({"details":"Invalid data"}), 400) @@ -56,7 +56,7 @@ def read_all_tasks(): def read_one_task(task_id): task = validate(task_id) - return make_response(jsonify({"task":task.to_dict()}), 200) + return make_response(jsonify(task.single_dict()), 200) @tasks_bp.route("/", methods=["PUT"]) def update_one_task(task_id): @@ -79,7 +79,7 @@ def update_one_task(task_id): db.session.commit() db.session.expire(task) - return make_response(jsonify({"task":task.to_dict()}), 200) + return make_response(jsonify(task.single_dict()), 200) @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): From cbada7944b550bbbfc615d7680a5d7d7c2adca97 Mon Sep 17 00:00:00 2001 From: cathos Date: Wed, 11 May 2022 19:58:16 -0700 Subject: [PATCH 04/10] messing with heroku deployment create_app, fixed procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index d37f13a47..62e430aca 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn app:create_app() +web: gunicorn 'app:create_app()' \ No newline at end of file From 0dd5277c910118bdc3ce12b8fe822a258d376957 Mon Sep 17 00:00:00 2001 From: cathos Date: Wed, 11 May 2022 20:48:42 -0700 Subject: [PATCH 05/10] added ascending and descending GET queries, passed wave 2 tests --- app/__init__.py | 2 -- app/routes.py | 22 +++++++++++++++++++++- tests/test_wave_02.py | 4 ++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index cf206177b..30052751d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -11,9 +11,7 @@ def create_app(test_config=None): - print('foobar') app = Flask(__name__) - print('after foobar') app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: diff --git a/app/routes.py b/app/routes.py index 56fec7120..310362e78 100644 --- a/app/routes.py +++ b/app/routes.py @@ -44,7 +44,27 @@ def create_task(): @tasks_bp.route("", methods=["GET"]) def read_all_tasks(): - tasks = Task.query.all() + # # from planets api: + # name_query = request.args.get("name") + # description_query = request.args.get("description") + # order_from_sun_query = request.args.get("order_from_sun") + # if name_query: + # planets = Planet.query.filter_by(name=name_query) + # elif description_query: + # planets = Planet.query.filter(Planet.description.ilike("%" + description_query + "%")) + # elif order_from_sun_query: + # planets = Planet.query.filter_by(order_from_sun =order_from_sun_query) + # else: + # planets = Planet.query.all() + sort_query = request.args.get("sort") + + if sort_query in ("asc","desc") : + if sort_query == "asc": + tasks = Task.query.order_by(Task.title).all() + else: + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.all() tasks_response = [] for task in tasks: 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 afca73942ec5b88930ab20df70c44620778782fb Mon Sep 17 00:00:00 2001 From: cathos Date: Wed, 11 May 2022 22:04:03 -0700 Subject: [PATCH 06/10] completed wave 3 tests and added additional query parameters for GET requests --- app/routes.py | 50 +++++++++++++++++++++++++++++-------------- tests/test_wave_03.py | 24 ++++++++++----------- 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/app/routes.py b/app/routes.py index 310362e78..16d87558c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -24,6 +24,9 @@ def create_task(): title=request_body["title"], description=request_body["description"] ) + + if "completed_at" in request_body: + new_task.completed_at = request_body["completed_at"] ##try these instead of using expire: #return make_response({ @@ -35,7 +38,7 @@ def create_task(): db.session.add(new_task) db.session.commit() - db.session.expire(new_task) + # db.session.expire(new_task) return make_response(jsonify(new_task.single_dict()), 201) @@ -44,21 +47,20 @@ def create_task(): @tasks_bp.route("", methods=["GET"]) def read_all_tasks(): - # # from planets api: - # name_query = request.args.get("name") - # description_query = request.args.get("description") - # order_from_sun_query = request.args.get("order_from_sun") - # if name_query: - # planets = Planet.query.filter_by(name=name_query) - # elif description_query: - # planets = Planet.query.filter(Planet.description.ilike("%" + description_query + "%")) - # elif order_from_sun_query: - # planets = Planet.query.filter_by(order_from_sun =order_from_sun_query) - # else: - # planets = Planet.query.all() sort_query = request.args.get("sort") - - if sort_query in ("asc","desc") : + title_query = request.args.get("title") + description_query = request.args.get("description") + completed_query = request.args.get("is_complete") + + if title_query: + tasks = Task.query.filter(Task.title.ilike("%" + title_query + "%")) + elif description_query: + tasks = Task.query.filter(Task.description.ilike("%" + description_query + "%")) + elif completed_query == "false": + tasks = Task.query.filter(Task.completed_at == None) + elif completed_query == "true": + tasks = Task.query.filter(Task.completed_at != None) + elif sort_query in ("asc","desc"): if sort_query == "asc": tasks = Task.query.order_by(Task.title).all() else: @@ -97,10 +99,26 @@ def update_one_task(task_id): task.completed_at = None db.session.commit() - db.session.expire(task) + # db.session.expire(task) return make_response(jsonify(task.single_dict()), 200) +@tasks_bp.route("//", methods=["PATCH"]) +def task_completion(task_id, mark_completion): + task = validate(task_id) + request_body = request.get_json() + + if mark_completion == "mark_complete": + task.completed_at = datetime.utcnow() + elif mark_completion == "mark_incomplete": + task.completed_at = None + else: + abort(make_response({"message":f"please use mark_complete or mark_incomplete"}, 404)) + + db.session.commit() + return make_response(jsonify(task.single_dict()), 200) + + @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): task = validate(task_id) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 959176ceb..66a95ca52 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,14 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body == {"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 +142,8 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body == {"message":"Task 1 not found"} + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -151,7 +151,7 @@ def test_mark_incomplete_missing_task(client): # Let's add this test for creating tasks, now that # the completion functionality has been implemented -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_with_valid_completed_at(client): # Act response = client.post("/tasks", json={ @@ -181,7 +181,7 @@ def test_create_task_with_valid_completed_at(client): # Let's add this test for updating tasks, now that # the completion functionality has been implemented -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_with_completed_at_date(client, completed_task): # Act response = client.put("/tasks/1", json={ From cca99533b964613360282fbf12ccdae97bc68d18 Mon Sep 17 00:00:00 2001 From: cathos Date: Thu, 12 May 2022 11:35:52 -0700 Subject: [PATCH 07/10] added slack integration, passed wave 4 --- app/routes.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/routes.py b/app/routes.py index 16d87558c..8a165597a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,8 +1,14 @@ from datetime import datetime from xmlrpc.client import boolean + +from dotenv import load_dotenv +import requests from app import db from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request +import os + +load_dotenv() tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -16,6 +22,26 @@ def validate(input_id): abort(make_response({"message":f"Task {int_id} not found"}, 404)) return task +def send_slack_message(task, message): + ''' + if message = completed, send slack message that task has been completed: + "Someone just completed the task {task.title}" + if message = incomplete, send slack message that task has been marked incomplete. + "The task {task.title} sent: {}" + ''' + if message == "completed": + send_message = f"Someone just completed the task {task.title}" + else: + send_message = f"The task {task.title} sent: {message}" + + + url = os.environ.get("SLACK_POST_URL")+send_message + header_authorization = "Bearer "+os.environ.get("SLACK_AUTH_KEY") + headers = {'Authorization': header_authorization} + requests.post(url, headers=headers) + return + + @tasks_bp.route("", methods=["POST"]) def create_task(): try: @@ -95,8 +121,10 @@ def update_one_task(task_id): elif "is_complete" in request_body_keys: if request_body["is_complete"] == True: task.completed_at = datetime.utcnow() + send_slack_message(task, "completed") elif request_body["is_complete"] == False: task.completed_at = None + send_slack_message(task, "marked incomplete") db.session.commit() # db.session.expire(task) @@ -110,8 +138,10 @@ def task_completion(task_id, mark_completion): if mark_completion == "mark_complete": task.completed_at = datetime.utcnow() + send_slack_message(task, "completed") elif mark_completion == "mark_incomplete": task.completed_at = None + send_slack_message(task, "marked incomplete") else: abort(make_response({"message":f"please use mark_complete or mark_incomplete"}, 404)) From 08056399a84d30c7a56a556efb69f7066a490f67 Mon Sep 17 00:00:00 2001 From: cathos Date: Thu, 12 May 2022 13:17:53 -0700 Subject: [PATCH 08/10] finished wave 5, added goals endpoints --- app/__init__.py | 3 +- app/models/goal.py | 14 +- app/models/task.py | 9 -- app/routes.py | 144 ++++++++++++++---- .../e8280f1bcb10_modified_goal_columns.py | 28 ++++ tests/test_wave_05.py | 81 +++++----- 6 files changed, 198 insertions(+), 81 deletions(-) create mode 100644 migrations/versions/e8280f1bcb10_modified_goal_columns.py diff --git a/app/__init__.py b/app/__init__.py index 30052751d..d88bb54c4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,8 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import tasks_bp + from .routes import tasks_bp, goals_bp app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..783a5faeb 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -2,4 +2,16 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String, nullable = False) + + def to_dict(self): + return { + "id": self.goal_id, + "title": self.title, + } + + def single_dict(self): + return { + "goal":self.to_dict() + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 934646c7d..e1c320995 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -19,13 +19,4 @@ def single_dict(self): "task":self.to_dict() } - ## previous version - # return { - # "task": { - # "id": self.task_id, - # "title": self.title, - # "description": self.description, - # "is_complete": bool(self.completed_at) - # } - # } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8a165597a..2fbec9210 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,33 +1,20 @@ from datetime import datetime -from xmlrpc.client import boolean - from dotenv import load_dotenv import requests from app import db from app.models.task import Task +from app.models.goal import Goal from flask import Blueprint, jsonify, abort, make_response, request import os load_dotenv() tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") - -def validate(input_id): - try: - int_id = int(input_id) - except: - abort(make_response({"message":f"Task {input_id} invalid"}, 400)) - task = Task.query.get(int_id) - if not task: - abort(make_response({"message":f"Task {int_id} not found"}, 404)) - return task +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") def send_slack_message(task, message): ''' - if message = completed, send slack message that task has been completed: - "Someone just completed the task {task.title}" - if message = incomplete, send slack message that task has been marked incomplete. - "The task {task.title} sent: {}" + send slack message with task information - use when marking tasks complete/incomplete ''' if message == "completed": send_message = f"Someone just completed the task {task.title}" @@ -42,6 +29,20 @@ def send_slack_message(task, message): return +## Task Validation & Routes + + +def validate_tasks(input_id): + try: + int_id = int(input_id) + except: + abort(make_response({"message":f"Task {input_id} invalid"}, 400)) + task = Task.query.get(int_id) + if not task: + abort(make_response({"message":f"Task {int_id} not found"}, 404)) + return task + + @tasks_bp.route("", methods=["POST"]) def create_task(): try: @@ -54,14 +55,6 @@ def create_task(): if "completed_at" in request_body: new_task.completed_at = request_body["completed_at"] - ##try these instead of using expire: - #return make_response({ - # "task": new_task.to_dict() - # }, 201) - # return { - # "task": new_task.to_json() - # }, 200 - db.session.add(new_task) db.session.commit() # db.session.expire(new_task) @@ -102,13 +95,13 @@ def read_all_tasks(): @tasks_bp.route("/", methods=["GET"]) def read_one_task(task_id): - task = validate(task_id) + task = validate_tasks(task_id) return make_response(jsonify(task.single_dict()), 200) @tasks_bp.route("/", methods=["PUT"]) def update_one_task(task_id): - task = validate(task_id) + task = validate_tasks(task_id) request_body = request.get_json() request_body_keys = request_body.keys() @@ -133,8 +126,7 @@ def update_one_task(task_id): @tasks_bp.route("//", methods=["PATCH"]) def task_completion(task_id, mark_completion): - task = validate(task_id) - request_body = request.get_json() + task = validate_tasks(task_id) if mark_completion == "mark_complete": task.completed_at = datetime.utcnow() @@ -151,11 +143,103 @@ def task_completion(task_id, mark_completion): @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): - task = validate(task_id) + task = validate_tasks(task_id) response = {"details":f"Task {task.task_id} \"{task.title}\" successfully deleted"} -# "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted' + db.session.delete(task) db.session.commit() + return make_response(jsonify(response), 200) + +## Goal Validation & Routes: + + +def validate_goals(input_id): + try: + int_id = int(input_id) + except: + abort(make_response({"message":f"Goal {input_id} invalid"}, 400)) + goal = Goal.query.get(int_id) + if not goal: + abort(make_response({"message":f"Goal {int_id} not found"}, 404)) + return goal + + +@goals_bp.route("", methods=["GET"]) +def read_all_goals(): + # sort_query = request.args.get("sort") + # title_query = request.args.get("title") + + # if title_query: + # tasks = Task.query.filter(Task.title.ilike("%" + title_query + "%")) + # elif description_query: + # tasks = Task.query.filter(Task.description.ilike("%" + description_query + "%")) + # elif completed_query == "false": + # tasks = Task.query.filter(Task.completed_at == None) + # elif completed_query == "true": + # tasks = Task.query.filter(Task.completed_at != None) + # elif sort_query in ("asc","desc"): + # if sort_query == "asc": + # tasks = Task.query.order_by(Task.title).all() + # else: + # tasks = Task.query.order_by(Task.title.desc()).all() + # else: + + goals = Goal.query.all() + + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict()) + + return make_response(jsonify(goals_response), 200) + + +@goals_bp.route("/", methods=["GET"]) +def read_one_goal(goal_id): + goal = validate_goals(goal_id) + + return make_response(jsonify(goal.single_dict()), 200) + + +@goals_bp.route("", methods=["POST"]) +def create_goal(): + try: + request_body = request.get_json() + new_goal = Goal( + title=request_body["title"] + ) + + db.session.add(new_goal) + db.session.commit() + + return make_response(jsonify(new_goal.single_dict()), 201) + + except KeyError: + return make_response(jsonify({"details":"Invalid data"}), 400) + + +@goals_bp.route("/", methods=["PUT"]) +def update_one_goal(goal_id): + goal = validate_goals(goal_id) + request_body = request.get_json() + request_body_keys = request_body.keys() + + if "title" in request_body_keys: + goal.title = request_body["title"] + + db.session.commit() + + return make_response(jsonify(goal.single_dict()), 200) + + +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = validate_goals(goal_id) + + response = {"details":f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"} + + db.session.delete(goal) + db.session.commit() + return make_response(jsonify(response), 200) \ No newline at end of file diff --git a/migrations/versions/e8280f1bcb10_modified_goal_columns.py b/migrations/versions/e8280f1bcb10_modified_goal_columns.py new file mode 100644 index 000000000..d75b16f09 --- /dev/null +++ b/migrations/versions/e8280f1bcb10_modified_goal_columns.py @@ -0,0 +1,28 @@ +"""modified goal columns + +Revision ID: e8280f1bcb10 +Revises: 8a6cc2fcd4f0 +Create Date: 2022-05-12 11:59:19.897549 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e8280f1bcb10' +down_revision = '8a6cc2fcd4f0' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=False)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..ea9fc716d 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ import pytest +from app.models.goal import Goal -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +47,22 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # raise Exception("Complete test") # Assert # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +81,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" + } + } + goal = Goal.query.get(1) + assert goal.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 +129,23 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + assert Goal.query.get(1) == None - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} + # added above assertion + 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 d33455c6843a790903bf0cfdc3f812dafeb5d39c Mon Sep 17 00:00:00 2001 From: cathos Date: Thu, 12 May 2022 22:39:59 -0700 Subject: [PATCH 09/10] finished wave 6, passed all tests. Project mostly complete. --- app/models/goal.py | 10 ++++- app/models/task.py | 17 +++++++- app/routes.py | 41 ++++++++++++++++++- ...added_a_relationship_between_tasks_and_.py | 30 ++++++++++++++ tests/test_wave_06.py | 18 ++++---- 5 files changed, 104 insertions(+), 12 deletions(-) create mode 100644 migrations/versions/1447ea6432de_added_a_relationship_between_tasks_and_.py diff --git a/app/models/goal.py b/app/models/goal.py index 783a5faeb..8d652f5a0 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,12 +4,20 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String, nullable = False) + tasks = db.relationship("Task", back_populates="goal") def to_dict(self): return { "id": self.goal_id, - "title": self.title, + "title": self.title } + + def dict_with_tasks(self): + return { + "id": self.goal_id, + "title": self.title, + "tasks": self.tasks + } def single_dict(self): return { diff --git a/app/models/task.py b/app/models/task.py index e1c320995..852fb9b1a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,15 +5,28 @@ class Task(db.Model): title = db.Column(db.String, nullable = False) description = db.Column(db.String, nullable = False) completed_at = db.Column(db.DateTime) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id')) + goal = db.relationship("Goal", back_populates="tasks") + def to_dict(self): - return { + if self.goal_id != None: + return { "id": self.task_id, + "goal_id": self.goal_id, "title": self.title, "description": self.description, "is_complete": bool(self.completed_at) } - + else: + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + + def single_dict(self): return { "task":self.to_dict() diff --git a/app/routes.py b/app/routes.py index 2fbec9210..4e6255e0b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -151,6 +151,7 @@ def delete_task(task_id): db.session.commit() return make_response(jsonify(response), 200) + ## Goal Validation & Routes: @@ -242,4 +243,42 @@ def delete_goal(goal_id): db.session.delete(goal) db.session.commit() - return make_response(jsonify(response), 200) \ No newline at end of file + return make_response(jsonify(response), 200) + + + +@goals_bp.route("//tasks", methods=["POST"]) +def assign_tasks_to_goal(goal_id): + goal = validate_goals(goal_id) + request_body = request.get_json() + request_body_keys = request_body.keys() + task_ids = [] + if "task_ids" in request_body_keys: + for task_id in request_body["task_ids"]: + task_ids.append(validate_tasks(task_id)) + print(task_ids) + goal.tasks = task_ids + + db.session.commit() + + response_body = { + "id": goal.goal_id, + "task_ids": request_body["task_ids"] + } + return make_response(response_body, 200) + + +@goals_bp.route("//tasks", methods=["GET"]) +def get_tasks_assigned_to_goal(goal_id): + goal = validate_goals(goal_id) + # tasks = goal.tasks + # print(tasks) + + tasks_response = [] + for task in goal.tasks: + tasks_response.append(Task.to_dict(task)) + response = goal.dict_with_tasks() + response["tasks"] = tasks_response + + return make_response(jsonify(response), 200) + diff --git a/migrations/versions/1447ea6432de_added_a_relationship_between_tasks_and_.py b/migrations/versions/1447ea6432de_added_a_relationship_between_tasks_and_.py new file mode 100644 index 000000000..e0004c6ff --- /dev/null +++ b/migrations/versions/1447ea6432de_added_a_relationship_between_tasks_and_.py @@ -0,0 +1,30 @@ +"""added a relationship between tasks and goals + +Revision ID: 1447ea6432de +Revises: e8280f1bcb10 +Create Date: 2022-05-12 20:15:29.062026 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1447ea6432de' +down_revision = 'e8280f1bcb10' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..caaff6f5d 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -50,14 +50,16 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + 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 +76,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -99,7 +101,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From 84243ca1b997c80621464ce9d2c59ff8f55799dc Mon Sep 17 00:00:00 2001 From: cathos Date: Fri, 13 May 2022 09:44:17 -0700 Subject: [PATCH 10/10] added slack url to routes, removed it from env vars --- app/routes.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4e6255e0b..2ea4bc24f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,18 +16,22 @@ def send_slack_message(task, message): ''' send slack message with task information - use when marking tasks complete/incomplete ''' + slack_url = "https://slack.com/api/chat.postMessage?channel=task-notifications&text=" if message == "completed": send_message = f"Someone just completed the task {task.title}" else: send_message = f"The task {task.title} sent: {message}" - - url = os.environ.get("SLACK_POST_URL")+send_message - header_authorization = "Bearer "+os.environ.get("SLACK_AUTH_KEY") - headers = {'Authorization': header_authorization} - requests.post(url, headers=headers) - return - + try: + url = slack_url+send_message + header_authorization = "Bearer "+os.environ.get("SLACK_AUTH_KEY") + headers = {'Authorization': header_authorization} + requests.post(url, headers=headers) + return + except TypeError: + return TypeError("Slack Auth Key may be missing or invalid. Check your environment variables.") + except: + return ## Task Validation & Routes