From 349d681b745480655aaf1b02bea23446451c006e Mon Sep 17 00:00:00 2001 From: marisela Date: Sat, 3 May 2025 19:44:44 -0700 Subject: [PATCH 01/13] Created virtual enviornment, .env file, and the databases created task model --- app/models/task.py | 20 ++++ migrations/README | 1 + migrations/alembic.ini | 50 ++++++++ migrations/env.py | 113 ++++++++++++++++++ migrations/script.py.mako | 24 ++++ .../fe22f938a137_create_task_model.py | 39 ++++++ 6 files changed, 247 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 create mode 100644 migrations/versions/fe22f938a137_create_task_model.py diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..5170d9a7a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,25 @@ from sqlalchemy.orm import Mapped, mapped_column +# from sqlalchemy import Datetime from ..db import db + class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] = mapped_column(nullable=False) + description: Mapped[str] = mapped_column(nullable=False) + completed_at: Mapped[bool] = mapped_column(default=False, nullable=True) + + def to_dict(self): + return { + "id": self.id, + "title": self.title, + "description": self.description, + "completed_at": bool(self.completed_at) + } + + def from_dict(cls, task_data): + return cls( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data["self.completed_at"] + ) diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic,flask_migrate + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..4c9709271 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option('sqlalchemy.url', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=get_metadata(), literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/fe22f938a137_create_task_model.py b/migrations/versions/fe22f938a137_create_task_model.py new file mode 100644 index 000000000..3d8933273 --- /dev/null +++ b/migrations/versions/fe22f938a137_create_task_model.py @@ -0,0 +1,39 @@ +"""Create Task model + +Revision ID: fe22f938a137 +Revises: +Create Date: 2025-05-03 19:43:36.000414 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fe22f938a137' +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.Boolean(), 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 be1b908a42ee0e8342a5b1c31a30b3287e476943 Mon Sep 17 00:00:00 2001 From: marisela Date: Sat, 3 May 2025 19:48:39 -0700 Subject: [PATCH 02/13] imported datetime and changed completed_at attribute to include datetime with default noone and true to nullable --- app/models/task.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 5170d9a7a..c6ff96e4b 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,4 +1,5 @@ from sqlalchemy.orm import Mapped, mapped_column +from datetime import datetime # from sqlalchemy import Datetime from ..db import db @@ -7,7 +8,8 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] = mapped_column(nullable=False) description: Mapped[str] = mapped_column(nullable=False) - completed_at: Mapped[bool] = mapped_column(default=False, nullable=True) + completed_at: Mapped[datetime | None] = mapped_column( + default=None, nullable=True) def to_dict(self): return { From f1c185ec647f6a51a92f2802d50df4a9e6a929e8 Mon Sep 17 00:00:00 2001 From: marisela Date: Sun, 4 May 2025 19:17:20 -0700 Subject: [PATCH 03/13] created get all tasks and get tasks by id. created validate model function in new file in routes folder --- app/__init__.py | 7 +++++-- app/routes/route_utilities.py | 19 +++++++++++++++++++ app/routes/task_routes.py | 27 ++++++++++++++++++++++++++- tests/test_wave_01.py | 8 ++++---- 4 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 app/routes/route_utilities.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..d2eb45239 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,13 +1,16 @@ from flask import Flask from .db import db, migrate from .models import task, goal +from .routes.task_routes import task_bp import os + def create_app(config=None): app = Flask(__name__) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + 'SQLALCHEMY_DATABASE_URI') if config: # Merge `config` into the app's configuration @@ -18,5 +21,5 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here - + app.register_blueprint(task_bp) return app diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..3ed869cf0 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,19 @@ +from flask import abort, make_response +from ..db import db + + +def validate_model(cls, modelid): + try: + model_id = int(modelid) + except ValueError: + invalid_response = { + "message": f"{cls.__name__} id ({model_id})is invalid"} + abort(make_response(invalid_response, 400)) + query = db.select(cls).where(cls.id == model_id) + model = db.session.scalar(query) + + if not model: + not_found = { + "message": f"{cls.__name__} with id ({model_id}) not found."} + abort(make_response(not_found, 404)) + return model diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..5bac981c2 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,26 @@ -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 + +task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") + + +@task_bp.get("") +def get_all_tasks(): + query = db.select(Task) + title_param = request.args.get("title") + if title_param: + query = query.where(Task.name == title_param) + + tasks = db.session.scalars(query) + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_dict()) + return tasks_response + + +@task_bp.get("/") +def get_one_task(id): + task = validate_model(Task, id) + return task.to_dict() diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 55475db79..d93bafffc 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") @@ -87,7 +87,7 @@ def test_create_task(client): "is_complete": False } } - + query = db.select(Task).where(Task.id == 1) new_task = db.session.scalar(query) @@ -116,7 +116,6 @@ def test_update_task(client, one_task): assert task.completed_at == None - @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act @@ -146,6 +145,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") def test_delete_task_not_found(client): # Act @@ -194,4 +194,4 @@ def test_create_task_must_contain_description(client): assert response_body == { "details": "Invalid data" } - assert db.session.scalars(db.select(Task)).all() == [] \ No newline at end of file + assert db.session.scalars(db.select(Task)).all() == [] From f36c68a35d7de08e6a8a78bb4e2fdc9122cef337 Mon Sep 17 00:00:00 2001 From: marisela Date: Mon, 5 May 2025 10:30:29 -0700 Subject: [PATCH 04/13] I cant even. redid databases, task model, utility for routers, idk what else...painful --- app/models/task.py | 15 ++++---- app/routes/route_utilities.py | 5 +-- app/routes/task_routes.py | 16 ++++++--- .../11938d85ddba_fixed_attribute_name.py | 34 +++++++++++++++++++ .../versions/1d67c6e1c9ea_redid_task_model.py | 32 +++++++++++++++++ ...l.py => 292001546e7d_intiial_migration.py} | 10 +++--- ...94a2440ca3_added_attribute_completed_at.py | 32 +++++++++++++++++ tests/test_wave_01.py | 13 +++---- 8 files changed, 132 insertions(+), 25 deletions(-) create mode 100644 migrations/versions/11938d85ddba_fixed_attribute_name.py create mode 100644 migrations/versions/1d67c6e1c9ea_redid_task_model.py rename migrations/versions/{fe22f938a137_create_task_model.py => 292001546e7d_intiial_migration.py} (83%) create mode 100644 migrations/versions/b894a2440ca3_added_attribute_completed_at.py diff --git a/app/models/task.py b/app/models/task.py index c6ff96e4b..88ab4b44d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,20 +8,23 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] = mapped_column(nullable=False) description: Mapped[str] = mapped_column(nullable=False) - completed_at: Mapped[datetime | None] = mapped_column( - default=None, nullable=True) + completed_at: Mapped[datetime | None] = mapped_column(nullable=True) - def to_dict(self): - return { + def to_dict(self, include_completed_at=False): + task_dict = { "id": self.id, "title": self.title, "description": self.description, - "completed_at": bool(self.completed_at) + "is_complete": bool(self.completed_at), } + if include_completed_at: + task_dict["completed_at"] = self.completed_at + return task_dict + # @classmethod def from_dict(cls, task_data): return cls( title=task_data["title"], description=task_data["description"], - completed_at=task_data["self.completed_at"] + completed_at=task_data.get("completed_at"), ) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 3ed869cf0..d0abf81ca 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, jsonify from ..db import db @@ -7,8 +7,9 @@ def validate_model(cls, modelid): model_id = int(modelid) except ValueError: invalid_response = { - "message": f"{cls.__name__} id ({model_id})is invalid"} + "message": f"{cls.__name__} id ({model_id}) is invalid."} abort(make_response(invalid_response, 400)) + query = db.select(cls).where(cls.id == model_id) model = db.session.scalar(query) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 5bac981c2..2a0d3a336 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -6,6 +6,16 @@ task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") +@task_bp.post("") +def create_task(): + request_body = request.get_json() + new_task = Task.from_dict(request_body) + + db.session.add(new_task) + db.session.commit() + return new_task.to_dict(), 201 + + @task_bp.get("") def get_all_tasks(): query = db.select(Task) @@ -14,13 +24,11 @@ def get_all_tasks(): query = query.where(Task.name == title_param) 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 @task_bp.get("/") def get_one_task(id): task = validate_model(Task, id) - return task.to_dict() + return {"task": task.to_dict()} diff --git a/migrations/versions/11938d85ddba_fixed_attribute_name.py b/migrations/versions/11938d85ddba_fixed_attribute_name.py new file mode 100644 index 000000000..2eaa1afac --- /dev/null +++ b/migrations/versions/11938d85ddba_fixed_attribute_name.py @@ -0,0 +1,34 @@ +"""fixed attribute name + +Revision ID: 11938d85ddba +Revises: b894a2440ca3 +Create Date: 2025-05-05 10:02:25.271584 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '11938d85ddba' +down_revision = 'b894a2440ca3' +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('is_complete', sa.Boolean(), nullable=True)) + batch_op.drop_column('is_completed') + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('is_completed', sa.BOOLEAN(), autoincrement=False, nullable=True)) + batch_op.drop_column('is_complete') + + # ### end Alembic commands ### diff --git a/migrations/versions/1d67c6e1c9ea_redid_task_model.py b/migrations/versions/1d67c6e1c9ea_redid_task_model.py new file mode 100644 index 000000000..5f273b87c --- /dev/null +++ b/migrations/versions/1d67c6e1c9ea_redid_task_model.py @@ -0,0 +1,32 @@ +"""redid task model + +Revision ID: 1d67c6e1c9ea +Revises: 11938d85ddba +Create Date: 2025-05-05 10:04:36.541975 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1d67c6e1c9ea' +down_revision = '11938d85ddba' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_column('is_complete') + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) + + # ### end Alembic commands ### diff --git a/migrations/versions/fe22f938a137_create_task_model.py b/migrations/versions/292001546e7d_intiial_migration.py similarity index 83% rename from migrations/versions/fe22f938a137_create_task_model.py rename to migrations/versions/292001546e7d_intiial_migration.py index 3d8933273..628546c06 100644 --- a/migrations/versions/fe22f938a137_create_task_model.py +++ b/migrations/versions/292001546e7d_intiial_migration.py @@ -1,8 +1,8 @@ -"""Create Task model +"""intiial migration -Revision ID: fe22f938a137 +Revision ID: 292001546e7d Revises: -Create Date: 2025-05-03 19:43:36.000414 +Create Date: 2025-05-05 09:50:08.708270 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'fe22f938a137' +revision = '292001546e7d' down_revision = None branch_labels = None depends_on = None @@ -26,7 +26,7 @@ def upgrade(): 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.Boolean(), nullable=True), + sa.Column('is_completed', sa.Boolean(), nullable=True), sa.PrimaryKeyConstraint('id') ) # ### end Alembic commands ### diff --git a/migrations/versions/b894a2440ca3_added_attribute_completed_at.py b/migrations/versions/b894a2440ca3_added_attribute_completed_at.py new file mode 100644 index 000000000..f7c06449d --- /dev/null +++ b/migrations/versions/b894a2440ca3_added_attribute_completed_at.py @@ -0,0 +1,32 @@ +"""added attribute completed at + +Revision ID: b894a2440ca3 +Revises: 292001546e7d +Create Date: 2025-05-05 10:00:03.138439 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b894a2440ca3' +down_revision = '292001546e7d' +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('completed_at', sa.DateTime(), nullable=True)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_column('completed_at') + + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index d93bafffc..dcb1b1775 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -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") @@ -61,13 +61,10 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message": "Task with id (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_task(client): # Act response = client.post("/tasks", json={ From 8a54a69495853f111e1dad185e42d9e08889f2d6 Mon Sep 17 00:00:00 2001 From: marisela Date: Mon, 5 May 2025 10:38:35 -0700 Subject: [PATCH 05/13] fixed create new task to be wrapped in a dictionary for some reason --- app/models/task.py | 2 +- app/routes/task_routes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 88ab4b44d..97d18b2cd 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -21,7 +21,7 @@ def to_dict(self, include_completed_at=False): task_dict["completed_at"] = self.completed_at return task_dict - # @classmethod + @classmethod def from_dict(cls, task_data): return cls( title=task_data["title"], diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 2a0d3a336..de9057aa1 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -13,7 +13,7 @@ def create_task(): db.session.add(new_task) db.session.commit() - return new_task.to_dict(), 201 + return {"task": new_task.to_dict()}, 201 @task_bp.get("") From 7e57940fd3612655b9bc60d0dfdd9d12bd2a04b3 Mon Sep 17 00:00:00 2001 From: marisela Date: Mon, 5 May 2025 17:23:06 -0700 Subject: [PATCH 06/13] finished wave 1 created needed routes of put,post,delete --- app/routes/task_routes.py | 22 ++++++++++++++++++++++ tests/test_wave_01.py | 22 ++++++++-------------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index de9057aa1..99c683ae5 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -6,9 +6,31 @@ task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") +@task_bp.delete("/") +def delete_task(id): + task = validate_model(Task, id) + db.session.delete(task) + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@task_bp.put("/") +def update_task(id): + task = validate_model(Task, id) + request_body = request.get_json() + task.title = request_body["title"] + task.description = request_body["description"] + db.session.commit() + return Response(status=204, mimetype="application/json") + + @task_bp.post("") def create_task(): request_body = request.get_json() + + if not request_body.get("title") or not request_body.get("description"): + return {"details": "Invalid data"}, 400 + new_task = Task.from_dict(request_body) db.session.add(new_task) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dcb1b1775..c42b9bfde 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -94,7 +94,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={ @@ -113,7 +113,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -124,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 response_body == {"message": "Task with id (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") @@ -143,7 +140,7 @@ def test_delete_task(client, one_task): 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") @@ -152,15 +149,12 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message": "Task with id (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={ @@ -177,7 +171,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 e8ad724306bff2bab1491dbd624c4566eead53d6 Mon Sep 17 00:00:00 2001 From: marisela Date: Mon, 5 May 2025 17:34:01 -0700 Subject: [PATCH 07/13] completed wave 2. Wave was to allow params of ascending and descending order --- app/routes/task_routes.py | 7 +++++++ tests/test_wave_02.py | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 99c683ae5..d55a0938d 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -40,8 +40,15 @@ def create_task(): @task_bp.get("") def get_all_tasks(): + sort_param = request.args.get("sort") query = db.select(Task) + + if sort_param == "asc": + query = query.order_by(Task.title.asc()) + elif sort_param == "desc": + query = query.order_by(Task.title.desc()) title_param = request.args.get("title") + if title_param: query = query.where(Task.name == title_param) 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 f1d14faf52a94373b4204492a6db3d552ec04926 Mon Sep 17 00:00:00 2001 From: marisela Date: Tue, 6 May 2025 19:17:41 -0700 Subject: [PATCH 08/13] completed wave 3, created needed routes to mark tasts completed or incomplete with time stamp --- app/routes/task_routes.py | 19 ++++++++++++++++++- tests/test_wave_03.py | 29 +++++++++++------------------ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index d55a0938d..ad1d30848 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 .route_utilities import validate_model +from datetime import datetime, timezone task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") @@ -48,7 +49,7 @@ def get_all_tasks(): elif sort_param == "desc": query = query.order_by(Task.title.desc()) title_param = request.args.get("title") - + if title_param: query = query.where(Task.name == title_param) @@ -61,3 +62,19 @@ def get_all_tasks(): def get_one_task(id): task = validate_model(Task, id) return {"task": task.to_dict()} + + +@task_bp.patch("//mark_complete") +def mark_task_complete(id): + task = validate_model(Task, id) + task.completed_at = datetime.now(timezone.utc) + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@task_bp.patch("//mark_incomplete") +def mark_task_incomplete(id): + task = validate_model(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..c2e1a60e8 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 """ @@ -29,16 +29,15 @@ def test_mark_complete_on_incomplete_task(client, one_task): # Assert assert response.status_code == 204 - + 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_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") - # Assert assert response.status_code == 204 @@ -46,7 +45,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 """ @@ -66,7 +65,6 @@ def test_mark_complete_on_completed_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_complete") - # Assert assert response.status_code == 204 @@ -74,7 +72,9 @@ 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,11 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Task with id (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 +106,4 @@ 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*************** - # ***************************************************************** + response_body = response_body == {"message": "Task with id (1) not found."} From 9fbb402371ce74133c7f98ea69419cabb94ad566 Mon Sep 17 00:00:00 2001 From: marisela Date: Thu, 8 May 2025 00:07:17 -0700 Subject: [PATCH 09/13] finished wave 4. Had to poke around adding the token and slack all over the place to see what worked. Created a slack send message function in the router utilities had to poke around for a bit to see what stuck in getting the token read...there was a typo on SLACK_BOT_TOKEN and SlACK_BOT_TOKEN --- app/__init__.py | 2 ++ app/routes/route_utilities.py | 24 ++++++++++++++++++++++++ app/routes/task_routes.py | 5 ++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index d2eb45239..028fc6a59 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -11,6 +11,8 @@ def create_app(config=None): app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( 'SQLALCHEMY_DATABASE_URI') + # app.config['SLACK_BOT_TOKEN'] = os.environ.get("SLACK_BOT_TOKEN") + # app.config['SLACK_CHANNEL'] = os.environ.get("SLACK_CHANNEL") if config: # Merge `config` into the app's configuration diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index d0abf81ca..707efcc45 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,5 +1,11 @@ from flask import abort, make_response, jsonify +import requests from ..db import db +import os + + +SLACK_BOT_TOKEN = os.environ.get("SLACK_BOT_TOKEN") +SLACK_CHANNEL = os.environ.get("SLACK_CHANNEL") def validate_model(cls, modelid): @@ -18,3 +24,21 @@ def validate_model(cls, modelid): "message": f"{cls.__name__} with id ({model_id}) not found."} abort(make_response(not_found, 404)) return model + + +def send_slack_message(task_title): + url = "https://slack.com/api/chat.postMessage" + + headers = { + "Authorization": f"Bearer {SLACK_BOT_TOKEN}", + "Content-Type": "application/json; charset=UTF-8" + } + payload = { + "channel": SLACK_CHANNEL, + "text": f"Someone just completed the task {task_title}" + + } + response = requests.post(url, headers=headers, json=payload) + + if not response.ok or not response.json().get("ok"): + print("Failed to send slack message:", response.text) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index ad1d30848..396e9386a 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, send_slack_message from datetime import datetime, timezone task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks") @@ -67,8 +67,11 @@ def get_one_task(id): @task_bp.patch("//mark_complete") def mark_task_complete(id): task = validate_model(Task, id) + task.completed_at = datetime.now(timezone.utc) db.session.commit() + + send_slack_message(task.title) return Response(status=204, mimetype="application/json") From d04c0bbdc59a0d0e2f89cb44bf0cb0a654380355 Mon Sep 17 00:00:00 2001 From: marisela Date: Fri, 9 May 2025 00:39:46 -0700 Subject: [PATCH 10/13] created goal model, routes, connected to app, finished tests for wave 5, next need to connect relationship between goals and tasks --- app/__init__.py | 2 + app/models/goal.py | 16 ++++ app/routes/goal_routes.py | 55 ++++++++++++- .../versions/8d5d5a6b8a9b_added_goal_model.py | 32 ++++++++ tests/test_wave_05.py | 79 +++++++++---------- 5 files changed, 141 insertions(+), 43 deletions(-) create mode 100644 migrations/versions/8d5d5a6b8a9b_added_goal_model.py diff --git a/app/__init__.py b/app/__init__.py index 028fc6a59..ab776ae37 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 task_bp +from .routes.goal_routes import goal_bp import os @@ -24,4 +25,5 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(task_bp) + app.register_blueprint(goal_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..69dac386d 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,21 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db + class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] = mapped_column(nullable=False) + + def to_dict(self): + goal_dict = { + "id": self.id, + "title": self.title + + } + return goal_dict + + @classmethod + def from_dict(cls, goal_data): + return cls( + title=goal_data["title"] + ) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..181829258 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,54 @@ -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 + +goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals") + + +@goal_bp.get("") +def get_all_goals(): + query = db.select(Goal) + goals = db.session.scalars(query) + goal_response = [goal.to_dict() for goal in goals] + + return goal_response + + +@goal_bp.get("/") +def get_one_goal(id): + goal = validate_model(Goal, id) + return {"goal": goal.to_dict()} + + +@goal_bp.post("") +def create_goal(): + request_body = request.get_json() + + if not request_body.get("title"): + return {"details": "Invalid data"}, 400 + + new_goal = Goal.from_dict(request_body) + + db.session.add(new_goal) + db.session.commit() + + return {"goal": new_goal.to_dict()}, 201 + + +@goal_bp.put("/") +def update_goal(id): + goal = validate_model(Goal, id) + request_body = request.get_json() + goal.title = request_body["title"] + + db.session.commit() + return Response(status=204, mimetype="application/json") + + +@goal_bp.delete("/") +def delete_goal(id): + goal = validate_model(Goal, id) + db.session.delete(goal) + db.session.commit() + return Response(status=204, mimetype="application/json") diff --git a/migrations/versions/8d5d5a6b8a9b_added_goal_model.py b/migrations/versions/8d5d5a6b8a9b_added_goal_model.py new file mode 100644 index 000000000..f3851658b --- /dev/null +++ b/migrations/versions/8d5d5a6b8a9b_added_goal_model.py @@ -0,0 +1,32 @@ +"""added goal model + +Revision ID: 8d5d5a6b8a9b +Revises: 1d67c6e1c9ea +Create Date: 2025-05-08 23:40:35.239754 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8d5d5a6b8a9b' +down_revision = '1d67c6e1c9ea' +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..5a02b0772 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,19 @@ 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 with id (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,35 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") + # raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "My New UPDATED Goal" + }) # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 204 + query = db.select(Goal).where(Goal.id == 1) + goal = db.session.scalar(query) + assert goal.title == "My New UPDATED Goal" -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() - # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal with id (1) not found."} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -119,30 +119,25 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 - response_body = response.get_json() - assert "message" in response_body + query = db.select(Goal).where(Goal.id == 1) + assert db.session.scalar(query) == None - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** +# @pytest.mark.skip(reason="test to be completed by student") -@pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() - # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal with id (1) not found."} + assert db.session.scalars(db.select(Goal)).all() == [] + # ---- Complete Act 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 ead22a57f9b04a701b4d43e4e59123aaf9aabaf3 Mon Sep 17 00:00:00 2001 From: marisela Date: Fri, 9 May 2025 11:27:07 -0700 Subject: [PATCH 11/13] finished all waves, c after relationship redid all the needed changed in dict from and created new routes for showing list of tasks in goals and creating a task in a goal --- app/models/goal.py | 16 ++++---- app/models/task.py | 20 ++++++++-- app/routes/goal_routes.py | 40 ++++++++++++++++++- app/routes/route_utilities.py | 12 ++++++ ...580b3a_added_goal_and_task_one_to_many_.py | 34 ++++++++++++++++ tests/test_wave_01.py | 14 +++++-- tests/test_wave_02.py | 31 +++++++++++--- tests/test_wave_05.py | 9 +++-- tests/test_wave_06.py | 19 +++++---- 9 files changed, 160 insertions(+), 35 deletions(-) create mode 100644 migrations/versions/ad4851580b3a_added_goal_and_task_one_to_many_.py diff --git a/app/models/goal.py b/app/models/goal.py index 69dac386d..d5c1ebf1b 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,21 +1,21 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +# from sqlalchemy import ForeignKe +from typing import List from ..db import db class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] = mapped_column(nullable=False) + tasks: Mapped[List["Task"]] = relationship("Task", back_populates="goal") def to_dict(self): - goal_dict = { + return { "id": self.id, - "title": self.title - + "title": self.title, + "tasks": [task.to_dict() for task in self.tasks] } - return goal_dict @classmethod def from_dict(cls, goal_data): - return cls( - title=goal_data["title"] - ) + return cls(title=goal_data["title"]) diff --git a/app/models/task.py b/app/models/task.py index 97d18b2cd..1b68cef17 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,7 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from datetime import datetime +from typing import Optional +from sqlalchemy import ForeignKey # from sqlalchemy import Datetime from ..db import db @@ -7,18 +9,28 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] = mapped_column(nullable=False) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship( + "Goal", back_populates="tasks") description: Mapped[str] = mapped_column(nullable=False) - completed_at: Mapped[datetime | None] = mapped_column(nullable=True) + completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) - def to_dict(self, include_completed_at=False): + def to_dict(self, include_completed_at=False, include_goal_id=False): task_dict = { "id": self.id, "title": self.title, "description": self.description, "is_complete": bool(self.completed_at), + "goal_id": self.goal.id if self.goal else None, # Default to None + # "goal_title": self.goal.title if self.goal else None # Default to None + } if include_completed_at: task_dict["completed_at"] = self.completed_at + + if include_goal_id and self.goal: + task_dict["goal_id"] = self.goal.id + task_dict["goal_title"] = self.goal.title return task_dict @classmethod @@ -26,5 +38,5 @@ def from_dict(cls, task_data): return cls( title=task_data["title"], description=task_data["description"], - completed_at=task_data.get("completed_at"), + completed_at=task_data.get("completed_at") ) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 181829258..29f68ca3e 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,7 +1,8 @@ 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 +from .route_utilities import validate_model, create_model goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals") @@ -52,3 +53,40 @@ def delete_goal(id): db.session.delete(goal) db.session.commit() return Response(status=204, mimetype="application/json") + + +@goal_bp.get("//tasks") +def get_all_goal_tasks(id): + goal = validate_model(Goal, id) + tasks = [task.to_dict() for task in goal.tasks] + + return { + "id": goal.id, + "title": goal.title, + "tasks": tasks + }, 200 + + +@goal_bp.post("//tasks") +def create_task_with_goal_id(id): + goal = validate_model(Goal, id) + request_body = request.get_json() + + task_ids = request_body.get("task_ids") + if not task_ids or not isinstance(task_ids, list): + return {"message": "'task_ids' field is required and must be a list"}, 400 + + # Query all tasks by the given IDs + tasks = Task.query.filter(Task.id.in_(task_ids)).all() + + if len(tasks) != len(task_ids): + return {"message": "One or more task_ids are invalid"}, 404 + + # Replace the tasks associated with the goal + goal.tasks = tasks + db.session.commit() + + return { + "id": goal.id, + "task_ids": [task.id for task in tasks] + }, 200 diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 707efcc45..33fd7dbb1 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -26,6 +26,18 @@ def validate_model(cls, modelid): return model +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + except KeyError as e: + response = {"message": f"Invalid request: missing {e.args[0]}"} + abort(make_response(response, 400)) + + db.session.add(new_model) + db.session.commit() + return new_model.to_dict(), 201 + + def send_slack_message(task_title): url = "https://slack.com/api/chat.postMessage" diff --git a/migrations/versions/ad4851580b3a_added_goal_and_task_one_to_many_.py b/migrations/versions/ad4851580b3a_added_goal_and_task_one_to_many_.py new file mode 100644 index 000000000..c2fb36b0e --- /dev/null +++ b/migrations/versions/ad4851580b3a_added_goal_and_task_one_to_many_.py @@ -0,0 +1,34 @@ +"""added goal and task one to many relationship + +Revision ID: ad4851580b3a +Revises: 8d5d5a6b8a9b +Create Date: 2025-05-09 10:00:06.727153 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ad4851580b3a' +down_revision = '8d5d5a6b8a9b' +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_01.py b/tests/test_wave_01.py index c42b9bfde..388ddf648 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -28,7 +28,9 @@ def test_get_tasks_one_saved_tasks(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, + "goal_id": None, # Expecting None since there's no goal + } ] @@ -47,7 +49,9 @@ def test_get_task(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, + "goal_id": None, # Expecting None since there's no goal + } } @@ -70,6 +74,7 @@ def test_create_task(client): response = client.post("/tasks", json={ "title": "A Brand New Task", "description": "Test Description", + }) response_body = response.get_json() @@ -81,7 +86,10 @@ def test_create_task(client): "id": 1, "title": "A Brand New Task", "description": "Test Description", - "is_complete": False + "is_complete": False, + + "goal_id": None, # Expecting goal_id as None + } } diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 651e3aebd..1cb03c06b 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -15,17 +15,27 @@ def test_get_tasks_sorted_asc(client, three_tasks): "id": 2, "title": "Answer forgotten email 📧", "description": "", - "is_complete": False}, + "is_complete": False, + + "goal_id": None, + + }, { "id": 3, "title": "Pay my outstanding tickets 😭", "description": "", - "is_complete": False}, + "is_complete": False, + + "goal_id": None, + }, { "id": 1, "title": "Water the garden 🌷", "description": "", - "is_complete": False} + "is_complete": False, + + "goal_id": None, + } ] @@ -43,15 +53,24 @@ def test_get_tasks_sorted_desc(client, three_tasks): "description": "", "id": 1, "is_complete": False, - "title": "Water the garden 🌷"}, + "goal_id": None, + + "title": "Water the garden 🌷" + }, { "description": "", "id": 3, "is_complete": False, - "title": "Pay my outstanding tickets 😭"}, + "goal_id": None, + + "title": "Pay my outstanding tickets 😭" + }, { "description": "", "id": 2, "is_complete": False, - "title": "Answer forgotten email 📧"}, + "goal_id": None, + + "title": "Answer forgotten email 📧" + } ] diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 5a02b0772..f38869550 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -26,7 +26,8 @@ def test_get_goals_one_saved_goal(client, one_goal): assert response_body == [ { "id": 1, - "title": "Build a habit of going outside daily" + "title": "Build a habit of going outside daily", + "tasks": [] } ] @@ -43,7 +44,8 @@ def test_get_goal(client, one_goal): assert response_body == { "goal": { "id": 1, - "title": "Build a habit of going outside daily" + "title": "Build a habit of going outside daily", + "tasks": [] } } @@ -74,7 +76,8 @@ def test_create_goal(client): assert response_body == { "goal": { "id": 1, - "title": "My New Goal" + "title": "My New Goal", + "tasks": [] } } diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 0317f835a..86f1eaec4 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") @@ -54,13 +54,12 @@ 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") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "message": "Goal with id (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_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -77,7 +76,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -102,7 +101,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From cba1b4362a7024dc89ff50d7934e0a1e8ba49644 Mon Sep 17 00:00:00 2001 From: marisela Date: Sun, 1 Jun 2025 14:32:50 -0700 Subject: [PATCH 12/13] redid tests- undid changes --- tests/test_wave_01.py | 31 +++++++++++++++++++------------ tests/test_wave_02.py | 31 ++++++------------------------- tests/test_wave_03.py | 6 +++--- tests/test_wave_05.py | 14 +++++++------- tests/test_wave_06.py | 1 - 5 files changed, 35 insertions(+), 48 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 388ddf648..4d4b05c72 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -28,9 +28,7 @@ def test_get_tasks_one_saved_tasks(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False, - "goal_id": None, # Expecting None since there's no goal - + "is_complete": False } ] @@ -49,9 +47,7 @@ def test_get_task(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False, - "goal_id": None, # Expecting None since there's no goal - + "is_complete": False } } @@ -74,7 +70,6 @@ def test_create_task(client): response = client.post("/tasks", json={ "title": "A Brand New Task", "description": "Test Description", - }) response_body = response.get_json() @@ -86,10 +81,7 @@ def test_create_task(client): "id": 1, "title": "A Brand New Task", "description": "Test Description", - "is_complete": False, - - "goal_id": None, # Expecting goal_id as None - + "is_complete": False } } @@ -133,7 +125,6 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 assert response_body == {"message": "Task with id (1) not found."} - # ***************************************************************** # @pytest.mark.skip(reason="No way to test this feature yet") @@ -179,6 +170,22 @@ def test_create_task_must_contain_title(client): assert db.session.scalars(db.select(Task)).all() == [] +def test_create_task_must_contain_title(client): + # Act + response = client.post("/tasks", json={ + "description": "Test Description" + }) + response_body = response.get_json() + + # Assert + assert response.status_code == 400 + assert "details" in response_body + assert response_body == { + "details": "Invalid data" + } + assert db.session.scalars(db.select(Task)).all() == [] + + # @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_description(client): # Act diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 1cb03c06b..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -15,27 +15,17 @@ def test_get_tasks_sorted_asc(client, three_tasks): "id": 2, "title": "Answer forgotten email 📧", "description": "", - "is_complete": False, - - "goal_id": None, - - }, + "is_complete": False}, { "id": 3, "title": "Pay my outstanding tickets 😭", "description": "", - "is_complete": False, - - "goal_id": None, - }, + "is_complete": False}, { "id": 1, "title": "Water the garden 🌷", "description": "", - "is_complete": False, - - "goal_id": None, - } + "is_complete": False} ] @@ -53,24 +43,15 @@ def test_get_tasks_sorted_desc(client, three_tasks): "description": "", "id": 1, "is_complete": False, - "goal_id": None, - - "title": "Water the garden 🌷" - }, + "title": "Water the garden 🌷"}, { "description": "", "id": 3, "is_complete": False, - "goal_id": None, - - "title": "Pay my outstanding tickets 😭" - }, + "title": "Pay my outstanding tickets 😭"}, { "description": "", "id": 2, "is_complete": False, - "goal_id": None, - - "title": "Answer forgotten email 📧" - } + "title": "Answer forgotten email 📧"}, ] diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index c2e1a60e8..2c15f1924 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -72,9 +72,8 @@ 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") @@ -85,8 +84,9 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): 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_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index f38869550..17bf68ac1 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -26,8 +26,7 @@ def test_get_goals_one_saved_goal(client, one_goal): assert response_body == [ { "id": 1, - "title": "Build a habit of going outside daily", - "tasks": [] + "title": "Build a habit of going outside daily" } ] @@ -44,13 +43,13 @@ def test_get_goal(client, one_goal): assert response_body == { "goal": { "id": 1, - "title": "Build a habit of going outside daily", - "tasks": [] + "title": "Build a habit of going outside daily" } } - # @pytest.mark.skip(reason="test to be completed by student") + + def test_get_goal_not_found(client): pass # Act @@ -76,8 +75,7 @@ def test_create_goal(client): assert response_body == { "goal": { "id": 1, - "title": "My New Goal", - "tasks": [] + "title": "My New Goal" } } @@ -140,6 +138,8 @@ def test_delete_goal_not_found(client): # ---- Complete Act 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 diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 86f1eaec4..0b083e2fe 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -44,7 +44,6 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on query = db.select(Goal).where(Goal.id == 1) assert len(db.session.scalar(query).tasks) == 2 - # @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act From f35605dd38d4de1dbce3d7e04b543482240d21e1 Mon Sep 17 00:00:00 2001 From: marisela Date: Sun, 1 Jun 2025 15:18:24 -0700 Subject: [PATCH 13/13] fixed task model to include goal id if it has a goal, made sure to also fix goal route for specific task as well as task routes to include attribute IF it has a goal --- app/models/goal.py | 2 +- app/models/task.py | 20 ++++++++++++-------- app/routes/goal_routes.py | 2 +- app/routes/task_routes.py | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index d5c1ebf1b..15e5f640d 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -13,7 +13,7 @@ def to_dict(self): return { "id": self.id, "title": self.title, - "tasks": [task.to_dict() for task in self.tasks] + # "tasks": [task.to_dict() for task in self.tasks] } @classmethod diff --git a/app/models/task.py b/app/models/task.py index 1b68cef17..4e859ae1e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -20,19 +20,23 @@ def to_dict(self, include_completed_at=False, include_goal_id=False): "id": self.id, "title": self.title, "description": self.description, - "is_complete": bool(self.completed_at), - "goal_id": self.goal.id if self.goal else None, # Default to None + "is_complete": self.completed_at is not None, + # "goal_id": self.goal.id if self.goal else None, # Default to None # "goal_title": self.goal.title if self.goal else None # Default to None } - if include_completed_at: - task_dict["completed_at"] = self.completed_at - - if include_goal_id and self.goal: - task_dict["goal_id"] = self.goal.id - task_dict["goal_title"] = self.goal.title + if include_goal_id and self.goal_id: + task_dict["goal_id"] = self.goal_id return task_dict + # if include_completed_at: + # task_dict["completed_at"] = self.completed_at + + # if include_goal_id and self.goal: + # task_dict["goal_id"] = self.goal.id + # task_dict["goal_title"] = self.goal.title + # return task_dict + @classmethod def from_dict(cls, task_data): return cls( diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 29f68ca3e..ab0197169 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -58,7 +58,7 @@ def delete_goal(id): @goal_bp.get("//tasks") def get_all_goal_tasks(id): goal = validate_model(Goal, id) - tasks = [task.to_dict() for task in goal.tasks] + tasks = [task.to_dict(include_goal_id=True) for task in goal.tasks] return { "id": goal.id, diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 396e9386a..8eff179a1 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -61,7 +61,7 @@ def get_all_tasks(): @task_bp.get("/") def get_one_task(id): task = validate_model(Task, id) - return {"task": task.to_dict()} + return {"task": task.to_dict(include_goal_id=True)} @task_bp.patch("//mark_complete") @@ -70,7 +70,7 @@ def mark_task_complete(id): task.completed_at = datetime.now(timezone.utc) db.session.commit() - + send_slack_message(task.title) return Response(status=204, mimetype="application/json")