From 92604f74829ce557767e96bbe20cfb2b3bbea186 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Sun, 4 May 2025 15:18:11 -0400 Subject: [PATCH 1/9] wave one tests are passing --- app/__init__.py | 2 + app/models/task.py | 20 +++++ app/routes/task_routes.py | 71 ++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++++ migrations/env.py | 113 +++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/f2e33e7ed593_.py | 39 +++++++++ tests/test_wave_01.py | 31 ++++---- 9 files changed, 336 insertions(+), 15 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/f2e33e7ed593_.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..c8017bee4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from .db import db, migrate from .models import task, goal import os +from .routes.task_routes import tasks_bp def create_app(config=None): app = Flask(__name__) @@ -18,5 +19,6 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..5b2409eb6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,25 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from datetime import datetime class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[datetime] = mapped_column(default=None, nullable=True) + is_complete: Mapped[bool] = mapped_column(default=False) + + def task_dict(self): + task_as_dict = {} + task_as_dict["id"] = self.id + task_as_dict["title"] = self.title + task_as_dict["description"] = self.description + task_as_dict["is_complete"] = self.is_complete + return task_as_dict + + + @classmethod + def from_dict(cls, task_data): + new_task = cls(title=task_data["title"], + description=task_data["description"]) + return new_task diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..19abc993b 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,70 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, abort, make_response, Response +from app.models.task import Task +from ..db import db + + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +@tasks_bp.post("") +def create_tasks(): + request_body = request.get_json() + + try: + new_task = Task.from_dict(request_body) + except KeyError as error: + response_body = {"details": "Invalid data"} + abort(make_response(response_body, 400)) + + db.session.add(new_task) + db.session.commit() + response = {"task": new_task.task_dict()} + return response, 201 + + +@tasks_bp.get("/") +def get_one_task(task_id): + task = validate_task(task_id) + response = {"task": task.task_dict()} + + return response + + + +def validate_task(task_id): + query = db.select(Task).where(Task.id == task_id) + task = db.session.scalar(query) + + if not task: + response = {"message": f"Task {task_id} not found"} + abort(make_response(response, 404)) + + return task + + + +@tasks_bp.get("") +def get_all_tasks(): + query = db.Select(Task) + tasks = db.session.scalars(query.order_by(Task.id)) + + tasks_response = [] + for task in tasks: + tasks_response.append(task.task_dict()) + return tasks_response + + +@tasks_bp.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 Response(status=204, mimetype="application/json") + +@tasks_bp.delete("/") +def delete_task(task_id): + task = validate_task(task_id) + db.session.delete(task) + db.session.commit() + return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# 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,flask_migrate + +[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 + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[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..4c9709271 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +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') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# 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', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# 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 get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +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=get_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.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_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/f2e33e7ed593_.py b/migrations/versions/f2e33e7ed593_.py new file mode 100644 index 000000000..0403ac774 --- /dev/null +++ b/migrations/versions/f2e33e7ed593_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: f2e33e7ed593 +Revises: +Create Date: 2025-05-03 15:04:22.419719 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f2e33e7ed593' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 55475db79..2f15f995e 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -3,7 +3,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") @@ -14,7 +14,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") @@ -33,7 +33,7 @@ def test_get_tasks_one_saved_tasks(client, one_task): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -52,7 +52,7 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -60,14 +60,15 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") + # 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={ @@ -97,7 +98,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={ @@ -117,7 +118,7 @@ def test_update_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_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -128,14 +129,15 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") + # 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") @@ -146,7 +148,7 @@ def test_delete_task(client, one_task): query = db.select(Task).where(Task.id == 1) assert db.session.scalar(query) == 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") @@ -154,8 +156,9 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -163,7 +166,7 @@ def test_delete_task_not_found(client): assert db.session.scalars(db.select(Task)).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={ @@ -180,7 +183,7 @@ def test_create_task_must_contain_title(client): assert db.session.scalars(db.select(Task)).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 57d43122591cc282ff5ed134fe302e59e878cd45 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Sun, 4 May 2025 17:11:14 -0400 Subject: [PATCH 2/9] passed wave two tests --- app/routes/task_routes.py | 10 +++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 19abc993b..d7ba10af0 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -45,7 +45,15 @@ def validate_task(task_id): @tasks_bp.get("") def get_all_tasks(): query = db.Select(Task) - tasks = db.session.scalars(query.order_by(Task.id)) + + sort_param = request.args.get("sort") + if sort_param == "asc": + query = query.order_by(Task.title.asc()) + if sort_param == "desc": + query = query.order_by(Task.title.desc()) + + # tasks = db.session.scalars(query.order_by(Task.id)) + tasks = db.session.execute(query).scalars() 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 26573a33030e83cd2160c8066f03344990ee6211 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Sun, 4 May 2025 19:15:30 -0400 Subject: [PATCH 3/9] completed wave three --- app/models/task.py | 2 ++ app/routes/task_routes.py | 27 +++++++++++++++++++++++++++ tests/test_wave_03.py | 18 ++++++++++-------- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 5b2409eb6..1dd5ad35a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,6 +8,8 @@ class Task(db.Model): description: Mapped[str] completed_at: Mapped[datetime] = mapped_column(default=None, nullable=True) is_complete: Mapped[bool] = mapped_column(default=False) + # if completed_at: + # is_complete = True def task_dict(self): task_as_dict = {} diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index d7ba10af0..ca4d61c2f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, request, abort, make_response, Response from app.models.task import Task from ..db import db +from datetime import datetime tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -75,4 +76,30 @@ def delete_task(task_id): task = validate_task(task_id) db.session.delete(task) db.session.commit() + return Response(status=204, mimetype="application/json") + + +@tasks_bp.patch("//mark_complete") +def mark_complete(task_id): + task = validate_task(task_id) + + task.completed_at = datetime.now() + + if task.completed_at: + task.is_complete = True + + db.session.commit() + + + return Response(status=204, mimetype="application/json") + + +@tasks_bp.patch("//mark_incomplete") +def mark_incomplete(task_id): + task = validate_task(task_id) + + task.completed_at = None + + db.session.commit() + return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..cb862f859 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -6,7 +6,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 """ @@ -34,7 +34,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert db.session.scalar(query).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") @@ -46,7 +46,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert db.session.scalar(query).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 """ @@ -74,7 +74,7 @@ def test_mark_complete_on_completed_task(client, completed_task): query = db.select(Task).where(Task.id == 1) assert db.session.scalar(query).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") @@ -86,7 +86,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert db.session.scalar(query).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") @@ -94,14 +94,15 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") + # 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") @@ -109,8 +110,9 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Task 1 not found"} - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From dfebd1a885786a78bc6b0f5df3d0b0f5520c40c7 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Sun, 4 May 2025 20:40:27 -0400 Subject: [PATCH 4/9] completed wave five --- app/__init__.py | 4 +- app/models/goal.py | 12 ++++ app/routes/goal_routes.py | 79 ++++++++++++++++++++++++- migrations/versions/18d61ca07691_.py | 38 ++++++++++++ tests/test_wave_05.py | 86 ++++++++++++---------------- 5 files changed, 169 insertions(+), 50 deletions(-) create mode 100644 migrations/versions/18d61ca07691_.py diff --git a/app/__init__.py b/app/__init__.py index c8017bee4..7e4600427 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,7 +2,8 @@ from .db import db, migrate from .models import task, goal import os -from .routes.task_routes import tasks_bp +from .routes.task_routes import tasks_bp +from .routes.goal_routes import goals_bp def create_app(config=None): app = Flask(__name__) @@ -20,5 +21,6 @@ def create_app(config=None): # Register Blueprints here 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 44282656b..cd56361da 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,15 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + + def goal_dict(self): + goal_as_dict = {} + goal_as_dict["id"] = self.id + goal_as_dict["title"] = self.title + return goal_as_dict + + @classmethod + def from_dict(cls, goal_data): + new_goal = cls(title=goal_data["title"]) + return new_goal \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..ea5422f2d 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,78 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, abort, make_response, Response +from app.models.goal import Goal +from ..db import db + + + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@goals_bp.post("") +def create_tasks(): + request_body = request.get_json() + + try: + new_goal = Goal.from_dict(request_body) + except KeyError as error: + response_body = {"details": "Invalid data"} + abort(make_response(response_body, 400)) + + db.session.add(new_goal) + db.session.commit() + response = {"goal": new_goal.goal_dict()} + return response, 201 + +@goals_bp.get("") +def get_all_goals(): + query = db.Select(Goal) + + # sort_param = request.args.get("sort") + # if sort_param == "asc": + # query = query.order_by(Goal.title.asc()) + # if sort_param == "desc": + # query = query.order_by(Goal.title.desc()) + + # tasks = db.session.scalars(query.order_by(Task.id)) + goals = db.session.execute(query).scalars() + + goals_response = [] + for goal in goals: + goals_response.append(goal.goal_dict()) + return goals_response + + + +@goals_bp.get("/") +def get_one_goal(goal_id): + goal = validate_goal(goal_id) + response = {"goal": goal.goal_dict()} + + return response + + + +def validate_goal(goal_id): + query = db.select(Goal).where(Goal.id == goal_id) + goal = db.session.scalar(query) + + if not goal: + response = {"message": f"Goal {goal_id} not found"} + abort(make_response(response, 404)) + + return goal + +@goals_bp.put("/") +def update_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + goal.title = request_body["title"] + goal.id = request_body["id"] + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@goals_bp.delete("/") +def delete_goal(goal_id): + goal = validate_goal(goal_id) + db.session.delete(goal) + db.session.commit() + return Response(status=204, mimetype="application/json") \ No newline at end of file diff --git a/migrations/versions/18d61ca07691_.py b/migrations/versions/18d61ca07691_.py new file mode 100644 index 000000000..12b8599ae --- /dev/null +++ b/migrations/versions/18d61ca07691_.py @@ -0,0 +1,38 @@ +"""empty message + +Revision ID: 18d61ca07691 +Revises: f2e33e7ed593 +Create Date: 2025-05-04 19:32:12.353209 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '18d61ca07691' +down_revision = 'f2e33e7ed593' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) + + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('is_complete', sa.Boolean(), nullable=False)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_column('is_complete') + + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 222d10cf0..6377e0ffc 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,9 @@ import pytest +from app.models.goal import Goal +from app.db import db -@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") @@ -11,8 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response.status_code == 200 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") @@ -28,8 +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") @@ -45,23 +45,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") # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- - + assert response.status_code == 404 + assert response_body == {"message": f"Goal 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +75,37 @@ 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={ + "id": 1, + "title": "My New Goal" + }) # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 204 + query = db.select(Goal).where(Goal.id == 1) + goal = db.session.scalar(query) -@pytest.mark.skip(reason="test to be completed by student") + assert goal.id == 1 + assert goal.title == "My New Goal" + +# @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={ + "id": 1, + "title": "My New Goal" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- - + assert response.status_code == 404 + assert response_body == {"message": f"Goal 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -115,34 +113,26 @@ def test_delete_goal(client, one_goal): # Assert assert response.status_code == 204 - # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 response_body = response.get_json() assert "message" in response_body - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - + query = db.select(Goal).where(Goal.id == 1) + assert db.session.scalar(query) == None -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- - + assert response.status_code == 404 + assert response_body == {"message": f"Goal 1 not found"} -@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={}) @@ -152,4 +142,4 @@ def test_create_goal_missing_title(client): assert response.status_code == 400 assert response_body == { "details": "Invalid data" - } + } \ No newline at end of file From 1a27dc0e0463491cb390f0a42c227d96808ed8c7 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Thu, 8 May 2025 19:26:57 -0400 Subject: [PATCH 5/9] completed wave six --- app/models/goal.py | 4 +- app/models/task.py | 9 ++++- app/routes/goal_routes.py | 57 ++++++++++++++++++++++------ app/routes/route_utilities.py | 18 +++++++++ app/routes/task_routes.py | 32 +++++++++------- migrations/versions/99d29e3ba3ac_.py | 34 +++++++++++++++++ tests/test_wave_06.py | 15 ++++---- 7 files changed, 135 insertions(+), 34 deletions(-) create mode 100644 app/routes/route_utilities.py create mode 100644 migrations/versions/99d29e3ba3ac_.py diff --git a/app/models/goal.py b/app/models/goal.py index cd56361da..105d79754 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,9 +1,11 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +# from .task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") def goal_dict(self): goal_as_dict = {} diff --git a/app/models/task.py b/app/models/task.py index 1dd5ad35a..0b4030bef 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,9 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey +from typing import Optional from ..db import db from datetime import datetime +# from .goal import Goal class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) @@ -10,6 +13,8 @@ class Task(db.Model): is_complete: Mapped[bool] = mapped_column(default=False) # if completed_at: # is_complete = True + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") def task_dict(self): task_as_dict = {} @@ -17,6 +22,8 @@ def task_dict(self): task_as_dict["title"] = self.title task_as_dict["description"] = self.description task_as_dict["is_complete"] = self.is_complete + if self.goal_id: + task_as_dict["goal_id"] = self.goal_id return task_as_dict diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index ea5422f2d..40238a23c 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,6 +1,9 @@ from flask import Blueprint, request, abort, make_response, Response from app.models.goal import Goal from ..db import db +# from app.routes.task_routes import validate_task +from .route_utilities import validate_model +from app.models.task import Task @@ -43,26 +46,28 @@ def get_all_goals(): @goals_bp.get("/") def get_one_goal(goal_id): - goal = validate_goal(goal_id) + # goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) response = {"goal": goal.goal_dict()} return response -def validate_goal(goal_id): - query = db.select(Goal).where(Goal.id == goal_id) - goal = db.session.scalar(query) +# def validate_goal(goal_id): +# query = db.select(Goal).where(Goal.id == goal_id) +# goal = db.session.scalar(query) - if not goal: - response = {"message": f"Goal {goal_id} not found"} - abort(make_response(response, 404)) +# if not goal: +# response = {"message": f"Goal {goal_id} not found"} +# abort(make_response(response, 404)) - return goal +# return goal @goals_bp.put("/") def update_goal(goal_id): - goal = validate_goal(goal_id) + # goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) request_body = request.get_json() goal.title = request_body["title"] goal.id = request_body["id"] @@ -72,7 +77,37 @@ def update_goal(goal_id): @goals_bp.delete("/") def delete_goal(goal_id): - goal = validate_goal(goal_id) + # goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) db.session.delete(goal) db.session.commit() - return Response(status=204, mimetype="application/json") \ No newline at end of file + return Response(status=204, mimetype="application/json") + +@goals_bp.get("//tasks") +def get_tasks_by_goal(goal_id): + # goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) + response = goal.goal_dict() + response["tasks"] = [task.task_dict() for task in goal.tasks] + return response + +@goals_bp.post("//tasks") +def send_tasks_to_goals(goal_id): + # goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) + + request_body = request.get_json() + task_list = request_body["task_ids"] + goal.tasks.clear() #removes existing tasks assoc w the goal + + for task_id in request_body["task_ids"]: + new_task = validate_model(Task, task_id) + new_task.goal_id = goal_id + db.session.commit() + + + db.session.commit() + response = {"id": goal.id, + "task_ids": request_body["task_ids"]} + + return response \ No newline at end of file diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..2dc8ede2d --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,18 @@ +from flask import abort, make_response +from ..db import db + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + response = {"message": f"{cls.__name__} {model_id} invalid"} + abort(make_response(response , 400)) + + query = db.select(cls).where(cls.id == model_id) + model = db.session.scalar(query) + + if not model: + response = {"message": f"{cls.__name__} {model_id} not found"} + abort(make_response(response, 404)) + + return model \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index ca4d61c2f..c4dc75fbe 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,6 +2,7 @@ from app.models.task import Task from ..db import db from datetime import datetime +from .route_utilities import validate_model tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -24,22 +25,23 @@ def create_tasks(): @tasks_bp.get("/") def get_one_task(task_id): - task = validate_task(task_id) + # task = validate_task(task_id) + task = validate_model(Task, task_id) response = {"task": task.task_dict()} return response -def validate_task(task_id): - query = db.select(Task).where(Task.id == task_id) - task = db.session.scalar(query) +# def validate_task(task_id): +# query = db.select(Task).where(Task.id == task_id) +# task = db.session.scalar(query) - if not task: - response = {"message": f"Task {task_id} not found"} - abort(make_response(response, 404)) +# if not task: +# response = {"message": f"Task {task_id} not found"} +# abort(make_response(response, 404)) - return task +# return task @@ -64,7 +66,8 @@ def get_all_tasks(): @tasks_bp.put("/") def update_task(task_id): - task = validate_task(task_id) + # task = validate_task(task_id) + task = validate_model(Task, task_id) request_body = request.get_json() task.title = request_body["title"] task.description = request_body["description"] @@ -73,7 +76,8 @@ def update_task(task_id): @tasks_bp.delete("/") def delete_task(task_id): - task = validate_task(task_id) + # task = validate_task(task_id) + task = validate_model(Task, task_id) db.session.delete(task) db.session.commit() return Response(status=204, mimetype="application/json") @@ -81,8 +85,8 @@ def delete_task(task_id): @tasks_bp.patch("//mark_complete") def mark_complete(task_id): - task = validate_task(task_id) - + # task = validate_task(task_id) + task = validate_model(Task, task_id) task.completed_at = datetime.now() if task.completed_at: @@ -96,8 +100,8 @@ def mark_complete(task_id): @tasks_bp.patch("//mark_incomplete") def mark_incomplete(task_id): - task = validate_task(task_id) - + # task = validate_task(task_id) + task = validate_model(Task, task_id) task.completed_at = None db.session.commit() diff --git a/migrations/versions/99d29e3ba3ac_.py b/migrations/versions/99d29e3ba3ac_.py new file mode 100644 index 000000000..3a4aad712 --- /dev/null +++ b/migrations/versions/99d29e3ba3ac_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 99d29e3ba3ac +Revises: 18d61ca07691 +Create Date: 2025-05-07 20:04:06.929524 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '99d29e3ba3ac' +down_revision = '18d61ca07691' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True)) + batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id']) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_constraint(None, type_='foreignkey') + batch_op.drop_column('goal_id') + + # ### end Alembic commands ### diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 0317f835a..857a587df 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -3,7 +3,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={ @@ -25,7 +25,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(db.session.scalar(query).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={ @@ -45,7 +45,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(db.session.scalar(query).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") @@ -53,14 +53,15 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Goal 1 not found"} - 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") @@ -77,7 +78,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") @@ -102,7 +103,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 0890dd4210de3c8bd6d12dda8059958427a79c89 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Fri, 9 May 2025 00:27:08 -0400 Subject: [PATCH 6/9] wave four slack msg --- app/models/goal.py | 2 +- app/models/task.py | 2 +- app/routes/goal_routes.py | 32 +++++++++++++------------- app/routes/route_utilities.py | 16 ++++++++++++- app/routes/task_routes.py | 42 ++++++++++++++++++++++++----------- requirements.txt | 1 + 6 files changed, 63 insertions(+), 32 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 105d79754..63c407ea4 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -7,7 +7,7 @@ class Goal(db.Model): title: Mapped[str] tasks: Mapped[list["Task"]] = relationship(back_populates="goal") - def goal_dict(self): + def to_dict(self): goal_as_dict = {} goal_as_dict["id"] = self.id goal_as_dict["title"] = self.title diff --git a/app/models/task.py b/app/models/task.py index 0b4030bef..799e9c248 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -16,7 +16,7 @@ class Task(db.Model): goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") - def task_dict(self): + def to_dict(self): task_as_dict = {} task_as_dict["id"] = self.id task_as_dict["title"] = self.title diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 40238a23c..c0289bd34 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -2,7 +2,7 @@ from app.models.goal import Goal from ..db import db # from app.routes.task_routes import validate_task -from .route_utilities import validate_model +from .route_utilities import validate_model, create_model from app.models.task import Task @@ -12,17 +12,17 @@ @goals_bp.post("") def create_tasks(): request_body = request.get_json() - - try: - new_goal = Goal.from_dict(request_body) - except KeyError as error: - response_body = {"details": "Invalid data"} - abort(make_response(response_body, 400)) - - db.session.add(new_goal) - db.session.commit() - response = {"goal": new_goal.goal_dict()} - return response, 201 + return {"goal": create_model(Goal, request_body)[0]}, 201 + # try: + # new_goal = Goal.from_dict(request_body) + # except KeyError as error: + # response_body = {"details": "Invalid data"} + # abort(make_response(response_body, 400)) + + # db.session.add(new_goal) + # db.session.commit() + # response = {"goal": new_goal.to_dict()} + # return response, 201 @goals_bp.get("") def get_all_goals(): @@ -39,7 +39,7 @@ def get_all_goals(): goals_response = [] for goal in goals: - goals_response.append(goal.goal_dict()) + goals_response.append(goal.to_dict()) return goals_response @@ -48,7 +48,7 @@ def get_all_goals(): def get_one_goal(goal_id): # goal = validate_goal(goal_id) goal = validate_model(Goal, goal_id) - response = {"goal": goal.goal_dict()} + response = {"goal": goal.to_dict()} return response @@ -87,8 +87,8 @@ def delete_goal(goal_id): def get_tasks_by_goal(goal_id): # goal = validate_goal(goal_id) goal = validate_model(Goal, goal_id) - response = goal.goal_dict() - response["tasks"] = [task.task_dict() for task in goal.tasks] + response = goal.to_dict() + response["tasks"] = [task.to_dict() for task in goal.tasks] return response @goals_bp.post("//tasks") diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 2dc8ede2d..e3b91b4f3 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -15,4 +15,18 @@ def validate_model(cls, model_id): response = {"message": f"{cls.__name__} {model_id} not found"} abort(make_response(response, 404)) - return model \ No newline at end of file + return model + + +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + + except KeyError as error: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + db.session.add(new_model) + db.session.commit() + + return new_model.to_dict(), 201 \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index c4dc75fbe..d5dd909af 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,32 +2,42 @@ from app.models.task import Task from ..db import db from datetime import datetime -from .route_utilities import validate_model +from .route_utilities import validate_model, create_model +import os +from slack_sdk import WebClient +# client = WebClient(token=os.environ.get("SLACK_BOT_TOKEN")) +# channel_id = "task-notifications" +# send_msg = client.chat_postMessage( +# channel=channel_id, +# text="SOMEONE just completed the task My Beautiful Task" +# ) tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @tasks_bp.post("") def create_tasks(): request_body = request.get_json() + # task = create_model(Task, request_body) + return {"task": create_model(Task, request_body)[0]}, 201 - try: - new_task = Task.from_dict(request_body) - except KeyError as error: - response_body = {"details": "Invalid data"} - abort(make_response(response_body, 400)) + # try: + # new_task = Task.from_dict(request_body) + # except KeyError as error: + # response_body = {"details": "Invalid data"} + # abort(make_response(response_body, 400)) - db.session.add(new_task) - db.session.commit() - response = {"task": new_task.task_dict()} - return response, 201 + # db.session.add(new_task) + # db.session.commit() + # response = {"task": new_task.to_dict()} + # return response, 201 @tasks_bp.get("/") def get_one_task(task_id): # task = validate_task(task_id) task = validate_model(Task, task_id) - response = {"task": task.task_dict()} + response = {"task": task.to_dict()} return response @@ -60,7 +70,7 @@ def get_all_tasks(): tasks_response = [] for task in tasks: - tasks_response.append(task.task_dict()) + tasks_response.append(task.to_dict()) return tasks_response @@ -87,6 +97,13 @@ def delete_task(task_id): def mark_complete(task_id): # task = validate_task(task_id) task = validate_model(Task, task_id) + + if (task.id == 1): + client = WebClient(token=os.environ.get('SLACK_BOT_TOKEN')) + channel_id = "task-notifications" + client.chat_postMessage(channel=channel_id, + text="Someone just completed the task My Beautiful Task") + task.completed_at = datetime.now() if task.completed_at: @@ -94,7 +111,6 @@ def mark_complete(task_id): db.session.commit() - return Response(status=204, mimetype="application/json") diff --git a/requirements.txt b/requirements.txt index b989cae17..00a042cb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,3 +26,4 @@ toml==0.10.2 typing_extensions==4.12.2 urllib3==2.3.0 Werkzeug==3.1.3 +slack_sdk==3.35.0 \ No newline at end of file From b61203acfa4bf7d632c155a942f9ff137aecde48 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Tue, 13 May 2025 09:53:41 -0400 Subject: [PATCH 7/9] clean up --- app/routes/task_routes.py | 64 ++++++++++++++------------------------- requirements.txt | 3 +- 2 files changed, 23 insertions(+), 44 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index d5dd909af..df2463861 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -4,57 +4,26 @@ from datetime import datetime from .route_utilities import validate_model, create_model import os -from slack_sdk import WebClient +import requests + -# client = WebClient(token=os.environ.get("SLACK_BOT_TOKEN")) -# channel_id = "task-notifications" -# send_msg = client.chat_postMessage( -# channel=channel_id, -# text="SOMEONE just completed the task My Beautiful Task" -# ) tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @tasks_bp.post("") def create_tasks(): request_body = request.get_json() - # task = create_model(Task, request_body) return {"task": create_model(Task, request_body)[0]}, 201 - - # try: - # new_task = Task.from_dict(request_body) - # except KeyError as error: - # response_body = {"details": "Invalid data"} - # abort(make_response(response_body, 400)) - - # db.session.add(new_task) - # db.session.commit() - # response = {"task": new_task.to_dict()} - # return response, 201 @tasks_bp.get("/") def get_one_task(task_id): - # task = validate_task(task_id) task = validate_model(Task, task_id) response = {"task": task.to_dict()} return response - -# def validate_task(task_id): -# query = db.select(Task).where(Task.id == task_id) -# task = db.session.scalar(query) - -# if not task: -# response = {"message": f"Task {task_id} not found"} -# abort(make_response(response, 404)) - -# return task - - - @tasks_bp.get("") def get_all_tasks(): query = db.Select(Task) @@ -76,7 +45,6 @@ def get_all_tasks(): @tasks_bp.put("/") def update_task(task_id): - # task = validate_task(task_id) task = validate_model(Task, task_id) request_body = request.get_json() task.title = request_body["title"] @@ -86,7 +54,6 @@ def update_task(task_id): @tasks_bp.delete("/") def delete_task(task_id): - # task = validate_task(task_id) task = validate_model(Task, task_id) db.session.delete(task) db.session.commit() @@ -95,14 +62,14 @@ def delete_task(task_id): @tasks_bp.patch("//mark_complete") def mark_complete(task_id): - # task = validate_task(task_id) task = validate_model(Task, task_id) if (task.id == 1): - client = WebClient(token=os.environ.get('SLACK_BOT_TOKEN')) - channel_id = "task-notifications" - client.chat_postMessage(channel=channel_id, - text="Someone just completed the task My Beautiful Task") + send_msg(task) + # client = WebClient(token=os.environ.get('SLACK_BOT_TOKEN')) + # channel_id = "task-notifications" + # client.chat_postMessage(channel=channel_id, + # text="Someone just completed the task My Beautiful Task") task.completed_at = datetime.now() @@ -116,10 +83,23 @@ def mark_complete(task_id): @tasks_bp.patch("//mark_incomplete") def mark_incomplete(task_id): - # task = validate_task(task_id) task = validate_model(Task, task_id) task.completed_at = None db.session.commit() - return Response(status=204, mimetype="application/json") \ No newline at end of file + return Response(status=204, mimetype="application/json") + + +def send_msg(task): + channel_id = os.environ.get("TESTER_CHANNEL") + headers = { + "Authorization": f"Bearer {os.environ.get("SLACK_BOT_TOKEN")}", + "Content-Type": "application/json" + } + data = { + "channel": channel_id, + "text": f"Someone just completed the task {task.title}" + } + response = requests.post("https://slack.com/api/chat.postMessage", headers=headers, data=data) + return response \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 00a042cb5..c8b7ee20f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,5 +25,4 @@ SQLAlchemy==2.0.38 toml==0.10.2 typing_extensions==4.12.2 urllib3==2.3.0 -Werkzeug==3.1.3 -slack_sdk==3.35.0 \ No newline at end of file +Werkzeug==3.1.3 \ No newline at end of file From 94fd737821c2d417b6edd18bc4a858f7c3da76b8 Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Tue, 13 May 2025 21:01:33 -0400 Subject: [PATCH 8/9] fixed --- app/routes/task_routes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index df2463861..268909b0f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -93,8 +93,9 @@ def mark_incomplete(task_id): def send_msg(task): channel_id = os.environ.get("TESTER_CHANNEL") + token = os.environ.get("SLACK_BOT_TOKEN") headers = { - "Authorization": f"Bearer {os.environ.get("SLACK_BOT_TOKEN")}", + "Authorization": f"Bearer {token}", "Content-Type": "application/json" } data = { From c51371ee973aa1e583dc0458f43bca827b6755dc Mon Sep 17 00:00:00 2001 From: rachanapatel Date: Sun, 8 Jun 2025 14:38:39 -0400 Subject: [PATCH 9/9] updated Task model, send_msg(), and send_tasks_to_goals() --- app/models/task.py | 16 +++++++------- app/routes/goal_routes.py | 4 +--- app/routes/task_routes.py | 13 ++--------- migrations/versions/3e5556e952bf_.py | 32 ++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 migrations/versions/3e5556e952bf_.py diff --git a/app/models/task.py b/app/models/task.py index 799e9c248..71ab99b0a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,18 +10,18 @@ class Task(db.Model): title: Mapped[str] description: Mapped[str] completed_at: Mapped[datetime] = mapped_column(default=None, nullable=True) - is_complete: Mapped[bool] = mapped_column(default=False) - # if completed_at: - # is_complete = True goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") def to_dict(self): - task_as_dict = {} - task_as_dict["id"] = self.id - task_as_dict["title"] = self.title - task_as_dict["description"] = self.description - task_as_dict["is_complete"] = self.is_complete + task_as_dict = { + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": True if self.completed_at else False + } + if self.completed_at: + task_as_dict["completed_at"] = self.completed_at if self.goal_id: task_as_dict["goal_id"] = self.goal_id return task_as_dict diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index c0289bd34..ce8931df8 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -26,7 +26,7 @@ def create_tasks(): @goals_bp.get("") def get_all_goals(): - query = db.Select(Goal) + query = db.select(Goal) # sort_param = request.args.get("sort") # if sort_param == "asc": @@ -103,8 +103,6 @@ def send_tasks_to_goals(goal_id): for task_id in request_body["task_ids"]: new_task = validate_model(Task, task_id) new_task.goal_id = goal_id - db.session.commit() - db.session.commit() response = {"id": goal.id, diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 268909b0f..f2a7afb4b 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -26,7 +26,7 @@ def get_one_task(task_id): @tasks_bp.get("") def get_all_tasks(): - query = db.Select(Task) + query = db.select(Task) sort_param = request.args.get("sort") if sort_param == "asc": @@ -64,18 +64,9 @@ def delete_task(task_id): def mark_complete(task_id): task = validate_model(Task, task_id) - if (task.id == 1): - send_msg(task) - # client = WebClient(token=os.environ.get('SLACK_BOT_TOKEN')) - # channel_id = "task-notifications" - # client.chat_postMessage(channel=channel_id, - # text="Someone just completed the task My Beautiful Task") + send_msg(task) task.completed_at = datetime.now() - - if task.completed_at: - task.is_complete = True - db.session.commit() return Response(status=204, mimetype="application/json") diff --git a/migrations/versions/3e5556e952bf_.py b/migrations/versions/3e5556e952bf_.py new file mode 100644 index 000000000..c93725ef5 --- /dev/null +++ b/migrations/versions/3e5556e952bf_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 3e5556e952bf +Revises: 99d29e3ba3ac +Create Date: 2025-06-08 13:04:04.642644 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3e5556e952bf' +down_revision = '99d29e3ba3ac' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_column('is_complete') + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=False)) + + # ### end Alembic commands ###