From 67cb122ee9dac64b3820d5fca3a64150d398d0d0 Mon Sep 17 00:00:00 2001 From: Dennif Date: Tue, 6 May 2025 01:42:58 -0700 Subject: [PATCH 01/13] Set up project and generate migrations folder --- 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 704f9b8a1e31c9dd8af313b388347d4fe9a1417b Mon Sep 17 00:00:00 2001 From: Dennif Date: Tue, 6 May 2025 02:26:36 -0700 Subject: [PATCH 02/13] imports and blue prints in __init__.py and task models with class Task implemented --- app/__init__.py | 4 ++++ app/models/task.py | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..63e3bc8bb 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,8 @@ from flask import Flask from .db import db, migrate from .models import task, goal +from .routes.goal_routes import goals_bp +from .routes.task_routes import tasks_bp import os def create_app(config=None): @@ -18,5 +20,7 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here + app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..45708a0ce 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,27 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from datetime import datetime +from typing import Optional class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) + + @classmethod + def from_dict(cls, task_data): + new_task = Task(title=task_data["title"], + description=task_data["description"], + completed_at=task_data["completed_at"]) + + return new_task + + 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["completed_at"] = self.completed_at + + return task_as_dict From 07c01d972ab3a0cac64f08f1b6acc0d0790d078b Mon Sep 17 00:00:00 2001 From: Dennif Date: Tue, 6 May 2025 16:22:05 -0700 Subject: [PATCH 03/13] wave 01 implemented --- app/__init__.py | 4 +- app/models/task.py | 2 +- app/routes/task_routes.py | 96 ++++++++++++++++++- .../versions/c633ca08986d_adds_task_model.py | 39 ++++++++ 4 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/c633ca08986d_adds_task_model.py diff --git a/app/__init__.py b/app/__init__.py index 63e3bc8bb..b75145a95 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,7 @@ from flask import Flask from .db import db, migrate from .models import task, goal -from .routes.goal_routes import goals_bp +# from .routes.goal_routes import goals_bp from .routes.task_routes import tasks_bp import os @@ -21,6 +21,6 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(tasks_bp) - app.register_blueprint(goals_bp) + # app.register_blueprint(goals_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 45708a0ce..656cbf17e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -22,6 +22,6 @@ def to_dict(self): task_as_dict["id"] = self.id task_as_dict["title"] = self.title task_as_dict["description"] = self.description - task_as_dict["completed_at"] = self.completed_at + task_as_dict["is_complete"] = self.completed_at is not None return task_as_dict diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..3077cc917 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,95 @@ -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 datetime import datetime + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +@tasks_bp.post("") +def create_task(): + request_body = request.get_json() + + try: + new_task = Task.from_dict(request_body) + + except KeyError as error: + response = {"message": f"Invalid request: missing {error.args[0]}"} + abort(make_response(response, 400)) + + db.session.add(new_task) + db.session.commit() + + return new_task.to_dict(), 201 + + +@tasks_bp.get("") +def get_all_tasks(): + query = db.select(Task) + + title_param = request.args.get("title") + if title_param: + query = query.where(Task.title.ilike(f"%{title_param}%")) + + description_param = request.args.get("description") + if description_param: + query = query.where(Task.description.ilike(f"%{description_param}%")) + + query = query.order_by(Task.id) + + tasks = db.session.scalars(query) + tasks_response = [task.to_dict() for task in tasks] + return tasks_response + +@tasks_bp.get("/") +def get_one_task(task_id): + task = validate_task(task_id) + + return task.to_dict() + +def validate_task(task_id): + try: + task_id = int(task_id) + except: + response = {"message": f"task {task_id} invalid"} + abort(make_response(response , 400)) + + 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.put("/") +def update_task(task_id): + task = validate_task(task_id) + request_body = request.get_json() + + # Actualiza campos requeridos + task.title = request_body["title"] + task.description = request_body["description"] + + # Manejo de completed_at (puede venir como null o string en formato ISO) + completed_at_value = request_body.get("completed_at") + if completed_at_value: + try: + task.completed_at = datetime.fromisoformat(completed_at_value) + except ValueError: + response = {"message": "Invalid datetime format for completed_at. Expected ISO 8601 format."} + abort(make_response(response, 400)) + else: + task.completed_at = None # Si es null o no se incluye + + 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/versions/c633ca08986d_adds_task_model.py b/migrations/versions/c633ca08986d_adds_task_model.py new file mode 100644 index 000000000..427503445 --- /dev/null +++ b/migrations/versions/c633ca08986d_adds_task_model.py @@ -0,0 +1,39 @@ +"""adds task model + +Revision ID: c633ca08986d +Revises: +Create Date: 2025-05-06 02:30:30.781664 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c633ca08986d' +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 ### From eb5295716fff2fcf3384727f61f649ad755a1211 Mon Sep 17 00:00:00 2001 From: Dennif Date: Tue, 6 May 2025 18:54:15 -0700 Subject: [PATCH 04/13] all test wave 01 passing --- app/models/task.py | 9 +++++---- app/routes/task_routes.py | 15 +++++++------- tests/test_wave_01.py | 42 +++++++++++++++------------------------ 3 files changed, 28 insertions(+), 38 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 656cbf17e..3d165d5fd 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -11,9 +11,11 @@ class Task(db.Model): @classmethod def from_dict(cls, task_data): - new_task = Task(title=task_data["title"], - description=task_data["description"], - completed_at=task_data["completed_at"]) + new_task = Task( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at") + ) return new_task @@ -23,5 +25,4 @@ def to_dict(self): task_as_dict["title"] = self.title task_as_dict["description"] = self.description task_as_dict["is_complete"] = self.completed_at is not None - return task_as_dict diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3077cc917..a1793a78e 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -11,15 +11,14 @@ def create_task(): try: new_task = Task.from_dict(request_body) - - except KeyError as error: - response = {"message": f"Invalid request: missing {error.args[0]}"} + except KeyError: + response = {"details": "Invalid data"} abort(make_response(response, 400)) db.session.add(new_task) - db.session.commit() - - return new_task.to_dict(), 201 + db.session.commit() + + return {"task": new_task.to_dict()}, 201 @tasks_bp.get("") @@ -40,11 +39,11 @@ def get_all_tasks(): tasks_response = [task.to_dict() for task in tasks] return tasks_response +@tasks_bp.get("/") @tasks_bp.get("/") def get_one_task(task_id): task = validate_task(task_id) - - return task.to_dict() + return {"task": task.to_dict()}, 200 def validate_task(task_id): try: diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 55475db79..3b5f44c03 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,10 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "task 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -97,7 +93,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 +113,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 +124,11 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert "message" in response_body + assert response_body["message"] == "task 1 not found" -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -146,7 +139,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,16 +147,13 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert "message" in response_body + assert response_body["message"] == "task 1 not found" 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 +170,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 8f61fc905a34b6a5147f1e9f7f6e2f210c1284c7 Mon Sep 17 00:00:00 2001 From: Dennif Date: Tue, 6 May 2025 19:27:16 -0700 Subject: [PATCH 05/13] wave 02 finished, helperf fuinction for sort implemented --- app/routes/task_routes.py | 17 +++++++++++++++-- tests/test_wave_02.py | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index a1793a78e..636c9fbc3 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 sqlalchemy import asc, desc tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -33,7 +34,8 @@ def get_all_tasks(): if description_param: query = query.where(Task.description.ilike(f"%{description_param}%")) - query = query.order_by(Task.id) + sort_param = request.args.get("sort") + query = query.order_by(get_sort_order(sort_param)) tasks = db.session.scalars(query) tasks_response = [task.to_dict() for task in tasks] @@ -91,4 +93,15 @@ def delete_task(task_id): db.session.delete(task) db.session.commit() - return Response(status=204, mimetype="application/json") \ No newline at end of file + return Response(status=204, mimetype="application/json") + +def get_sort_order(sort_param): + if sort_param == "asc": + return Task.title.asc() + elif sort_param == "desc": + return Task.title.desc() + elif sort_param == "id": + return Task.id.asc() + elif sort_param == "is_complete": + return Task.is_complete.asc() + return Task.id \ No newline at end of file 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 6721b739e324aa0678cff537ed9e16bf5d751787 Mon Sep 17 00:00:00 2001 From: Dennif Date: Wed, 7 May 2025 17:43:07 -0700 Subject: [PATCH 06/13] wave 03 finished, tasks complete or imcomplete --- app/routes/route_utilities.py | 18 +++++++++++++++ app/routes/task_routes.py | 43 ++++++++++++++++++++++------------- 2 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 app/routes/route_utilities.py 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 636c9fbc3..7b9482b42 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -3,6 +3,7 @@ from ..db import db from datetime import datetime from sqlalchemy import asc, desc +from .route_utilities import validate_model tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -44,28 +45,15 @@ def get_all_tasks(): @tasks_bp.get("/") @tasks_bp.get("/") def get_one_task(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) return {"task": task.to_dict()}, 200 -def validate_task(task_id): - try: - task_id = int(task_id) - except: - response = {"message": f"task {task_id} invalid"} - abort(make_response(response , 400)) - - 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.put("/") def update_task(task_id): - task = validate_task(task_id) + task = validate_model(Task,task_id) request_body = request.get_json() # Actualiza campos requeridos @@ -89,12 +77,35 @@ 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() return Response(status=204, mimetype="application/json") +#wave 03 +@tasks_bp.patch("//mark_complete") +def mark_task_complete(task_id): + task = validate_model(Task, task_id) + + # Actualiza completed_at al momento actual (UTC) + task.completed_at = datetime.utcnow() + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@tasks_bp.patch("//mark_incomplete") +def mark_task_incomplete(task_id): + task = validate_model(Task, task_id) + + # Establece completed_at como None (incompleta) + task.completed_at = None + db.session.commit() + + return Response(status=204, mimetype="application/json") + + + def get_sort_order(sort_param): if sort_param == "asc": return Task.title.asc() From 9efd12f144ebd2e2ee9e7600b820e343ba9de3b9 Mon Sep 17 00:00:00 2001 From: Dennif Date: Thu, 8 May 2025 10:00:33 -0700 Subject: [PATCH 07/13] wave 04 finished, app connected with slack yeey! --- app/__init__.py | 2 ++ app/routes/task_routes.py | 67 +++++++++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index b75145a95..d92d75fc2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,8 +4,10 @@ # from .routes.goal_routes import goals_bp from .routes.task_routes import tasks_bp import os +from dotenv import load_dotenv def create_app(config=None): + load_dotenv() app = Flask(__name__) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 7b9482b42..8d1e4a61f 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,9 +1,11 @@ -from flask import Blueprint, abort,make_response,request,Response +from flask import Blueprint, abort,make_response, request, Response, current_app from app.models.task import Task from ..db import db from datetime import datetime from sqlalchemy import asc, desc from .route_utilities import validate_model +import requests +import os tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -42,14 +44,14 @@ def get_all_tasks(): tasks_response = [task.to_dict() for task in tasks] return tasks_response -@tasks_bp.get("/") + @tasks_bp.get("/") def get_one_task(task_id): task = validate_model(Task,task_id) return {"task": task.to_dict()}, 200 - return task + @tasks_bp.put("/") def update_task(task_id): @@ -84,28 +86,65 @@ def delete_task(task_id): return Response(status=204, mimetype="application/json") #wave 03 +# @tasks_bp.patch("//mark_complete") +# def mark_task_complete(task_id): +# task = validate_model(Task, task_id) + +# # Actualiza completed_at al momento actual (UTC) +# task.completed_at = datetime.utcnow() +# db.session.commit() + +# return Response(status=204, mimetype="application/json") + +# @tasks_bp.patch("//mark_incomplete") +# def mark_task_incomplete(task_id): +# task = validate_model(Task, task_id) + +# # Establece completed_at como None (incompleta) +# task.completed_at = None +# db.session.commit() + +# return Response(status=204, mimetype="application/json") + + +#Slack @tasks_bp.patch("//mark_complete") def mark_task_complete(task_id): task = validate_model(Task, task_id) + request_body = request.get_json() + + # Valida que el mensaje esté en el request + if not request_body or "slack_message" not in request_body: + abort(make_response({"error": "Field 'slack_message' is required"}, 400)) # 👈 Error claro - # Actualiza completed_at al momento actual (UTC) + # 1. Actualiza la tarea task.completed_at = datetime.utcnow() db.session.commit() - return Response(status=204, mimetype="application/json") - -@tasks_bp.patch("//mark_incomplete") -def mark_task_incomplete(task_id): - task = validate_model(Task, task_id) + # 2. Envía el mensaje personalizado a Slack + slack_token = os.environ.get("SLACK_BOT_TOKEN") + channel = os.environ.get("SLACK_CHANNEL", "task-notifications") - # Establece completed_at como None (incompleta) - task.completed_at = None - db.session.commit() + if slack_token: + try: + response = requests.post( + "https://slack.com/api/chat.postMessage", + headers={ + "Authorization": f"Bearer {slack_token}", + "Content-Type": "application/json" + }, + json={ + "channel": channel, + "text": request_body["slack_message"] + } + ) + if not response.json().get("ok"): + current_app.logger.error(f"Slack API error: {response.json()}") + except Exception as e: + current_app.logger.error(f"Error sending to Slack: {str(e)}") return Response(status=204, mimetype="application/json") - - def get_sort_order(sort_param): if sort_param == "asc": return Task.title.asc() From eab0d88c0936ea9f2c1fb9a83b694e6d3e667e05 Mon Sep 17 00:00:00 2001 From: Dennif Date: Thu, 8 May 2025 10:45:47 -0700 Subject: [PATCH 08/13] blue print updated, test 03 passing --- app/__init__.py | 4 +++- app/routes/task_routes.py | 34 ++++++++-------------------------- tests/test_wave_03.py | 28 ++++++++++++---------------- 3 files changed, 23 insertions(+), 43 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index d92d75fc2..375662a4f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,7 +2,8 @@ from .db import db, migrate from .models import task, goal # from .routes.goal_routes import goals_bp -from .routes.task_routes import tasks_bp +from .routes.task_routes import bp as tasks_bp +from .routes.task_routes import bp as goal_bp import os from dotenv import load_dotenv @@ -23,6 +24,7 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(tasks_bp) + app.register_blueprint(goal_bp) # app.register_blueprint(goals_bp) return app diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 8d1e4a61f..2825e195b 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -7,9 +7,9 @@ import requests import os -tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") -@tasks_bp.post("") +@bp.post("") def create_task(): request_body = request.get_json() @@ -25,7 +25,7 @@ def create_task(): return {"task": new_task.to_dict()}, 201 -@tasks_bp.get("") +@bp.get("") def get_all_tasks(): query = db.select(Task) @@ -45,7 +45,7 @@ def get_all_tasks(): return tasks_response -@tasks_bp.get("/") +@bp.get("/") def get_one_task(task_id): task = validate_model(Task,task_id) return {"task": task.to_dict()}, 200 @@ -53,7 +53,7 @@ def get_one_task(task_id): -@tasks_bp.put("/") +@bp.put("/") def update_task(task_id): task = validate_model(Task,task_id) request_body = request.get_json() @@ -77,7 +77,7 @@ def update_task(task_id): return Response(status=204, mimetype="application/json") -@tasks_bp.delete("/") +@bp.delete("/") def delete_task(task_id): task = validate_model(Task,task_id) db.session.delete(task) @@ -85,30 +85,12 @@ def delete_task(task_id): return Response(status=204, mimetype="application/json") -#wave 03 -# @tasks_bp.patch("//mark_complete") -# def mark_task_complete(task_id): -# task = validate_model(Task, task_id) - -# # Actualiza completed_at al momento actual (UTC) -# task.completed_at = datetime.utcnow() -# db.session.commit() - -# return Response(status=204, mimetype="application/json") -# @tasks_bp.patch("//mark_incomplete") -# def mark_task_incomplete(task_id): -# task = validate_model(Task, task_id) - -# # Establece completed_at como None (incompleta) -# task.completed_at = None -# db.session.commit() - -# return Response(status=204, mimetype="application/json") + #Slack -@tasks_bp.patch("//mark_complete") +@bp.patch("//mark_complete") def mark_task_complete(task_id): task = validate_model(Task, task_id) request_body = request.get_json() diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index d7d441695..727992ec9 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,12 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == { + "message": "Task 1 not found" + } - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -109,8 +107,6 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "message": "Task 1 not found" + } From 5b237b534bd2d90ee7825ffe511e79a0dbe50796 Mon Sep 17 00:00:00 2001 From: Dennif Date: Thu, 8 May 2025 12:11:53 -0700 Subject: [PATCH 09/13] wave 05 finished create, read, update, and delete different goals. --- app/__init__.py | 5 +- app/models/goal.py | 15 +++ app/routes/goal_routes.py | 51 +++++++++- app/routes/route_utilities.py | 4 +- .../c0bec6981113_create_goals_table.py | 32 ++++++ tests/conftest.py | 1 + tests/test_wave_05.py | 98 +++++++++++-------- 7 files changed, 161 insertions(+), 45 deletions(-) create mode 100644 migrations/versions/c0bec6981113_create_goals_table.py diff --git a/app/__init__.py b/app/__init__.py index 375662a4f..48082936a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,7 +3,7 @@ from .models import task, goal # from .routes.goal_routes import goals_bp from .routes.task_routes import bp as tasks_bp -from .routes.task_routes import bp as goal_bp +from .routes.goal_routes import bp as goals_bp import os from dotenv import load_dotenv @@ -24,7 +24,6 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(tasks_bp) - app.register_blueprint(goal_bp) - # app.register_blueprint(goals_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..ae45fa5c5 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, goal_data): + new_goal = Goal( + title=goal_data["title"] + ) + return new_goal + + def to_dict(self): + goal_as_dict = { + "id": self.id, + "title": self.title + } + return goal_as_dict \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..0450bb386 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,50 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, Response, abort, make_response +from app.models.goal import Goal +from ..db import db +from .route_utilities import validate_model + +bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@bp.post("") +def create_goal(): + request_body = request.get_json() + + try: + new_goal = Goal.from_dict(request_body) + except KeyError: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + db.session.add(new_goal) + db.session.commit() + + return {"goal": new_goal.to_dict()}, 201 + +@bp.get("") +def get_all_goals(): + goals = Goal.query.all() + goals_response = [goal.to_dict() for goal in goals] + return goals_response + +@bp.get("/") +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + return {"goal": goal.to_dict()}, 200 + +@bp.put("/") +def update_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + + goal.title = request_body["title"] + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@bp.delete("/") +def delete_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 2dc8ede2d..e8ecda39a 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,10 +1,12 @@ from flask import abort, make_response from ..db import db +from app.models.task import Task +from app.models.goal import Goal def validate_model(cls, model_id): try: model_id = int(model_id) - except: + except (ValueError, TypeError): response = {"message": f"{cls.__name__} {model_id} invalid"} abort(make_response(response , 400)) diff --git a/migrations/versions/c0bec6981113_create_goals_table.py b/migrations/versions/c0bec6981113_create_goals_table.py new file mode 100644 index 000000000..eda5b869f --- /dev/null +++ b/migrations/versions/c0bec6981113_create_goals_table.py @@ -0,0 +1,32 @@ +"""Create goals table + +Revision ID: c0bec6981113 +Revises: c633ca08986d +Create Date: 2025-05-08 11:26:32.277954 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c0bec6981113' +down_revision = 'c633ca08986d' +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/conftest.py b/tests/conftest.py index a01499583..b1fe67753 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -90,6 +90,7 @@ def one_goal(app): new_goal = Goal(title="Build a habit of going outside daily") db.session.add(new_goal) db.session.commit() + # This fixture gets called in every test that diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 222d10cf0..3fc6cca66 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +12,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +29,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +46,21 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == { + "message": "Goal 1 not found" + } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +79,54 @@ 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") + # Arrange + updated_data = { + "title": "Updated goal title" + } + # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json=updated_data) # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + # assertion 1: response status code is 204 (No Content) + assert response.status_code == 204 + + # assertion 2: the response body is empty + assert response.data == b'' + + # assertion 3: get the updated goal and verify the new title + get_response = client.get("/goals/1") + response_body = get_response.get_json() + + assert get_response.status_code == 200 + assert response_body == { + "goal": { + "id": 1, + "title": "Updated goal title" + } + } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # Act - # ---- Complete Act Here ---- + response = client.put( + "/goals/1", + json={"title": "Updated Title"} + ) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == { + "message": "Goal 1 not found" # Matches validate_model's format + } -@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 +134,33 @@ 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*************** - # ***************************************************************** + assert response.status_code == 404 + assert response_body == { + "message": "Goal 1 not found" + } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == { + "message": "Goal 1 not found" + } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From 5969d96168101abf193d4abcd5a116a330cf803e Mon Sep 17 00:00:00 2001 From: Dennif Date: Thu, 8 May 2025 13:55:45 -0700 Subject: [PATCH 10/13] wave 06 finished goal routes added --- app/models/goal.py | 23 +++++++++----- app/models/task.py | 33 ++++++++++++-------- app/routes/goal_routes.py | 45 +++++++++++++++++++++++++++- app/routes/route_utilities.py | 9 ++---- app/routes/task_routes.py | 12 ++++---- migrations/versions/eaffe09e5d8f_.py | 34 +++++++++++++++++++++ tests/test_wave_06.py | 18 +++++------ 7 files changed, 129 insertions(+), 45 deletions(-) create mode 100644 migrations/versions/eaffe09e5d8f_.py diff --git a/app/models/goal.py b/app/models/goal.py index ae45fa5c5..e4c40c282 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,20 +1,27 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from typing import List, Optional + +from typing import TYPE_CHECKING +if TYPE_CHECKING: 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("Task", back_populates="goal") + @classmethod def from_dict(cls, goal_data): - new_goal = Goal( - title=goal_data["title"] - ) + new_goal = Goal(title=goal_data["title"]) return new_goal - def to_dict(self): - goal_as_dict = { + def to_dict(self, include_tasks=False, include_task_ids=False): + goal_dict = { "id": self.id, "title": self.title } - return goal_as_dict \ No newline at end of file + if include_tasks: + goal_dict["tasks"] = [task.to_dict() for task in self.tasks] + if include_task_ids: + goal_dict["task_ids"] = [task.id for task in self.tasks] + return goal_dict \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 3d165d5fd..f20c5096b 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,28 +1,35 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db from datetime import datetime from typing import Optional +from typing import TYPE_CHECKING +if TYPE_CHECKING: from .goal import Goal + class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] description: Mapped[str] completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) - + goal_id: Mapped[Optional[int]] = mapped_column(db.ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") + @classmethod def from_dict(cls, task_data): new_task = Task( - title=task_data["title"], - description=task_data["description"], - completed_at=task_data.get("completed_at") - ) - + title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at") + ) return new_task 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.completed_at is not None - return task_as_dict + task_dict = { + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + if self.goal_id: + task_dict["goal_id"] = self.goal_id + return task_dict diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 0450bb386..0321ab1a0 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, request, Response, abort, make_response from app.models.goal import Goal +from app.models.task import Task from ..db import db from .route_utilities import validate_model @@ -47,4 +48,46 @@ def delete_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.route("//tasks", methods=["POST"]) +def assign_tasks_to_goal(goal_id): + goal = validate_model(Goal, goal_id) + request_body = request.get_json() + + if not request_body or "task_ids" not in request_body: + abort(400, description={"details": "Invalid data"}) + + + new_tasks = [] + for task_id in request_body["task_ids"]: + task = validate_model(Task, task_id) + new_tasks.append(task) + + + for task in goal.tasks: + task.goal_id = None + + for task in new_tasks: + task.goal_id = goal.id + + db.session.commit() + + return { + "id": goal.id, + "task_ids": request_body["task_ids"] + }, 200 + + + +@bp.route("//tasks", methods=["GET"]) +def get_tasks_for_goal(goal_id): + goal = validate_model(Goal, goal_id) + + return { + "id": goal.id, + "title": goal.title, + "tasks": [task.to_dict() for task in goal.tasks] + }, 200 \ No newline at end of file diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index e8ecda39a..90b95d082 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -7,14 +7,11 @@ def validate_model(cls, model_id): try: model_id = int(model_id) except (ValueError, TypeError): - response = {"message": f"{cls.__name__} {model_id} invalid"} - abort(make_response(response , 400)) + abort(make_response({"message": f"{cls.__name__} {model_id} invalid"}, 400)) - query = db.select(cls).where(cls.id == model_id) - model = db.session.scalar(query) + model = db.session.get(cls, model_id) if not model: - response = {"message": f"{cls.__name__} {model_id} not found"} - abort(make_response(response, 404)) + abort(make_response({"message": f"{cls.__name__} {model_id} not found"}, 404)) return model \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 2825e195b..c6252d357 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -58,11 +58,11 @@ def update_task(task_id): task = validate_model(Task,task_id) request_body = request.get_json() - # Actualiza campos requeridos + task.title = request_body["title"] task.description = request_body["description"] - # Manejo de completed_at (puede venir como null o string en formato ISO) + completed_at_value = request_body.get("completed_at") if completed_at_value: try: @@ -71,7 +71,7 @@ def update_task(task_id): response = {"message": "Invalid datetime format for completed_at. Expected ISO 8601 format."} abort(make_response(response, 400)) else: - task.completed_at = None # Si es null o no se incluye + task.completed_at = None db.session.commit() @@ -95,15 +95,15 @@ def mark_task_complete(task_id): task = validate_model(Task, task_id) request_body = request.get_json() - # Valida que el mensaje esté en el request + if not request_body or "slack_message" not in request_body: abort(make_response({"error": "Field 'slack_message' is required"}, 400)) # 👈 Error claro - # 1. Actualiza la tarea + task.completed_at = datetime.utcnow() db.session.commit() - # 2. Envía el mensaje personalizado a Slack + slack_token = os.environ.get("SLACK_BOT_TOKEN") channel = os.environ.get("SLACK_CHANNEL", "task-notifications") diff --git a/migrations/versions/eaffe09e5d8f_.py b/migrations/versions/eaffe09e5d8f_.py new file mode 100644 index 000000000..206fea8f1 --- /dev/null +++ b/migrations/versions/eaffe09e5d8f_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: eaffe09e5d8f +Revises: c0bec6981113 +Create Date: 2025-05-08 12:43:19.653071 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'eaffe09e5d8f' +down_revision = 'c0bec6981113' +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..7670264d5 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,10 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -77,7 +73,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 +98,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 6618f2284c3ad2ace00a7001c95aedb004e79b5c Mon Sep 17 00:00:00 2001 From: Dennif Date: Tue, 13 May 2025 13:42:46 -0700 Subject: [PATCH 11/13] All waves tests must be passing corrections implemented --- app/models/task.py | 1 + app/routes/route_utilities.py | 3 ++- app/routes/task_routes.py | 35 +++++++++++++++++++---------------- tests/test_wave_03.py | 4 ++-- tests/test_wave_05.py | 8 ++++---- tests/test_wave_06.py | 2 +- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index f20c5096b..66b7ee229 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -20,6 +20,7 @@ def from_dict(cls, task_data): title=task_data["title"], description=task_data["description"], completed_at=task_data.get("completed_at") + ) return new_task diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 90b95d082..c26e66f2d 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -12,6 +12,7 @@ def validate_model(cls, model_id): model = db.session.get(cls, model_id) if not model: - abort(make_response({"message": f"{cls.__name__} {model_id} not found"}, 404)) + # Modificando el mensaje para que sea específico de la tarea + abort(make_response({"message": f"{cls.__name__.lower()} {model_id} not found"}, 404)) return model \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index c6252d357..0d5038dc4 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -86,30 +86,21 @@ def delete_task(task_id): return Response(status=204, mimetype="application/json") +#wave 03 - - -#Slack @bp.patch("//mark_complete") def mark_task_complete(task_id): task = validate_model(Task, task_id) - request_body = request.get_json() - - - if not request_body or "slack_message" not in request_body: - abort(make_response({"error": "Field 'slack_message' is required"}, 400)) # 👈 Error claro - task.completed_at = datetime.utcnow() db.session.commit() - + # Slack slack_token = os.environ.get("SLACK_BOT_TOKEN") channel = os.environ.get("SLACK_CHANNEL", "task-notifications") - if slack_token: try: - response = requests.post( + requests.post( "https://slack.com/api/chat.postMessage", headers={ "Authorization": f"Bearer {slack_token}", @@ -117,16 +108,28 @@ def mark_task_complete(task_id): }, json={ "channel": channel, - "text": request_body["slack_message"] + "text": f"Someone just completed the task {task.title}" } ) - if not response.json().get("ok"): - current_app.logger.error(f"Slack API error: {response.json()}") except Exception as e: - current_app.logger.error(f"Error sending to Slack: {str(e)}") + current_app.logger.error(f"Slack error: {e}") + + return Response(status=204, mimetype="application/json") + + + +@bp.patch("//mark_incomplete") +def mark_task_incomplete(task_id): + task = validate_model(Task, task_id) + + task.completed_at = None + db.session.commit() return Response(status=204, mimetype="application/json") + + + def get_sort_order(sort_param): if sort_param == "asc": return Task.title.asc() diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 727992ec9..e02bc20fd 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -95,7 +95,7 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 assert response_body == { - "message": "Task 1 not found" + "message": "task 1 not found" } @@ -108,5 +108,5 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 assert response_body == { - "message": "Task 1 not found" + "message": "task 1 not found" } diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 3fc6cca66..4b464d7ba 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -56,7 +56,7 @@ def test_get_goal_not_found(client): # Assert assert response.status_code == 404 assert response_body == { - "message": "Goal 1 not found" + "message": "goal 1 not found" } @@ -122,7 +122,7 @@ def test_update_goal_not_found(client): # Assert assert response.status_code == 404 assert response_body == { - "message": "Goal 1 not found" # Matches validate_model's format + "message": "goal 1 not found" # Matches validate_model's format } @@ -143,7 +143,7 @@ def test_delete_goal(client, one_goal): assert response.status_code == 404 assert response_body == { - "message": "Goal 1 not found" + "message": "goal 1 not found" } @@ -156,7 +156,7 @@ def test_delete_goal_not_found(client): # Assert assert response.status_code == 404 assert response_body == { - "message": "Goal 1 not found" + "message": "goal 1 not found" } diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 7670264d5..1301334ec 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -53,7 +53,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - assert response_body == {"message": "Goal 1 not found"} + assert response_body == {"message": "goal 1 not found"} # @pytest.mark.skip(reason="No way to test this feature yet") From 5cc66536d570ee5bd23a8f99aecf295caf754d6c Mon Sep 17 00:00:00 2001 From: Dennif Date: Tue, 13 May 2025 14:01:20 -0700 Subject: [PATCH 12/13] code clean to read, all comments deleted --- app/__init__.py | 4 ---- app/routes/route_utilities.py | 2 +- app/routes/task_routes.py | 8 +------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 48082936a..03e4a5fc5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,6 @@ from flask import Flask from .db import db, migrate from .models import task, goal -# from .routes.goal_routes import goals_bp from .routes.task_routes import bp as tasks_bp from .routes.goal_routes import bp as goals_bp import os @@ -15,14 +14,11 @@ def create_app(config=None): app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') if config: - # Merge `config` into the app's configuration - # to override the app's default settings for testing app.config.update(config) db.init_app(app) migrate.init_app(app, db) - # Register Blueprints here app.register_blueprint(tasks_bp) app.register_blueprint(goals_bp) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index c26e66f2d..1147740d8 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -12,7 +12,7 @@ def validate_model(cls, model_id): model = db.session.get(cls, model_id) if not model: - # Modificando el mensaje para que sea específico de la tarea + abort(make_response({"message": f"{cls.__name__.lower()} {model_id} not found"}, 404)) return model \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 0d5038dc4..af3242035 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -51,8 +51,6 @@ def get_one_task(task_id): return {"task": task.to_dict()}, 200 - - @bp.put("/") def update_task(task_id): task = validate_model(Task,task_id) @@ -77,6 +75,7 @@ def update_task(task_id): return Response(status=204, mimetype="application/json") + @bp.delete("/") def delete_task(task_id): task = validate_model(Task,task_id) @@ -86,8 +85,6 @@ def delete_task(task_id): return Response(status=204, mimetype="application/json") -#wave 03 - @bp.patch("//mark_complete") def mark_task_complete(task_id): task = validate_model(Task, task_id) @@ -117,7 +114,6 @@ def mark_task_complete(task_id): return Response(status=204, mimetype="application/json") - @bp.patch("//mark_incomplete") def mark_task_incomplete(task_id): task = validate_model(Task, task_id) @@ -128,8 +124,6 @@ def mark_task_incomplete(task_id): return Response(status=204, mimetype="application/json") - - def get_sort_order(sort_param): if sort_param == "asc": return Task.title.asc() From 4d8058b6253947a78e88ebc7a90a901283d46493 Mon Sep 17 00:00:00 2001 From: Dennif Date: Fri, 20 Jun 2025 00:20:30 -0700 Subject: [PATCH 13/13] changes for CORS --- app/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index 03e4a5fc5..aa86bfac1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,10 +5,12 @@ from .routes.goal_routes import bp as goals_bp import os from dotenv import load_dotenv +from flask_cors import CORS def create_app(config=None): load_dotenv() app = Flask(__name__) + CORS(app) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')