From 0988f2c48a9fde52369fa6cb031bc3afaa3a0d59 Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Tue, 9 May 2023 21:23:00 -0400 Subject: [PATCH 01/13] Wave 1 Very Wet --- app/__init__.py | 3 + app/models/task.py | 23 +++- app/routes.py | 110 +++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++ migrations/env.py | 96 +++++++++++++++ migrations/script.py.mako | 24 ++++ migrations/versions/d0c2ecf3c392_taskmodel.py | 39 +++++++ .../versions/e00b87313e0d_is_complete.py | 28 +++++ tests/test_wave_01.py | 30 ++--- 10 files changed, 383 insertions(+), 16 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/d0c2ecf3c392_taskmodel.py create mode 100644 migrations/versions/e00b87313e0d_is_complete.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..6eb412d10 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,6 +5,7 @@ from dotenv import load_dotenv + db = SQLAlchemy() migrate = Migrate() load_dotenv() @@ -30,5 +31,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..920c23e02 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +2,25 @@ 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) + is_complete = db.Column(db.Boolean, default = False) + completed_at = db.Column(db.DateTime, default = None) + + # @classmethod + # def from_dict(cls, task_data): + # new_task = Task( + # title = task_title["title"], + # description = task_description["description"] + # ) + + # return new_task + + # def to_dict(self): + # return { + # "id": self.id, + # "title": self.title, + # "description": self.description, + # "completed_at": self.completed_at + # } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 3aae38d49..4a8bdb12c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,109 @@ -from flask import Blueprint \ No newline at end of file +from os import abort +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, abort, make_response, request + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +def validate_task(task_id): + try: + task_id = int(task_id) + except: + abort(make_response({"message":f"task {task_id} invalid"}, 400)) + + task = Task.query.get(task_id) + + if not task: + abort(make_response({"message":f"task {task_id} not found"}, 404)) + + return task + + +@tasks_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + try: + new_task = Task( + title=request_body["title"], + description=request_body["description"] + ) + except: + abort(make_response({"details": "Invalid data"}, 400)) + + db.session.add(new_task) + db.session.commit() + + + return make_response(jsonify({"task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": new_task.is_complete + } + }),201) + +@tasks_bp.route("", methods=["GET"]) + +def read_all_tasks(): + tasks_response = [] + tasks = Task.query.all() + for task in tasks: + tasks_response.append( + { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete + } + + ) + return jsonify(tasks_response) + +@tasks_bp.route("/", methods=["GET"]) + +def read_one_task(task_id): + task = validate_task(task_id) + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete + } + } + +@tasks_bp.route("/", methods=["PUT"]) +def update_task(task_id): + task = validate_task(task_id) + + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete + } + } + +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = validate_task(task_id) + + + db.session.delete(task) + db.session.commit() + + return make_response({"details":f'Task {task.task_id} "{task.title}" successfully deleted'}) + + # make_response({"message":f"task {task_id} not found"}, 404)) + + + + + + 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/d0c2ecf3c392_taskmodel.py b/migrations/versions/d0c2ecf3c392_taskmodel.py new file mode 100644 index 000000000..773d18425 --- /dev/null +++ b/migrations/versions/d0c2ecf3c392_taskmodel.py @@ -0,0 +1,39 @@ +"""“TaskModel” + +Revision ID: d0c2ecf3c392 +Revises: +Create Date: 2023-05-09 14:26:45.116599 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd0c2ecf3c392' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/migrations/versions/e00b87313e0d_is_complete.py b/migrations/versions/e00b87313e0d_is_complete.py new file mode 100644 index 000000000..2c34b6c67 --- /dev/null +++ b/migrations/versions/e00b87313e0d_is_complete.py @@ -0,0 +1,28 @@ +"""“is_complete” + +Revision ID: e00b87313e0d +Revises: d0c2ecf3c392 +Create Date: 2023-05-09 16:18:44.031541 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e00b87313e0d' +down_revision = 'd0c2ecf3c392' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..30e6e1d5c 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,16 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + + # assert "not found" in response_body - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +95,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 +121,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -131,13 +133,13 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -152,7 +154,7 @@ def test_delete_task(client, one_task): assert Task.query.get(1) == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -161,7 +163,7 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -169,7 +171,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 +188,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 6f43e3ba17778a890c9cc213aff250231b9dcada Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Wed, 10 May 2023 09:36:42 -0400 Subject: [PATCH 02/13] Sort asc and desc filter --- app/routes.py | 17 ++++++++++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4a8bdb12c..b1e422918 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request +from sqlalchemy import asc, desc tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -45,8 +46,22 @@ def create_task(): @tasks_bp.route("", methods=["GET"]) def read_all_tasks(): + title_query = request.args.get("title") + sort_filter = request.args.get("sort") + if title_query: + tasks = Task.query.filter_by(title=title_query) + else: + tasks = Task.query.all() + + if sort_filter: + if sort_filter == "asc": + tasks = Task.query.order_by(Task.title.asc()) + elif sort_filter == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all() + tasks_response = [] - tasks = Task.query.all() for task in tasks: tasks_response.append( { 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 13ee10b0b133073438b2a93daf33ff84c2a60d40 Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Thu, 11 May 2023 18:09:32 -0400 Subject: [PATCH 03/13] Slack Api Message Working --- app/__init__.py | 1 + app/models/task.py | 36 +++++++++++++-------------- app/routes.py | 57 ++++++++++++++++++++++++++++++++++++++++++- tests/test_wave_03.py | 16 ++++++------ 4 files changed, 83 insertions(+), 27 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 6eb412d10..5f973b925 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -6,6 +6,7 @@ + db = SQLAlchemy() migrate = Migrate() load_dotenv() diff --git a/app/models/task.py b/app/models/task.py index 920c23e02..7430c9589 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,24 +3,24 @@ 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) - is_complete = db.Column(db.Boolean, default = False) - completed_at = db.Column(db.DateTime, default = None) + title = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + is_complete = db.Column(db.Boolean, default=False) + completed_at = db.Column(db.DateTime, default=None) - # @classmethod - # def from_dict(cls, task_data): - # new_task = Task( - # title = task_title["title"], - # description = task_description["description"] - # ) + @classmethod + def from_dict(cls, task_data): + new_task = Task( + title = task_title["title"], + description = task_description["description"] + ) - # return new_task + return new_task - # def to_dict(self): - # return { - # "id": self.id, - # "title": self.title, - # "description": self.description, - # "completed_at": self.completed_at - # } \ No newline at end of file + def to_dict(self): + return { + "id": self.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 b1e422918..7f4074ece 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,6 +3,13 @@ from app.models.task import Task from flask import Blueprint, jsonify, abort, make_response, request from sqlalchemy import asc, desc +from datetime import datetime +from slack_sdk import WebClient +from slack_sdk.errors import SlackApiError +import os +import requests + + tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -115,7 +122,55 @@ def delete_task(task_id): return make_response({"details":f'Task {task.task_id} "{task.title}" successfully deleted'}) - # make_response({"message":f"task {task_id} not found"}, 404)) +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_task_complete(task_id): + + task = validate_task(task_id) + + task.completed_at = datetime.utcnow() + +#use requests instead of WebClient and add bearer... add token to .env look up requests.post + client = WebClient(token=os.environ.get("slack_token")) + client.chat_postMessage(channel="C0570RZGHDL", text=f"Someone just completed the task {task.title}") + + + + if task.completed_at: + task.is_complete = True + + + db.session.commit() + + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete + } + } + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_task_incomplete(task_id): + + task = validate_task(task_id) + + if task.completed_at: + task.completed_at = None + task.is_complete = False + + + db.session.commit() + + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.is_complete + } + } + + + diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..1e198cda5 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -128,13 +128,13 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -143,7 +143,7 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From a6c7cb66adc34d478a6a88c514ceaabcf5edd5d9 Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Thu, 11 May 2023 19:01:22 -0400 Subject: [PATCH 04/13] Refactored redundant return messages --- app/models/task.py | 6 ++--- app/routes.py | 67 ++++++++-------------------------------------- 2 files changed, 14 insertions(+), 59 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 7430c9589..3989e4995 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -11,15 +11,15 @@ class Task(db.Model): @classmethod def from_dict(cls, task_data): new_task = Task( - title = task_title["title"], - description = task_description["description"] + title = task_data["title"], + description = task_data["description"] ) return new_task def to_dict(self): return { - "id": self.id, + "id": self.task_id, "title": self.title, "description": self.description, "is_complete": bool(self.completed_at) diff --git a/app/routes.py b/app/routes.py index 7f4074ece..5ed1f1828 100644 --- a/app/routes.py +++ b/app/routes.py @@ -31,10 +31,8 @@ def validate_task(task_id): def create_task(): request_body = request.get_json() try: - new_task = Task( - title=request_body["title"], - description=request_body["description"] - ) + new_task = Task.from_dict(request_body) + except: abort(make_response({"details": "Invalid data"}, 400)) @@ -42,19 +40,14 @@ def create_task(): db.session.commit() - return make_response(jsonify({"task": { - "id": new_task.task_id, - "title": new_task.title, - "description": new_task.description, - "is_complete": new_task.is_complete - } - }),201) + return make_response(jsonify({"task": new_task.to_dict()}),201) @tasks_bp.route("", methods=["GET"]) def read_all_tasks(): title_query = request.args.get("title") sort_filter = request.args.get("sort") + if title_query: tasks = Task.query.filter_by(title=title_query) else: @@ -70,28 +63,15 @@ def read_all_tasks(): tasks_response = [] for task in tasks: - tasks_response.append( - { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": task.is_complete - } - - ) + tasks_response.append(task.to_dict()) + return jsonify(tasks_response) @tasks_bp.route("/", methods=["GET"]) def read_one_task(task_id): task = validate_task(task_id) - return {"task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": task.is_complete - } - } + return {"task": task.to_dict()} @tasks_bp.route("/", methods=["PUT"]) def update_task(task_id): @@ -104,13 +84,7 @@ def update_task(task_id): db.session.commit() - return {"task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": task.is_complete - } - } + return {"task": task.to_dict()} @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): @@ -133,21 +107,9 @@ def mark_task_complete(task_id): client = WebClient(token=os.environ.get("slack_token")) client.chat_postMessage(channel="C0570RZGHDL", text=f"Someone just completed the task {task.title}") - - - if task.completed_at: - task.is_complete = True - - db.session.commit() - return {"task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": task.is_complete - } - } + return {"task": task.to_dict()} @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_task_incomplete(task_id): @@ -156,18 +118,11 @@ def mark_task_incomplete(task_id): if task.completed_at: task.completed_at = None - task.is_complete = False - + db.session.commit() - return {"task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": task.is_complete - } - } + return {"task": task.to_dict()} From aed594072c2289913ee9124eb6ac5f0a0a3be465 Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Thu, 11 May 2023 20:12:21 -0400 Subject: [PATCH 05/13] Refactored Validate function for models --- app/__init__.py | 2 + app/models/goal.py | 16 +++++++ app/models/task.py | 2 +- app/routes.py | 27 ++++++------ .../versions/29710204146c_updted_goal.py | 42 +++++++++++++++++++ 5 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 migrations/versions/29710204146c_updted_goal.py diff --git a/app/__init__.py b/app/__init__.py index 5f973b925..033fcbac1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -33,6 +33,8 @@ def create_app(test_config=None): # Register Blueprints here from .routes import tasks_bp + from .routes import 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..34e2feb48 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) + + + @classmethod + def from_dict_goals(cls, task_data): + new_goal = Task( + title = task_data["title"] + ) + + return new_task + + def to_dict_goals(self): + return { + "id": self.task_id, + "title": self.title + } diff --git a/app/models/task.py b/app/models/task.py index 3989e4995..80d7120f7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,7 +5,7 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) - is_complete = db.Column(db.Boolean, default=False) + # is_complete = db.Column(db.Boolean, default=False) completed_at = db.Column(db.DateTime, default=None) @classmethod diff --git a/app/routes.py b/app/routes.py index 5ed1f1828..e74507a8e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -12,19 +12,20 @@ tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") -def validate_task(task_id): +def validate_model(cls, model_id): try: - task_id = int(task_id) + model_id = int(model_id) except: - abort(make_response({"message":f"task {task_id} invalid"}, 400)) + abort(make_response({"message":f"task {model_id} invalid"}, 400)) - task = Task.query.get(task_id) + model = cls.query.get(model_id) - if not task: - abort(make_response({"message":f"task {task_id} not found"}, 404)) + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) - return task + return model @tasks_bp.route("", methods=["POST"]) @@ -70,12 +71,12 @@ def read_all_tasks(): @tasks_bp.route("/", methods=["GET"]) def read_one_task(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) return {"task": task.to_dict()} @tasks_bp.route("/", methods=["PUT"]) def update_task(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) request_body = request.get_json() @@ -88,7 +89,7 @@ def update_task(task_id): @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) db.session.delete(task) @@ -99,7 +100,7 @@ def delete_task(task_id): @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) task.completed_at = datetime.utcnow() @@ -114,7 +115,7 @@ def mark_task_complete(task_id): @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_task_incomplete(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) if task.completed_at: task.completed_at = None @@ -125,6 +126,8 @@ def mark_task_incomplete(task_id): return {"task": task.to_dict()} + + diff --git a/migrations/versions/29710204146c_updted_goal.py b/migrations/versions/29710204146c_updted_goal.py new file mode 100644 index 000000000..23057e289 --- /dev/null +++ b/migrations/versions/29710204146c_updted_goal.py @@ -0,0 +1,42 @@ +"""“updted_goal” + +Revision ID: 29710204146c +Revises: e00b87313e0d +Create Date: 2023-05-11 19:45:28.725957 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '29710204146c' +down_revision = 'e00b87313e0d' +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)) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=False) + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=True) + op.drop_column('goal', 'title') + # ### end Alembic commands ### From f1fcccc34062fc32ad20bfdfc95816e0980c5c7c Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Fri, 12 May 2023 11:17:08 -0400 Subject: [PATCH 06/13] Goals and Tasks --- app/models/goal.py | 18 ++- app/models/task.py | 12 ++ app/routes.py | 103 ++++++++++++++++++ .../versions/455c123ce281_one_to_many_rel.py | 30 +++++ tests/test_wave_05.py | 14 +-- tests/test_wave_06.py | 14 +-- 6 files changed, 172 insertions(+), 19 deletions(-) create mode 100644 migrations/versions/455c123ce281_one_to_many_rel.py diff --git a/app/models/goal.py b/app/models/goal.py index 34e2feb48..4946a08a5 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,18 +4,26 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String, nullable=False) + tasks = db.relationship("Task", back_populates="goal") @classmethod - def from_dict_goals(cls, task_data): - new_goal = Task( - title = task_data["title"] + def from_dict_goals(cls, goal_data): + new_goal = Goal( + title = goal_data["title"] ) - return new_task + return new_goal def to_dict_goals(self): return { - "id": self.task_id, + "id": self.goal_id, "title": self.title } + + def to_dict_goals_tasks(self): + return { + "id": self.goal_id, + "title": self.title, + "tasks": self.tasks + } diff --git a/app/models/task.py b/app/models/task.py index 80d7120f7..17e8a1ad3 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,6 +7,9 @@ class Task(db.Model): description = db.Column(db.String, nullable=False) # is_complete = db.Column(db.Boolean, default=False) completed_at = db.Column(db.DateTime, default=None) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + goal = db.relationship("Goal", back_populates="tasks") + @classmethod def from_dict(cls, task_data): @@ -23,4 +26,13 @@ def to_dict(self): "title": self.title, "description": self.description, "is_complete": bool(self.completed_at) + } + + def to_dict_with_goal(self): + return { + "id": self.task_id, + "goal_id":self.goal_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 e74507a8e..7238cdff6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,6 +8,7 @@ from slack_sdk.errors import SlackApiError import os import requests +from app.models.goal import Goal @@ -126,7 +127,109 @@ def mark_task_incomplete(task_id): return {"task": task.to_dict()} +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + try: + new_goal = Goal.from_dict_goals(request_body) + + except: + abort(make_response({"details": "Invalid data"}, 400)) + + db.session.add(new_goal) + db.session.commit() + + + return make_response(jsonify({"goal": new_goal.to_dict_goals()}),201) + +@goals_bp.route("", methods=["GET"]) + +def read_all_goals(): + title_query = request.args.get("title") + sort_filter = request.args.get("sort") + + if title_query: + goals = Goal.query.filter_by(title=title_query) + else: + goals = Goal.query.all() + + if sort_filter: + if sort_filter == "asc": + goals = Goal.query.order_by(Goal.title.asc()) + elif sort_filter == "desc": + goals = Goal.query.order_by(Goal.title.desc()) + else: + goals = Goal.query.all() + + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict_goals()) + + return jsonify(goals_response) + +@goals_bp.route("/", methods=["GET"]) + +def read_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + return {"goal": goal.to_dict_goals()} + +@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["goal"] + + + db.session.commit() + + return {"goal": goal.to_dict_goals()} + +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + goal = validate_model(Goal, goal_id) + + + db.session.delete(goal) + db.session.commit() + + return make_response({"details":f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}) + +@goals_bp.route("//tasks", methods=["POST"]) +def create_goal_by_id(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + + for task in request_body["task_ids"]: + task = validate_model(Task, task) + goal.tasks.append(task) + + db.session.commit() + return { + "id": goal.goal_id, + "task_ids": request_body["task_ids"] + } + + +@goals_bp.route("//tasks", methods=["GET"]) +def get_all_tasks_with_id(goal_id): + goal = validate_model(Goal, goal_id) + + # return {"goal": goal.to_dict_goals_tasks()} + + goals_tasks = { + "id": goal.goal_id, + "title": goal.title, + "tasks": [] + + } + + for task in goal.tasks: + goals_tasks["tasks"].append(task.to_dict_with_goal + ()) + return jsonify(goals_tasks), 200 diff --git a/migrations/versions/455c123ce281_one_to_many_rel.py b/migrations/versions/455c123ce281_one_to_many_rel.py new file mode 100644 index 000000000..6788234ab --- /dev/null +++ b/migrations/versions/455c123ce281_one_to_many_rel.py @@ -0,0 +1,30 @@ +"""“one_to_many_rel” + +Revision ID: 455c123ce281 +Revises: 29710204146c +Create Date: 2023-05-12 06:26:00.396935 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '455c123ce281' +down_revision = '29710204146c' +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 aee7c52a1..fb9bc84ac 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") @@ -61,7 +61,7 @@ def test_get_goal_not_found(client): # ---- 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={ @@ -107,7 +107,7 @@ def test_update_goal_not_found(client): # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -124,7 +124,7 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -144,7 +144,7 @@ def test_delete_goal_not_found(client): # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..42da8d964 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -51,13 +51,13 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +74,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -99,7 +99,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From e033321f0109c9b631339bcff5e0ff01578f16ae Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Sat, 13 May 2023 14:30:27 -0400 Subject: [PATCH 07/13] Wrote all Tests --- app/models/goal.py | 7 ------ app/routes.py | 7 ++++-- tests/test_wave_01.py | 7 ++++-- tests/test_wave_03.py | 4 +++- tests/test_wave_05.py | 55 +++++++++++++++++++++++++++---------------- tests/test_wave_06.py | 1 + 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 4946a08a5..738853a5e 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -20,10 +20,3 @@ def to_dict_goals(self): "id": self.goal_id, "title": self.title } - - def to_dict_goals_tasks(self): - return { - "id": self.goal_id, - "title": self.title, - "tasks": self.tasks - } diff --git a/app/routes.py b/app/routes.py index 7238cdff6..6a7cd2acf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -73,7 +73,10 @@ def read_all_tasks(): def read_one_task(task_id): task = validate_model(Task, task_id) - return {"task": task.to_dict()} + if task.goal_id: + return {"task": task.to_dict_with_goal()} + else: + return {"task": task.to_dict()} @tasks_bp.route("/", methods=["PUT"]) def update_task(task_id): @@ -179,7 +182,7 @@ def update_goal(goal_id): request_body = request.get_json() - goal.title = request_body["goal"] + goal.title = request_body["title"] db.session.commit() diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 30e6e1d5c..c30db5f9d 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -59,8 +59,8 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - - # assert "not found" in response_body + assert "not found" in response_body["message"] + # raise Exception("Complete test with assertion about response body") # ***************************************************************** @@ -132,6 +132,8 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert "not found" in response_body["message"] + # raise Exception("Complete test with assertion about response body") # ***************************************************************** @@ -162,6 +164,7 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert "not found" in response_body["message"] # raise Exception("Complete test with assertion about response body") # ***************************************************************** diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 1e198cda5..5f2d86336 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -127,7 +127,8 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - + assert "not found" in response_body["message"] + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** @@ -142,6 +143,7 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert "not found" in response_body["message"] # raise Exception("Complete test with assertion about response body") # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index fb9bc84ac..0946579be 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -46,14 +46,18 @@ 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 + assert response.status_code == 404 + assert "not found" in response_body["message"] # Assert # ---- Complete Test ---- # assertion 1 goes here @@ -80,30 +84,39 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") + # raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal" + }) + 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" + } + } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + response = client.get("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here + assert "not found" in response_body["message"] # ---- Complete Assertions Here ---- @@ -122,7 +135,9 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") + response_body = response.get_json() assert response.status_code == 404 + assert "not found" in response_body["message"] # raise Exception("Complete test with assertion about response body") # ***************************************************************** @@ -130,18 +145,18 @@ def test_delete_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_delete_goal_not_found(client): - raise Exception("Complete test") - - # Act - # ---- Complete Act Here ---- - + # raise Exception("Complete test") + #Act + response = client.get("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert "not found" in response_body["message"] # @pytest.mark.skip(reason="No way to test this feature yet") diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 42da8d964..8eeaa00f5 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -50,6 +50,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert "not found" in response_body["message"] # raise Exception("Complete test with assertion about response body") # ***************************************************************** From 7f7e2b7ef9d280d54932178431c3d1ec5a13889a Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Sun, 14 May 2023 12:13:32 -0400 Subject: [PATCH 08/13] Updated requirements --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index 453f0ef6a..94fe9f892 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==7.2.5 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 @@ -28,7 +29,9 @@ python-dotenv==0.15.0 python-editor==1.0.4 requests==2.25.1 six==1.15.0 +slack-sdk==3.21.3 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.5 Werkzeug==1.0.1 From ed07414f7f29c4e245f23511aae92387962f420a Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Sun, 14 May 2023 12:45:31 -0400 Subject: [PATCH 09/13] Render URL --- app/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 033fcbac1..ee863558a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -17,8 +17,7 @@ def create_app(test_config=None): app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("RENDER_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( From b147ba2f474e3c406d00bec36765b94cd68c3340 Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Sun, 14 May 2023 13:17:58 -0400 Subject: [PATCH 10/13] Testing Fix to SlackSDK --- tests/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/conftest.py b/tests/conftest.py index 6639378e6..5b219a5b0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,6 +5,7 @@ from app import db from datetime import datetime from flask.signals import request_finished +from slack_sdk import WebClient @pytest.fixture From 82fb79ad268a5187904fb51ef94a2914cd7cb4ba Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Sun, 14 May 2023 13:20:59 -0400 Subject: [PATCH 11/13] Testing Fix to SlackSDK --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 5b219a5b0..c7352ec56 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,7 +5,7 @@ from app import db from datetime import datetime from flask.signals import request_finished -from slack_sdk import WebClient + @pytest.fixture From 512d0e027b4a9e9788924390de802e3df5cdee7c Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Mon, 15 May 2023 08:14:27 -0400 Subject: [PATCH 12/13] removed slack --- app/routes.py | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6a7cd2acf..3bbf7e4bb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,11 +4,13 @@ from flask import Blueprint, jsonify, abort, make_response, request from sqlalchemy import asc, desc from datetime import datetime -from slack_sdk import WebClient -from slack_sdk.errors import SlackApiError +# from slack_sdk import WebClient +# from slack_sdk.errors import SlackApiError import os import requests from app.models.goal import Goal +import requests, json + @@ -109,8 +111,32 @@ def mark_task_complete(task_id): task.completed_at = datetime.utcnow() #use requests instead of WebClient and add bearer... add token to .env look up requests.post - client = WebClient(token=os.environ.get("slack_token")) - client.chat_postMessage(channel="C0570RZGHDL", text=f"Someone just completed the task {task.title}") + # client = WebClient(token=os.environ.get("slack_token")) + # client.chat_postMessage(channel="C0570RZGHDL", text=f"Someone just completed the task {task.title}") + + # payload = {"text":f"Someone just completed the task {task.title}"} + # url = os.environ.get("SLACK_URL") + + # requests.post(url, json.dumps(payload)) + # token = os.environ.get("slack_token") + # url="https://slack.com/api/chat.postMessage" + # data = { + + # "token": f"{token}", + # "channel": 'C0570RZGHDL', + # "text": f"Someone just completed the task {task.title}", + # } + + # response = requests.post( + # url=url, data=data, + # headers={}) + + + + + + + db.session.commit() From c4112211013654545b69e613e006cf9a09c6d34f Mon Sep 17 00:00:00 2001 From: Pha'lesa Patton Date: Mon, 15 May 2023 12:00:34 -0400 Subject: [PATCH 13/13] added slack --- app/routes.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3bbf7e4bb..530db6510 100644 --- a/app/routes.py +++ b/app/routes.py @@ -9,7 +9,7 @@ import os import requests from app.models.goal import Goal -import requests, json +import json @@ -103,6 +103,19 @@ def delete_task(task_id): return make_response({"details":f'Task {task.task_id} "{task.title}" successfully deleted'}) +def slack_notification(task): + token = os.environ.get("slack_token") + slack_url = "https://slack.com/api/chat.postMessage" + headers = {"Authorization":token} + body = { + "channel": "task-notifications", + "text": f"Someone just completed the task {task.title}", + } + + requests.post(slack_url, headers=headers, json=body) + return + + @tasks_bp.route("//mark_complete", methods=["PATCH"]) def mark_task_complete(task_id): @@ -110,26 +123,13 @@ def mark_task_complete(task_id): task.completed_at = datetime.utcnow() + + #use requests instead of WebClient and add bearer... add token to .env look up requests.post # client = WebClient(token=os.environ.get("slack_token")) # client.chat_postMessage(channel="C0570RZGHDL", text=f"Someone just completed the task {task.title}") - # payload = {"text":f"Someone just completed the task {task.title}"} - # url = os.environ.get("SLACK_URL") - - # requests.post(url, json.dumps(payload)) - # token = os.environ.get("slack_token") - # url="https://slack.com/api/chat.postMessage" - # data = { - - # "token": f"{token}", - # "channel": 'C0570RZGHDL', - # "text": f"Someone just completed the task {task.title}", - # } - - # response = requests.post( - # url=url, data=data, - # headers={}) + @@ -139,9 +139,14 @@ def mark_task_complete(task_id): db.session.commit() + + slack_notification(task) + return {"task": task.to_dict()} + + @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def mark_task_incomplete(task_id):