From aa982c47c9dec5b735fe3cc19206c270495cc604 Mon Sep 17 00:00:00 2001 From: KateM Date: Thu, 1 May 2025 13:51:48 -0700 Subject: [PATCH 01/19] DB created, .env created, 'migrations' folder exists --- migrations/README | 1 + migrations/alembic.ini | 50 +++++++++++++++++ migrations/env.py | 113 ++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++ 4 files changed, 188 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako 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"} From 9e01b9abc661db481e7f82b71fd8abfae0f6c256 Mon Sep 17 00:00:00 2001 From: KateM Date: Mon, 5 May 2025 18:44:34 -0700 Subject: [PATCH 02/19] Wave_1 tests passed --- app/__init__.py | 4 +- app/models/task.py | 31 +++++++++++ app/routes/__init__.py | 0 app/routes/route_utilities.py | 18 +++++++ app/routes/task_routes.py | 79 +++++++++++++++++++++++++++- migrations/env.py | 2 - migrations/versions/76435b7e6989_.py | 39 ++++++++++++++ tests/test_wave_01.py | 31 ++++++----- 8 files changed, 186 insertions(+), 18 deletions(-) create mode 100644 app/routes/__init__.py create mode 100644 app/routes/route_utilities.py create mode 100644 migrations/versions/76435b7e6989_.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..cf60621e9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,7 @@ from flask import Flask from .db import db, migrate from .models import task, goal +from .routes.task_routes import bp as tasks_bp import os def create_app(config=None): @@ -17,6 +18,7 @@ def create_app(config=None): db.init_app(app) migrate.init_app(app, db) - # Register Blueprints here + # Register Blueprints + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..78109b1e2 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,36 @@ from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy import DateTime +from datetime import datetime from ..db import db class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) + + @classmethod + def from_dict(cls, task_data): + return cls( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at") + ) + + # new_task = Task(title=task_data["title"], + # description=task_data["description"], + # completed_at=task_data["completed_at"]) + # return new_task + + def to_dict(self, include_completed_at=False): + task_as_dict = { + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + + if include_completed_at: + task_as_dict["completed_at"] = self.completed_at + + return task_as_dict \ No newline at end of file diff --git a/app/routes/__init__.py b/app/routes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..f8b9db86e --- /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__} with {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__} with {model_id} does not exist"} + 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 3aae38d49..f00bd7e46 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,78 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, request, Response +from app.models.task import Task +from ..db import db +from .route_utilities import validate_model + +bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +#Wave 1 +@bp.post("") +def create_task(): + request_body = request.get_json() + + try: + new_task = Task.from_dict(request_body) + + except KeyError as error: + if "description" not in request_body or "title" not in request_body: + response = {"details": "Invalid data"} + else: + response = {"details": f"Invalid request: missing {error.args[0]}"} + + abort(make_response(response, 400)) + + db.session.add(new_task) + db.session.commit() + + return {"task": new_task.to_dict()}, 201 + +#Wave 3 and Wave 5 +@bp.get("") +def get_all_tasks(): + query = db.select(Task) + description_param = request.args.get("description") + if description_param: + query = query.where(Task.description.ilike(f"%{description_param}%")) + + completed_at_param = request.args.get("completed_at") + if completed_at_param: + query = query.where(Task.completed_at.like=={completed_at_param}) + + query = query.order_by(Task.id) + tasks = db.session.scalars(query) + + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_dict()) + + return tasks_response + +#Wave 1 +@bp.get("/") +def get_one_task(task_id): + task = validate_model(Task, task_id) + return {"task": task.to_dict()} + +#Wave 4 +@bp.put("/") +def update_one_task(task_id): + task = validate_model(Task, task_id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + task.completed_at = request_body.get("completed_at") + db.session.commit() + # needs fixing + return Response(status=204, mimetype="application/json") + +#Wave 4 +@bp.delete("/") +def delete_one_task(task_id): + task = validate_model(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/env.py b/migrations/env.py index 4c9709271..7cfdccb86 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -1,8 +1,6 @@ import logging from logging.config import fileConfig - from flask import current_app - from alembic import context # this is the Alembic Config object, which provides diff --git a/migrations/versions/76435b7e6989_.py b/migrations/versions/76435b7e6989_.py new file mode 100644 index 000000000..4bd90e635 --- /dev/null +++ b/migrations/versions/76435b7e6989_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 76435b7e6989 +Revises: +Create Date: 2025-05-01 14:05:25.215222 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '76435b7e6989' +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..023477b5d 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 with 1 does not exist"} - 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": "Task with 1 does not exist"} - 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 with 1 does not exist"} - 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 72e5c1d30bd95d2e761da63aec32fa56e35343ee Mon Sep 17 00:00:00 2001 From: KateM Date: Tue, 6 May 2025 13:50:53 -0700 Subject: [PATCH 03/19] Wave_2 done --- app/routes/task_routes.py | 9 ++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index f00bd7e46..37c49452f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -30,6 +30,7 @@ def create_task(): @bp.get("") def get_all_tasks(): query = db.select(Task) + description_param = request.args.get("description") if description_param: query = query.where(Task.description.ilike(f"%{description_param}%")) @@ -37,7 +38,13 @@ def get_all_tasks(): completed_at_param = request.args.get("completed_at") if completed_at_param: query = query.where(Task.completed_at.like=={completed_at_param}) - + + sort_param = request.args.get("sort") + if sort_param == "asc": + query = query.order_by(Task.title.asc()) + elif sort_param == "desc": + query = query.order_by(Task.title.desc()) + query = query.order_by(Task.id) tasks = db.session.scalars(query) 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 24f685b571ce6fc2b999ec2478ccbf0ddaeb4f3f Mon Sep 17 00:00:00 2001 From: KateM Date: Tue, 6 May 2025 16:53:43 -0700 Subject: [PATCH 04/19] Wave 3 done --- app/routes/task_routes.py | 44 ++++++++++++++++++++++++++++++++++++--- tests/test_wave_03.py | 18 +++++++++------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 37c49452f..723afcbc8 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,6 +2,8 @@ from app.models.task import Task from ..db import db from .route_utilities import validate_model +from datetime import datetime +from datetime import timezone bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -60,7 +62,7 @@ def get_one_task(task_id): task = validate_model(Task, task_id) return {"task": task.to_dict()} -#Wave 4 +#Wave 1 @bp.put("/") def update_one_task(task_id): task = validate_model(Task, task_id) @@ -73,7 +75,7 @@ def update_one_task(task_id): # needs fixing return Response(status=204, mimetype="application/json") -#Wave 4 +#Wave 1 @bp.delete("/") def delete_one_task(task_id): task = validate_model(Task, task_id) @@ -82,4 +84,40 @@ def delete_one_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") - \ No newline at end of file + +# Wave 3 +@bp.patch("//mark_complete") +def completed_task(task_id): + task = validate_model(Task, task_id) + task.completed_at = datetime.now(timezone.utc) + + db.session.commit() + return Response(status=204, mimetype="application/json") + +# Wave 3 +@bp.patch("//mark_incomplete") +def incomplete_task(task_id): + task = validate_model(Task, task_id) + task.completed_at = None + + db.session.commit() + return Response(status=204, mimetype="application/json") + +# Wave 3 +@bp.patch("//mark_complete") +def completed_on_complete_task(task_id): + task = validate_model(Task, task_id) + task.completed_at = datetime.now(timezone.utc) + + db.session.commit() + return Response(status=204, mimetype="application/json") + +# Wave 3 +@bp.patch("//mark_incomplete") +def incompleted_on_incomplete_task(task_id): + task = validate_model(Task, task_id) + task.completed_at = None + + db.session.commit() + return Response(status=204, mimetype="application/json") + diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..f214156b9 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': 'Task with 1 does not exist'} - 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': 'Task with 1 does not exist'} - 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 12736a179c0315d52fe96bc9a205406b7be54aff Mon Sep 17 00:00:00 2001 From: KateM Date: Wed, 7 May 2025 00:27:20 -0700 Subject: [PATCH 05/19] Wave 4 done --- app/routes/task_routes.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 723afcbc8..711f4ec46 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -4,6 +4,8 @@ from .route_utilities import validate_model from datetime import datetime from datetime import timezone +import requests +import os bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -121,3 +123,32 @@ def incompleted_on_incomplete_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") +# Wave 4 +# @bp.patch("//mark_complete") +def completed_task_notification_by_API(task_id): + task = validate_model(Task, task_id) + task.title = "My Beautiful Task" + task.completed_at = datetime.now(timezone.utc) + db.session.commit() + + # Send Slack message + slack_url = "https://slack.com/api/chat.postMessage" + slack_token = os.environ.get("SLACK_BOT_TOKEN") + slack_channel = "task-notifications" # Can also be channel ID like "C01ABCXYZ" + + message = { + "channel": slack_channel, + "text": f"Someone just completed the task {task.title}" + } + + headers = { + "Authorization": f"Bearer {slack_token}", + "Content-Type": "application/json" + } + + response = requests.post(slack_url, json=message, headers=headers) + + if not response.ok: + print("Slack message failed:", response.json()) + + return Response(status=204) \ No newline at end of file From 1a999c7a3de74a3b4a38a9e499fffb2b67b43e2a Mon Sep 17 00:00:00 2001 From: KateM Date: Thu, 8 May 2025 00:46:45 -0700 Subject: [PATCH 06/19] Wave 5 done --- app/__init__.py | 2 + app/models/goal.py | 15 ++++++ app/routes/goal_routes.py | 71 +++++++++++++++++++++++++++- app/routes/route_utilities.py | 15 +++++- app/routes/task_routes.py | 19 ++------ migrations/versions/adfe2b4cdb8a_.py | 32 +++++++++++++ tests/test_wave_05.py | 55 +++++++++++++-------- 7 files changed, 170 insertions(+), 39 deletions(-) create mode 100644 migrations/versions/adfe2b4cdb8a_.py diff --git a/app/__init__.py b/app/__init__.py index cf60621e9..d435360f9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from .db import db, migrate from .models import task, goal from .routes.task_routes import bp as tasks_bp +from .routes.goal_routes import bp as goals_bp import os def create_app(config=None): @@ -20,5 +21,6 @@ def create_app(config=None): # Register Blueprints 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..5aa3184af 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,18 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + + @classmethod + def from_dict(cls, task_data): + return cls( + title=task_data["title"] + ) + + def to_dict(self): + task_as_dict = { + "id": self.id, + "title": self.title, + } + + return task_as_dict \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..e88e8f374 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,70 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, request, Response +from app.models.goal import Goal +from ..db import db +from .route_utilities import validate_model, create_model +from datetime import datetime +from datetime import timezone +import requests +import os + +bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + + +@bp.post("") +def create_goal(): + request_body = request.get_json() + new_goal, status_code = create_model(Goal, request_body) + + return {"goal": new_goal}, status_code + + +@bp.get("") +def get_all_goals(): + query = db.select(Goal) + + title_param = request.args.get("title") + if title_param: + query = query.where(Goal.title.ilike(f"%{title_param}%")) + + # sort_param = request.args.get("sort") + # if sort_param == "asc": + # query = query.order_by(Task.title.asc()) + # elif sort_param == "desc": + # query = query.order_by(Task.title.desc()) + + query = query.order_by(Goal.id) + goals = db.session.scalars(query) + + goals_response = [] + for goal in goals: + goals_response.append(goal.to_dict()) + + return goals_response + + +@bp.get("/") +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + return {"goal": goal.to_dict()} + + +@bp.put("/") +def update_one_goal(goal_id): + task = validate_model(Goal, goal_id) + request_body = request.get_json() + + task.title = request_body["title"] + + db.session.commit() + + return Response(status=204, mimetype="application/json") + + +@bp.delete("/") +def delete_one_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 diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index f8b9db86e..8dad04b67 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -15,4 +15,17 @@ def validate_model(cls, model_id): response = {"message": f"{cls.__name__} with {model_id} does not exist"} 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"} + # response = {"message": f"Invalid request: missing {error.args[0]}"} + 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 711f4ec46..1698ff9b3 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,7 +1,7 @@ from flask import Blueprint, abort, make_response, request, Response from app.models.task import Task from ..db import db -from .route_utilities import validate_model +from .route_utilities import validate_model, create_model from datetime import datetime from datetime import timezone import requests @@ -13,22 +13,9 @@ @bp.post("") def create_task(): request_body = request.get_json() - - try: - new_task = Task.from_dict(request_body) - - except KeyError as error: - if "description" not in request_body or "title" not in request_body: - response = {"details": "Invalid data"} - else: - response = {"details": f"Invalid request: missing {error.args[0]}"} - - abort(make_response(response, 400)) - - db.session.add(new_task) - db.session.commit() + new_task, status_code = create_model(Task, request_body) - return {"task": new_task.to_dict()}, 201 + return {"task": new_task}, status_code #Wave 3 and Wave 5 @bp.get("") diff --git a/migrations/versions/adfe2b4cdb8a_.py b/migrations/versions/adfe2b4cdb8a_.py new file mode 100644 index 000000000..412bb79f0 --- /dev/null +++ b/migrations/versions/adfe2b4cdb8a_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: adfe2b4cdb8a +Revises: 76435b7e6989 +Create Date: 2025-05-07 23:42:20.014139 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'adfe2b4cdb8a' +down_revision = '76435b7e6989' +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)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + 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..5018cdebc 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") @@ -12,7 +14,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 +31,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +48,24 @@ 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 response_body == {"message": f"Goal with 1 does not exist"} # ---- Complete Test ---- # assertion 1 goes here # assertion 2 goes here # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,12 +84,19 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + query = db.select(Goal).where(Goal.id == 1) + goal = db.session.scalar(query) + # Assert + assert response.status_code == 204 + assert response.headers.get("Content-Length") == None + assert goal.title == "Updated Goal Title" # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here @@ -94,20 +105,21 @@ def test_update_goal(client, one_goal): # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.get("/goals/1") + response_body = response.get_json() # Assert + assert response.status_code == 404 + assert response_body == {"message": f"Goal with 1 does not exist"} # ---- Complete Assertions Here ---- # assertion 1 goes here # assertion 2 goes here # ---- 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") @@ -121,28 +133,29 @@ def test_delete_goal(client, one_goal): response_body = response.get_json() assert "message" in response_body + assert "Goal with 1 does not exist" in response_body["message"] - 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="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 + assert response.status_code == 404 + assert response_body == {"message": f"Goal with 1 does not exist"} # ---- Complete Assertions Here ---- # assertion 1 goes here # assertion 2 goes here # ---- 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={}) From d0be350723d41bd37c488f717dfb457f084d8b52 Mon Sep 17 00:00:00 2001 From: KateM Date: Thu, 8 May 2025 16:29:48 -0700 Subject: [PATCH 07/19] 1st test of Wave 6 done --- ada-project-docs/wave_06.md | 2 +- app/models/goal.py | 11 +++++---- app/models/task.py | 19 ++++++++++------ app/routes/goal_routes.py | 21 ++++++++++++++++- app/routes/task_routes.py | 22 +++++++++++++++++- migrations/versions/d84fb4711374_.py | 34 ++++++++++++++++++++++++++++ tests/test_wave_06.py | 2 +- 7 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 migrations/versions/d84fb4711374_.py diff --git a/ada-project-docs/wave_06.md b/ada-project-docs/wave_06.md index c05834ef1..75b80777d 100644 --- a/ada-project-docs/wave_06.md +++ b/ada-project-docs/wave_06.md @@ -1,4 +1,4 @@ -# Wave 6: Establishing a One-to-Many Relationship + # Wave 6: Establishing a One-to-Many Relationship ## Goal diff --git a/app/models/goal.py b/app/models/goal.py index 5aa3184af..230c04c02 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,20 +1,23 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from sqlalchemy import ForeignKey +from typing import Optional 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") @classmethod - def from_dict(cls, task_data): + def from_dict(cls, goal_data): return cls( - title=task_data["title"] + title=goal_data["title"] ) def to_dict(self): task_as_dict = { "id": self.id, - "title": self.title, + "title": self.title } return task_as_dict \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 78109b1e2..2e2293f7c 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,4 +1,6 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey +from typing import Optional from sqlalchemy import DateTime from datetime import datetime from ..db import db @@ -8,19 +10,19 @@ class Task(db.Model): title: Mapped[str] description: Mapped[str] completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") @classmethod def from_dict(cls, task_data): + goal_id=task_data.get("goal_id") return cls( title=task_data["title"], description=task_data["description"], - completed_at=task_data.get("completed_at") - ) + completed_at=task_data.get("completed_at"), + goal_id=goal_id + ) - # new_task = Task(title=task_data["title"], - # description=task_data["description"], - # completed_at=task_data["completed_at"]) - # return new_task def to_dict(self, include_completed_at=False): task_as_dict = { @@ -32,5 +34,8 @@ def to_dict(self, include_completed_at=False): if include_completed_at: task_as_dict["completed_at"] = self.completed_at + + if self.goal: + task_as_dict["goal"] = self.goal.title return task_as_dict \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index e88e8f374..54c37aa91 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, abort, make_response, request, Response from app.models.goal import Goal +from app.models.task import Task from ..db import db from .route_utilities import validate_model, create_model from datetime import datetime @@ -67,4 +68,22 @@ def delete_one_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") + +@bp.post("//tasks") +def tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + + request_body = request.get_json() + task_list = request_body.get("task_ids", []) + + for task_id in task_list: + task = validate_model(Task, task_id) + task.goal_id = goal.id + + db.session.commit() + + return { + "id": goal.id, + "task_ids": task_list + } \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 1698ff9b3..e4ff43efb 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, abort, make_response, request, Response from app.models.task import Task +from app.models.goal import Goal from ..db import db from .route_utilities import validate_model, create_model from datetime import datetime @@ -9,6 +10,7 @@ bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + #Wave 1 @bp.post("") def create_task(): @@ -138,4 +140,22 @@ def completed_task_notification_by_API(task_id): if not response.ok: print("Slack message failed:", response.json()) - return Response(status=204) \ No newline at end of file + return Response(status=204) + +# @bp_child.post("") +# def tasks_to_goal(goal_id,list_id): +# goal = validate_model(Goal, goal_id) + +# task_ids = [] +# for task_id in list_id: +# task = validate_model(Task, task_id) +# task.goal_id = goal.goal_id +# task_ids.append(task.task_id) + +# db.session.commit() + +# return { +# "id": goal.goal_id, +# "task_ids": task_ids +# }, 200 + diff --git a/migrations/versions/d84fb4711374_.py b/migrations/versions/d84fb4711374_.py new file mode 100644 index 000000000..750af7242 --- /dev/null +++ b/migrations/versions/d84fb4711374_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: d84fb4711374 +Revises: adfe2b4cdb8a +Create Date: 2025-05-08 16:29:03.502760 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd84fb4711374' +down_revision = 'adfe2b4cdb8a' +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..32b0e7b7e 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={ From bf2f98efa11649196cd5d1073ba553f5241a2660 Mon Sep 17 00:00:00 2001 From: KateM Date: Fri, 9 May 2025 00:29:44 -0700 Subject: [PATCH 08/19] All but one test from Wave 6 --- app/models/goal.py | 22 ++++++++++++++-------- app/models/task.py | 2 +- app/routes/goal_routes.py | 26 ++++++++++++++++++-------- app/routes/route_utilities.py | 13 ++++++++++++- tests/test_wave_06.py | 15 ++++++++------- tests/views.py | 25 +++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 tests/views.py diff --git a/app/models/goal.py b/app/models/goal.py index 230c04c02..0e0f39581 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -10,14 +10,20 @@ class Goal(db.Model): @classmethod def from_dict(cls, goal_data): - return cls( - title=goal_data["title"] - ) + goal = cls(title=goal_data["title"]) + + if "tasks" in goal_data: + goal.tasks = goal_data["tasks"] + return goal + def to_dict(self): - task_as_dict = { + goal_as_dict = { "id": self.id, - "title": self.title - } - - return task_as_dict \ No newline at end of file + "title": self.title, + } + + # if self.tasks: + # goal_as_dict["task_ids"] = [task.id for task in self.tasks] + + return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index 2e2293f7c..b8633faaa 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -36,6 +36,6 @@ def to_dict(self, include_completed_at=False): task_as_dict["completed_at"] = self.completed_at if self.goal: - task_as_dict["goal"] = self.goal.title + task_as_dict["goal_id"] = self.goal.id return task_as_dict \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 54c37aa91..cfdf02204 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -27,14 +27,9 @@ def get_all_goals(): if title_param: query = query.where(Goal.title.ilike(f"%{title_param}%")) - # sort_param = request.args.get("sort") - # if sort_param == "asc": - # query = query.order_by(Task.title.asc()) - # elif sort_param == "desc": - # query = query.order_by(Task.title.desc()) - query = query.order_by(Goal.id) - goals = db.session.scalars(query) + result = db.session.execute(query) + goals = result.scalars().all() goals_response = [] for goal in goals: @@ -86,4 +81,19 @@ def tasks_to_goal(goal_id): return { "id": goal.id, "task_ids": task_list - } \ No newline at end of file + } + +@bp.get("//tasks") +def tasks_for_specific_goal(goal_id): + goal = validate_model(Goal, goal_id) + tasks = goal.tasks + goal_dict = goal.to_dict() + goal_dict["tasks"] = [task.to_dict() for task in tasks] + + return goal_dict, 200 + + # goal = cls(title=goal_data["title"]) + + # # Optionally set tasks if they exist + # if "tasks" in goal_data: + # goal.tasks = [Task.query.get(task_id) for task_id in goal_data["tasks"]] \ No newline at end of file diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 8dad04b67..9e68051ee 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -28,4 +28,15 @@ def create_model(cls, model_data): db.session.add(new_model) db.session.commit() - return new_model.to_dict(), 201 \ No newline at end of file + return new_model.to_dict(), 201 + +def task_to_dict(Task, data): + { + "id": data.id, + "title": data.title, + "description": data.description, + "is_complete": bool(data.completed_at), + "goal": data.goal_id + } + + return task_to_dict \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 32b0e7b7e..e9b7a27b1 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -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,14 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert "message" in 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,11 +77,12 @@ 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") response_body = response.get_json() + print(response_body) # Assert assert response.status_code == 200 @@ -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() diff --git a/tests/views.py b/tests/views.py new file mode 100644 index 000000000..8a81043c7 --- /dev/null +++ b/tests/views.py @@ -0,0 +1,25 @@ +{ + 'id': 1, + 'task_ids': [1], + 'tasks': [ + {'description': 'Notice something new every day', + 'goal_id': 1, + 'id': 1, + 'is_complete': False, + 'title': 'Go on my daily walk 🏞'}], + 'title': 'Build a habit of going outside daily'} + + +{ + "id": 1, + "title": "Build a habit of going outside daily", + "tasks": [ + { + "id": 1, + "goal_id": 1, + "title": "Go on my daily walk 🏞", + "description": "Notice something new every day", + "is_complete": False + } + ] + } \ No newline at end of file From 8b136d17bd2f1fb6d804e29a2a761f6ca2411062 Mon Sep 17 00:00:00 2001 From: KateM Date: Fri, 9 May 2025 00:57:03 -0700 Subject: [PATCH 09/19] Last commit with changes, I hope --- app/routes/goal_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index cfdf02204..f6124d08c 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -70,7 +70,7 @@ def tasks_to_goal(goal_id): goal = validate_model(Goal, goal_id) request_body = request.get_json() - task_list = request_body.get("task_ids", []) + task_list = request_body.get("task_ids") for task_id in task_list: task = validate_model(Task, task_id) From 0268b8d2fbd09184730fa650bfcc8868478b612c Mon Sep 17 00:00:00 2001 From: KateM Date: Fri, 9 May 2025 10:02:53 -0700 Subject: [PATCH 10/19] added 'load_dotenv()' --- app/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index d435360f9..a6516b2c2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,6 +4,9 @@ from .routes.task_routes import bp as tasks_bp from .routes.goal_routes import bp as goals_bp import os +from dotenv import load_dotenv + +load_dotenv() def create_app(config=None): app = Flask(__name__) From f653f6bcc9dde6a0707efa1633519197066c9ed9 Mon Sep 17 00:00:00 2001 From: KateM Date: Fri, 9 May 2025 11:31:04 -0700 Subject: [PATCH 11/19] chatbot changed --- app/routes/task_routes.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index e4ff43efb..757018a98 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -81,10 +81,28 @@ def delete_one_task(task_id): def completed_task(task_id): task = validate_model(Task, task_id) task.completed_at = datetime.now(timezone.utc) + task_title = task.title + send_request_to_slackbot(task_title) db.session.commit() + return Response(status=204, mimetype="application/json") +def send_request_to_slackbot(data): + bot_path = os.environ.get("SLACK_BOT_PATH") + bot_token = os.environ.get("SLACK_BOT_TOKEN") + channel_id = os.environ.get("SLACK_CHANNEL_ID") + message = "Restoration attempt #3 {data}" + + token = f"Bearer {bot_token}" + headers = { + "Content-type": "application/json", + "Authorization": token} + request_body = { + "channel": channel_id, + "text": message + } + # Wave 3 @bp.patch("//mark_incomplete") def incomplete_task(task_id): From faabd97e354a90f6ac7d499c11b8af96e4f7e8b1 Mon Sep 17 00:00:00 2001 From: KateM Date: Fri, 9 May 2025 11:51:50 -0700 Subject: [PATCH 12/19] imported 'load_dotenv()' into 'task_routes.py' --- app/routes/task_routes.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 757018a98..72cd7e057 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -7,6 +7,9 @@ from datetime import timezone import requests import os +from dotenv import load_dotenv + +load_dotenv() bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") From 5f1ee70856d0960961607e1f3a57767dadf25ad3 Mon Sep 17 00:00:00 2001 From: KateM Date: Fri, 9 May 2025 13:51:34 -0700 Subject: [PATCH 13/19] Some changes to Slack bot --- app/routes/goal_routes.py | 8 +-- app/routes/route_utilities.py | 2 + app/routes/task_routes.py | 95 ++++++++++++++--------------------- 3 files changed, 43 insertions(+), 62 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index f6124d08c..2e427c9dd 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -65,6 +65,7 @@ def delete_one_goal(goal_id): return Response(status=204, mimetype="application/json") + @bp.post("//tasks") def tasks_to_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -83,6 +84,7 @@ def tasks_to_goal(goal_id): "task_ids": task_list } + @bp.get("//tasks") def tasks_for_specific_goal(goal_id): goal = validate_model(Goal, goal_id) @@ -91,9 +93,3 @@ def tasks_for_specific_goal(goal_id): goal_dict["tasks"] = [task.to_dict() for task in tasks] return goal_dict, 200 - - # goal = cls(title=goal_data["title"]) - - # # Optionally set tasks if they exist - # if "tasks" in goal_data: - # goal.tasks = [Task.query.get(task_id) for task_id in goal_data["tasks"]] \ No newline at end of file diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 9e68051ee..638fa2720 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -17,6 +17,7 @@ def validate_model(cls, model_id): return model + def create_model(cls, model_data): try: new_model = cls.from_dict(model_data) @@ -30,6 +31,7 @@ def create_model(cls, model_data): return new_model.to_dict(), 201 +# Work in progress def task_to_dict(Task, data): { "id": data.id, diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 72cd7e057..dd32c8eca 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -14,7 +14,6 @@ bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") -#Wave 1 @bp.post("") def create_task(): request_body = request.get_json() @@ -22,7 +21,7 @@ def create_task(): return {"task": new_task}, status_code -#Wave 3 and Wave 5 + @bp.get("") def get_all_tasks(): query = db.select(Task) @@ -50,13 +49,13 @@ def get_all_tasks(): return tasks_response -#Wave 1 + @bp.get("/") def get_one_task(task_id): task = validate_model(Task, task_id) return {"task": task.to_dict()} -#Wave 1 + @bp.put("/") def update_one_task(task_id): task = validate_model(Task, task_id) @@ -69,7 +68,7 @@ def update_one_task(task_id): # needs fixing return Response(status=204, mimetype="application/json") -#Wave 1 + @bp.delete("/") def delete_one_task(task_id): task = validate_model(Task, task_id) @@ -80,33 +79,35 @@ def delete_one_task(task_id): return Response(status=204, mimetype="application/json") # Wave 3 -@bp.patch("//mark_complete") -def completed_task(task_id): - task = validate_model(Task, task_id) - task.completed_at = datetime.now(timezone.utc) - task_title = task.title - send_request_to_slackbot(task_title) +# @bp.patch("//mark_complete") +# def completed_task(task_id): +# task = validate_model(Task, task_id) +# task.completed_at = datetime.now(timezone.utc) +# print(f'********* mark_complete {task_id} {task.completed_at}') +# task_title = task.title +# send_request_to_slackbot(task_title) - db.session.commit() +# db.session.commit() - return Response(status=204, mimetype="application/json") +# return Response(status=204, mimetype="application/json") -def send_request_to_slackbot(data): - bot_path = os.environ.get("SLACK_BOT_PATH") - bot_token = os.environ.get("SLACK_BOT_TOKEN") - channel_id = os.environ.get("SLACK_CHANNEL_ID") - message = "Restoration attempt #3 {data}" +# def send_request_to_slackbot(data): +# print(f'********* request_to_slackbot') +# bot_path = os.environ.get("SLACK_BOT_PATH") +# bot_token = os.environ.get("SLACK_BOT_TOKEN") +# channel_id = os.environ.get("SLACK_CHANNEL_ID") +# message = "Restoration attempt #3 {data}" + +# token = f"Bearer {bot_token}" +# headers = { +# "Content-type": "application/json", +# "Authorization": token} +# request_body = { +# "channel": channel_id, +# "text": message +# } - token = f"Bearer {bot_token}" - headers = { - "Content-type": "application/json", - "Authorization": token} - request_body = { - "channel": channel_id, - "text": message - } -# Wave 3 @bp.patch("//mark_incomplete") def incomplete_task(task_id): task = validate_model(Task, task_id) @@ -115,16 +116,16 @@ def incomplete_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") -# Wave 3 -@bp.patch("//mark_complete") -def completed_on_complete_task(task_id): - task = validate_model(Task, task_id) - task.completed_at = datetime.now(timezone.utc) - db.session.commit() - return Response(status=204, mimetype="application/json") +# @bp.patch("//mark_complete") +# def completed_on_complete_task(task_id): +# task = validate_model(Task, task_id) +# task.completed_at = datetime.now(timezone.utc) + +# db.session.commit() +# return Response(status=204, mimetype="application/json") + -# Wave 3 @bp.patch("//mark_incomplete") def incompleted_on_incomplete_task(task_id): task = validate_model(Task, task_id) @@ -133,8 +134,8 @@ def incompleted_on_incomplete_task(task_id): db.session.commit() return Response(status=204, mimetype="application/json") -# Wave 4 -# @bp.patch("//mark_complete") + +@bp.patch("//mark_complete") def completed_task_notification_by_API(task_id): task = validate_model(Task, task_id) task.title = "My Beautiful Task" @@ -144,7 +145,7 @@ def completed_task_notification_by_API(task_id): # Send Slack message slack_url = "https://slack.com/api/chat.postMessage" slack_token = os.environ.get("SLACK_BOT_TOKEN") - slack_channel = "task-notifications" # Can also be channel ID like "C01ABCXYZ" + slack_channel = os.environ.get("SLACK_CHANNEL_ID") # Can also be channel ID like "C01ABCXYZ" message = { "channel": slack_channel, @@ -162,21 +163,3 @@ def completed_task_notification_by_API(task_id): print("Slack message failed:", response.json()) return Response(status=204) - -# @bp_child.post("") -# def tasks_to_goal(goal_id,list_id): -# goal = validate_model(Goal, goal_id) - -# task_ids = [] -# for task_id in list_id: -# task = validate_model(Task, task_id) -# task.goal_id = goal.goal_id -# task_ids.append(task.task_id) - -# db.session.commit() - -# return { -# "id": goal.goal_id, -# "task_ids": task_ids -# }, 200 - From b127d1e8447ed2646237a749f97f0c970de8a878 Mon Sep 17 00:00:00 2001 From: KateM Date: Fri, 9 May 2025 15:31:29 -0700 Subject: [PATCH 14/19] Modified POST for '//tasks', test #2 in Wave 6 passed --- app/routes/goal_routes.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 2e427c9dd..2b6ac13f3 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -71,6 +71,11 @@ def tasks_to_goal(goal_id): goal = validate_model(Goal, goal_id) request_body = request.get_json() + + if "task_ids" in request_body: + for task in goal.tasks: + task.goal_id = None + task_list = request_body.get("task_ids") for task_id in task_list: From 005ed37a415239168d08b47e06794ac965156838 Mon Sep 17 00:00:00 2001 From: KateM Date: Thu, 29 May 2025 18:48:09 -0700 Subject: [PATCH 15/19] fixed red and yellow coments along with some of the others less important (modified class Goal and Task to add more functionality, moved Slack API to utilities) --- app/models/goal.py | 14 ++++++++++-- app/models/task.py | 11 +++++---- app/routes/goal_routes.py | 7 ++---- app/routes/route_utilities.py | 24 +++++++++++++++++++- app/routes/task_routes.py | 42 +++++------------------------------ test_db_connection.py | 19 ++++++++++++++++ tests/test_wave_03.py | 13 +++++++++++ tests/test_wave_05.py | 2 +- tests/test_wave_06.py | 3 ++- 9 files changed, 85 insertions(+), 50 deletions(-) create mode 100644 test_db_connection.py diff --git a/app/models/goal.py b/app/models/goal.py index 0e0f39581..73e419eda 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -12,10 +12,20 @@ class Goal(db.Model): def from_dict(cls, goal_data): goal = cls(title=goal_data["title"]) - if "tasks" in goal_data: - goal.tasks = goal_data["tasks"] return goal + def goal_with_tasks(self): + task_list = [] + + for task in self.tasks: + task = task.to_dict() + task["goal_id"] = self.id + task_list.append(task) + + goal_with_tasks = self.to_dict() + goal_with_tasks["tasks"] = task_list + + return goal_with_tasks def to_dict(self): goal_as_dict = { diff --git a/app/models/task.py b/app/models/task.py index b8633faaa..0e8979a38 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy.orm import Mapped, mapped_column, column_property, relationship from sqlalchemy import ForeignKey from typing import Optional from sqlalchemy import DateTime @@ -9,17 +9,20 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] description: Mapped[str] - completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) + completed_at: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True) + is_complete = column_property(completed_at != None) goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") @classmethod def from_dict(cls, task_data): goal_id=task_data.get("goal_id") + completed_at = task_data.get("completed_at", None) + return cls( title=task_data["title"], description=task_data["description"], - completed_at=task_data.get("completed_at"), + completed_at = completed_at, goal_id=goal_id ) @@ -29,7 +32,7 @@ def to_dict(self, include_completed_at=False): "id": self.id, "title": self.title, "description": self.description, - "is_complete": bool(self.completed_at) + "is_complete": bool(self.is_complete) } if include_completed_at: diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 2b6ac13f3..106164d98 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -93,8 +93,5 @@ def tasks_to_goal(goal_id): @bp.get("//tasks") def tasks_for_specific_goal(goal_id): goal = validate_model(Goal, goal_id) - tasks = goal.tasks - goal_dict = goal.to_dict() - goal_dict["tasks"] = [task.to_dict() for task in tasks] - - return goal_dict, 200 + + return goal.goal_with_tasks(), 200 diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 638fa2720..9e45891e7 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,5 +1,7 @@ from flask import abort, make_response from ..db import db +import os +import requests def validate_model(cls, model_id): try: @@ -41,4 +43,24 @@ def task_to_dict(Task, data): "goal": data.goal_id } - return task_to_dict \ No newline at end of file + return task_to_dict + +def send_message_task_complete_slack(task_title): + slack_url = os.environ.get("SLACK_BOT_PATH") + slack_token = os.environ.get("SLACK_BOT_TOKEN") + slack_channel = os.environ.get("SLACK_CHANNEL_ID") # Can also be channel ID like "C01ABCXYZ" + + message = { + "channel": slack_channel, + "text": f"Someone just completed the task {task_title}" + } + + headers = { + "Authorization": f"Bearer {slack_token}", + "Content-Type": "application/json" + } + + response = requests.post(slack_url, json=message, headers=headers) + + if not response.ok: + print("Slack message failed:", response.json()) \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index dd32c8eca..ba28ed1e5 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,14 +2,12 @@ from app.models.task import Task from app.models.goal import Goal from ..db import db -from .route_utilities import validate_model, create_model +from .route_utilities import validate_model, create_model, send_message_task_complete_slack from datetime import datetime from datetime import timezone import requests import os -from dotenv import load_dotenv -load_dotenv() bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -43,9 +41,7 @@ def get_all_tasks(): query = query.order_by(Task.id) tasks = db.session.scalars(query) - tasks_response = [] - for task in tasks: - tasks_response.append(task.to_dict()) + tasks_response = [task.to_dict() for task in tasks] return tasks_response @@ -107,7 +103,7 @@ def delete_one_task(task_id): # "text": message # } - +# CORRECTED YELLOW ISSUE #2 (There are two route handlers registered for /tasks/id/mark_incomplete) @bp.patch("//mark_incomplete") def incomplete_task(task_id): task = validate_model(Task, task_id) @@ -126,40 +122,14 @@ def incomplete_task(task_id): # return Response(status=204, mimetype="application/json") -@bp.patch("//mark_incomplete") -def incompleted_on_incomplete_task(task_id): - task = validate_model(Task, task_id) - task.completed_at = None - - db.session.commit() - return Response(status=204, mimetype="application/json") - @bp.patch("//mark_complete") def completed_task_notification_by_API(task_id): task = validate_model(Task, task_id) - task.title = "My Beautiful Task" task.completed_at = datetime.now(timezone.utc) db.session.commit() - # Send Slack message - slack_url = "https://slack.com/api/chat.postMessage" - slack_token = os.environ.get("SLACK_BOT_TOKEN") - slack_channel = os.environ.get("SLACK_CHANNEL_ID") # Can also be channel ID like "C01ABCXYZ" - - message = { - "channel": slack_channel, - "text": f"Someone just completed the task {task.title}" - } - - headers = { - "Authorization": f"Bearer {slack_token}", - "Content-Type": "application/json" - } + send_message_task_complete_slack(task.title) - response = requests.post(slack_url, json=message, headers=headers) - - if not response.ok: - print("Slack message failed:", response.json()) - - return Response(status=204) + # ADDED mimetype to fix json + return Response(status=204, mimetype="application/json") diff --git a/test_db_connection.py b/test_db_connection.py new file mode 100644 index 000000000..89ecd0273 --- /dev/null +++ b/test_db_connection.py @@ -0,0 +1,19 @@ +from sqlalchemy import create_engine +import os +from dotenv import load_dotenv + +# Load environment variables from .env file +load_dotenv() + +# Read the DATABASE_URL from the environment +db_url = os.getenv("SQLALCHEMY_DATABASE_URI") +print(f"Connecting to: {db_url}") + +try: + engine = create_engine(db_url) + connection = engine.connect() + print("✅ Connected successfully!") + connection.close() +except Exception as e: + print("❌ Connection failed:") + print(e) \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index f214156b9..63fd40f59 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -46,6 +46,19 @@ 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") +def test_mark_incomplete_on_incomplete_task(client, one_task): + # Act + response = client.patch("/tasks/1/mark_incomplete") + + # Assert + assert response.status_code == 204 + + query = db.select(Task).where(Task.id == 1) + assert db.session.scalar(query).completed_at == None + + + # @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 5018cdebc..fa7893842 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -133,7 +133,7 @@ def test_delete_goal(client, one_goal): response_body = response.get_json() assert "message" in response_body - assert "Goal with 1 does not exist" in response_body["message"] + assert response_body["message"] == "Goal with 1 does not exist" # raise Exception("Complete test with assertion about response body") # ***************************************************************** diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index e9b7a27b1..752a3cd0c 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -50,10 +50,11 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") response_body = response.get_json() + print(response_body) # Assert assert response.status_code == 404 - assert "message" in response_body + assert response_body == {"message": 'Goal with 1 does not exist'} # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** From f8f537d9d62d4377950f0c04a8caf5d7be17e585 Mon Sep 17 00:00:00 2001 From: KateM Date: Sat, 31 May 2025 10:54:29 -0700 Subject: [PATCH 16/19] Added logging configuration and database error handling to __init__.py and Slack API bot --- .gitignore | 3 +++ app/__init__.py | 40 +++++++++++++++++++++++++++++++++-- app/routes/route_utilities.py | 5 ++++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e9b18359..be3d242ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ .vscode .DS_Store +# log files +app.log + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/app/__init__.py b/app/__init__.py index a6516b2c2..87f583fe4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,6 +5,9 @@ from .routes.goal_routes import bp as goals_bp import os from dotenv import load_dotenv +import logging +from logging.config import dictConfig + load_dotenv() @@ -19,11 +22,44 @@ def create_app(config=None): # to override the app's default settings for testing app.config.update(config) - db.init_app(app) - migrate.init_app(app, db) + try: + db.init_app(app) + migrate.init_app(app, db) + logger.info("Database initialized successfully.") + + with app.app_context(): + db.session.execute("SELECT 1") + logger.info("DB connection test passed") + except Exception as e: + logger.exception("Error during DB initialization or connection") # Register Blueprints app.register_blueprint(tasks_bp) app.register_blueprint(goals_bp) + + # configure_logging(app) + + configure_logging(app) + logger = logging.getLogger(__name__) + + return app + + +def configure_logging(app): + # Clear any default Flask handlers (useful for avoiding duplicate logs) + for handler in app.logger.handlers: + app.logger.removeHandler(handler) + + logging.basicConfig( + level=logging.INFO, + format='%(asctime)s %(levelname)s: %(message)s [in %(pathname)s:%(lineno)d]', + handlers=[ + logging.StreamHandler(), # logs to console + logging.FileHandler("app.log") # log to file + ] + ) + + # log Flask startup + logging.getLogger().info("Logging is set up.") diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 9e45891e7..c550dd215 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -2,6 +2,8 @@ from ..db import db import os import requests +import logging + def validate_model(cls, model_id): try: @@ -63,4 +65,5 @@ def send_message_task_complete_slack(task_title): response = requests.post(slack_url, json=message, headers=headers) if not response.ok: - print("Slack message failed:", response.json()) \ No newline at end of file + logger = logging.getLogger(__name__) + logger.error(f"Slack message failed: {response.json()}") From bb197c7fce4ea5133746157cebf355961ab97e9f Mon Sep 17 00:00:00 2001 From: KateM Date: Sat, 31 May 2025 17:33:38 -0700 Subject: [PATCH 17/19] created `delete_model` in route_utilities and implemented it into goal and task routes. Final commit --- app/__init__.py | 9 ++++++--- app/routes/goal_routes.py | 8 ++------ app/routes/route_utilities.py | 11 ++++++++++- app/routes/task_routes.py | 8 ++------ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 87f583fe4..80794b487 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -11,9 +11,14 @@ load_dotenv() + def create_app(config=None): app = Flask(__name__) + # configure_logging(app) + configure_logging(app) + logger = logging.getLogger(__name__) + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') @@ -28,7 +33,7 @@ def create_app(config=None): logger.info("Database initialized successfully.") with app.app_context(): - db.session.execute("SELECT 1") + # db.session.execute("SELECT 1") logger.info("DB connection test passed") except Exception as e: logger.exception("Error during DB initialization or connection") @@ -42,8 +47,6 @@ def create_app(config=None): configure_logging(app) logger = logging.getLogger(__name__) - - return app diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 106164d98..f8ed94383 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -2,7 +2,7 @@ from app.models.goal import Goal from app.models.task import Task from ..db import db -from .route_utilities import validate_model, create_model +from .route_utilities import validate_model, create_model, delete_model from datetime import datetime from datetime import timezone import requests @@ -58,12 +58,8 @@ def update_one_goal(goal_id): @bp.delete("/") def delete_one_goal(goal_id): - goal = validate_model(Goal, goal_id) - - db.session.delete(goal) - db.session.commit() - return Response(status=204, mimetype="application/json") + return delete_model(Goal, goal_id) @bp.post("//tasks") diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index c550dd215..8bfcaa348 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,4 +1,4 @@ -from flask import abort, make_response +from flask import abort, make_response, Response from ..db import db import os import requests @@ -35,6 +35,15 @@ def create_model(cls, model_data): return new_model.to_dict(), 201 +def delete_model(cls, model_id): + model = validate_model(cls, model_id) + + db.session.delete(model) + db.session.commit() + + return Response(status=204, mimetype="application/json") + + # Work in progress def task_to_dict(Task, data): { diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index ba28ed1e5..d1d47009f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,7 +2,7 @@ from app.models.task import Task from app.models.goal import Goal from ..db import db -from .route_utilities import validate_model, create_model, send_message_task_complete_slack +from .route_utilities import validate_model, create_model, delete_model, send_message_task_complete_slack from datetime import datetime from datetime import timezone import requests @@ -67,12 +67,8 @@ def update_one_task(task_id): @bp.delete("/") def delete_one_task(task_id): - task = validate_model(Task, task_id) - - db.session.delete(task) - db.session.commit() - return Response(status=204, mimetype="application/json") + return delete_model(Task, task_id) # Wave 3 # @bp.patch("//mark_complete") From cce9649254a34b3c732084d85c2fb9629930bbc2 Mon Sep 17 00:00:00 2001 From: KateM Date: Tue, 17 Jun 2025 22:04:18 -0700 Subject: [PATCH 18/19] CORS for frontend added --- app/__init__.py | 2 ++ requirements.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index 80794b487..6cbe66358 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,6 +7,7 @@ from dotenv import load_dotenv import logging from logging.config import dictConfig +from flask_cors import CORS load_dotenv() @@ -14,6 +15,7 @@ def create_app(config=None): app = Flask(__name__) + CORS(app) # Enable CORS for all routes # configure_logging(app) configure_logging(app) diff --git a/requirements.txt b/requirements.txt index b989cae17..ef800efe0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ charset-normalizer==3.4.1 click==8.1.8 coverage==7.6.12 Flask==3.1.0 +flask_cors==6.0.1 Flask-Migrate==4.1.0 Flask-SQLAlchemy==3.1.1 gunicorn==23.0.0 From e3c7a8a9061e4ef3500af0c737c64f8ba2d6e6b0 Mon Sep 17 00:00:00 2001 From: KateM Date: Tue, 17 Jun 2025 22:53:09 -0700 Subject: [PATCH 19/19] rtyhrsty --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 6cbe66358..2d0bcfc34 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,7 +15,7 @@ def create_app(config=None): app = Flask(__name__) - CORS(app) # Enable CORS for all routes + # CORS(app) # Enable CORS for all routes # configure_logging(app) configure_logging(app)