From f091e53f89fa04591656ee4d27cb33ffcfecff3d Mon Sep 17 00:00:00 2001 From: Weixi He Date: Thu, 31 Oct 2024 23:41:33 -0400 Subject: [PATCH 01/18] Inital project set up --- 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 cf1b4d11b6bdc7384a8e69da3e1f08884b5ea8d7 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Wed, 6 Nov 2024 21:20:41 -0500 Subject: [PATCH 02/18] complete wave 1 --- app/__init__.py | 2 + app/models/task.py | 26 +++++- app/routes/task_routes.py | 124 ++++++++++++++++++++++++++- migrations/versions/80a00b32f2ea_.py | 39 +++++++++ tests/test_wave_01.py | 34 +++++--- tests/test_wave_02.py | 4 +- 6 files changed, 211 insertions(+), 18 deletions(-) create mode 100644 migrations/versions/80a00b32f2ea_.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..558d47c2d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,7 @@ from flask import Flask from .db import db, migrate from .models import task, goal +from app.routes.task_routes import tasks_bp import os def create_app(config=None): @@ -18,5 +19,6 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..d8b898425 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,29 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey +from datetime import datetime +from typing import Optional from ..db import db class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[Optional[datetime]] + +# def to_dict(self): +# task_as_dict ={ +# "id": self.id, +# "title": self.title, +# "description": self.description, +# "is_complete": self.completed_at +# } +# return task_as_dict + +# @classmethod +# def from_dict(cls, task_data): +# new_task = cls( +# title=task_data["title"], +# description=task_data["description"], +# completed_at=task_data.get("completed_at") +# ) +# return new_task \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..9d856b27e 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,123 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, request, Response, jsonify +from app.models.task import Task +from ..db import db + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +@tasks_bp.post("") +def create_task(): + request_body = request.get_json() + + if "title" not in request_body or "description" not in request_body: + response = {"details": "Invalid data"} + return make_response(response, 400) + + title = request_body["title"] + description = request_body["description"] + completed_at = request_body.get("completed_at", None) + + + new_task = Task(title=title, description=description, completed_at=completed_at) + db.session.add(new_task) + db.session.commit() + + response = { + "task": { + "id": new_task.id, + "title": new_task.title, + "description": new_task.description, + "is_complete": bool(new_task.completed_at) + } + } + + return response, 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}%")) + + completed_at_param = request.args.get("completed_at") + if completed_at_param == "true": + query = query.where(Task.completed_at.isnot(None)) + elif completed_at_param == "false": + query = query.where(Task.completed_at.is_(None)) + + tasks = db.session.scalars(query.order_by(Task.id)) + + tasks_response = [] + for task in tasks: + tasks_response.append({ + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at) + }) + + return tasks_response + +@tasks_bp.get("/") +def get_one_task(task_id): + task = validate_task(task_id) + + return { + "task": { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at) + } + } + +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() + + task.title = request_body.get("title", task.title) + task.description = request_body.get("description", task.description) + task.completed_at = request_body.get("completed_at", task.completed_at) + db.session.commit() + + return { + "task": { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": bool(task.completed_at) + } + }, 200 + +@tasks_bp.delete("/") +def delete_task(task_id): + task = validate_task(task_id) + if not task: + return jsonify({"message": f"task {task_id} not found"}), 404 + db.session.delete(task) + db.session.commit() + + return jsonify({ + "details": f'Task {task.id} "{task.title}" successfully deleted' + }), 200 diff --git a/migrations/versions/80a00b32f2ea_.py b/migrations/versions/80a00b32f2ea_.py new file mode 100644 index 000000000..cd035a02c --- /dev/null +++ b/migrations/versions/80a00b32f2ea_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 80a00b32f2ea +Revises: +Create Date: 2024-11-05 21:20:55.978819 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '80a00b32f2ea' +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=False), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..5c0b8d9f6 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -13,7 +13,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -32,7 +32,7 @@ def test_get_tasks_one_saved_tasks(client, one_task): ] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -51,7 +51,7 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -59,14 +59,16 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body["message"] == "task 1 not found" - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +95,7 @@ def test_create_task(client): assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -119,7 +121,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -130,14 +132,16 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body["message"] == "task 1 not found" - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -152,7 +156,7 @@ def test_delete_task(client, one_task): assert Task.query.get(1) == None -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -160,8 +164,10 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body == {"message": "task 1 not found"} - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -169,7 +175,7 @@ def test_delete_task_not_found(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -186,7 +192,7 @@ def test_create_task_must_contain_title(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_description(client): # Act response = client.post("/tasks", json={ diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..c9a76e6b1 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 4b9687e562552e13404b6431809875f8e192ce7e Mon Sep 17 00:00:00 2001 From: Weixi He Date: Wed, 6 Nov 2024 21:32:36 -0500 Subject: [PATCH 03/18] complete wave 2 --- app/routes/task_routes.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 9d856b27e..0407ed308 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, abort, make_response, request, Response, jsonify from app.models.task import Task +from sqlalchemy import desc from ..db import db tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -50,6 +51,12 @@ def get_all_tasks(): elif completed_at_param == "false": query = query.where(Task.completed_at.is_(None)) + sort_param = request.args.get("sort") + if sort_param == "asc": + query = query.order_by(Task.title) + if sort_param == "desc": + query = query.order_by(desc(Task.title)) + tasks = db.session.scalars(query.order_by(Task.id)) tasks_response = [] @@ -61,7 +68,7 @@ def get_all_tasks(): "is_complete": bool(task.completed_at) }) - return tasks_response + return tasks_response, 200 @tasks_bp.get("/") def get_one_task(task_id): @@ -121,3 +128,4 @@ def delete_task(task_id): return jsonify({ "details": f'Task {task.id} "{task.title}" successfully deleted' }), 200 + From 9f5847589312d21010de740d0b31cd9496784cfc Mon Sep 17 00:00:00 2001 From: Weixi He Date: Thu, 7 Nov 2024 00:21:10 -0500 Subject: [PATCH 04/18] complete wave 3 --- app/models/task.py | 16 +++++++------- app/routes/task_routes.py | 45 +++++++++++++++++++++++++++------------ tests/test_wave_03.py | 18 +++++++++------- 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index d8b898425..f3445a2fe 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,14 +10,14 @@ class Task(db.Model): description: Mapped[str] completed_at: Mapped[Optional[datetime]] -# def to_dict(self): -# task_as_dict ={ -# "id": self.id, -# "title": self.title, -# "description": self.description, -# "is_complete": self.completed_at -# } -# return task_as_dict + def to_dict(self): + task_as_dict ={ + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at) + } + return task_as_dict # @classmethod # def from_dict(cls, task_data): diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 0407ed308..4c0ad08f0 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, abort, make_response, request, Response, jsonify from app.models.task import Task from sqlalchemy import desc +from datetime import datetime from ..db import db tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -75,13 +76,8 @@ def get_one_task(task_id): task = validate_task(task_id) return { - "task": { - "id": task.id, - "title": task.title, - "description": task.description, - "is_complete": bool(task.completed_at) - } - } + "task":task.to_dict() + }, 200 def validate_task(task_id): try: @@ -109,13 +105,8 @@ def update_task(task_id): db.session.commit() return { - "task": { - "id": task.id, - "title": task.title, - "description": task.description, - "is_complete": bool(task.completed_at) - } - }, 200 + "task":task.to_dict() + }, 200 @tasks_bp.delete("/") def delete_task(task_id): @@ -129,3 +120,29 @@ def delete_task(task_id): "details": f'Task {task.id} "{task.title}" successfully deleted' }), 200 +@tasks_bp.patch("//mark_complete") +def mark_task_complete(task_id): + task = validate_task(task_id) + if not task: + return abort(404, description="Task not found") + + task.completed_at = datetime.now() + db.session.commit() + + return { + "task":task.to_dict() + }, 200 + +@tasks_bp.patch("//mark_incomplete") +def mark_task_incomplete(task_id): + task = validate_task(task_id) + if not task: + return abort(404, description="Task not found") + + task.completed_at = None + db.session.commit() + + return { + "task":task.to_dict() + }, 200 + diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..7bc93012d 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +127,15 @@ 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") + #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") @@ -142,8 +143,9 @@ def test_mark_incomplete_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") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From 83fa854a44e53d4c6ee4e25a78a5cd514c7f5136 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Thu, 7 Nov 2024 22:41:46 -0500 Subject: [PATCH 05/18] compeled wave 4 and wave 5 --- app/__init__.py | 2 + app/models/goal.py | 11 +++- app/models/task.py | 1 + app/routes/goal_routes.py | 83 +++++++++++++++++++++++++++- app/routes/task_routes.py | 23 ++++++++ migrations/versions/9bf7edbb27cd_.py | 44 +++++++++++++++ tests/test_wave_05.py | 81 ++++++++++++++++----------- 7 files changed, 211 insertions(+), 34 deletions(-) create mode 100644 migrations/versions/9bf7edbb27cd_.py diff --git a/app/__init__.py b/app/__init__.py index 558d47c2d..d447c7be7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from .db import db, migrate from .models import task, goal from app.routes.task_routes import tasks_bp +from app.routes.goal_routes import goals_bp import os def create_app(config=None): @@ -20,5 +21,6 @@ def create_app(config=None): # Register Blueprints here app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 44282656b..38e7a4403 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,14 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title:Mapped[str] + + def to_dict(self): + goal_as_dict = { + "id": self.id, + "title": self.title + } + + return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index f3445a2fe..b6fb754ff 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -18,6 +18,7 @@ def to_dict(self): "is_complete": bool(self.completed_at) } return task_as_dict + # @classmethod # def from_dict(cls, task_data): diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..f35e13e8d 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,82 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, make_response, abort, jsonify +from app.models.goal import Goal +from ..db import db + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@goals_bp.post("") +def create_goal(): + request_body = request.get_json() + + if "title" not in request_body: + response = {"details": "Invalid data"} + return make_response(response, 400) + + title = request_body["title"] + + new_goal= Goal(title=title) + db.session.add(new_goal) + db.session.commit() + + return {"goal": new_goal.to_dict()}, 201 + +@goals_bp.get("") +def get_all_goals(): + query = db.select(Goal) + goals = db.session.scalars(query) + + goals_response =[] + for goal in goals: + goals_response.append(goal.to_dict()) + + return goals_response + +@goals_bp.get("/") +def get_one_goal(goal_id): + goal = validate_goal(goal_id) + + return { + "goal":goal.to_dict() + }, 200 + +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except: + response = {"message": f"goal {goal_id} invalid"} + abort(make_response(response , 400)) + + query = db.select(Goal).where(Goal.id == goal_id) + goal = db.session.scalar(query) + + if not goal: + response = {"message": f"goal {goal_id} not found"} + abort(make_response(response, 404)) + return goal + +@goals_bp.put("/") +def update_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + + goal.title = request_body.get("title", goal.title) + db.session.commit() + + return { + "goal":goal.to_dict() + }, 200 + +@goals_bp.delete("/") +def delete_goal(goal_id): + goal = validate_goal(goal_id) + + db.session.delete(goal) + db.session.commit() + + return jsonify({ + "details": f'Goal {goal.id} "{goal.title}" successfully deleted' + }), 200 + + + + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 4c0ad08f0..48f55b4c6 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -3,6 +3,8 @@ from sqlalchemy import desc from datetime import datetime from ..db import db +import os +import requests tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -133,6 +135,27 @@ def mark_task_complete(task_id): "task":task.to_dict() }, 200 +def patch_complete(task_id): + task = validate_task(Task, task_id) + task.completed_at = datetime.now().isoformat() + db.session.commit() + + url = "https://slack.com/api/chat.postMessage" + headers = { + "Authorization": f"Bearer {os.environ.get('SLACK_API_KEY')}", + "Content-Type": "application/json" + } + data = { + "channel" : "#task-notifications", + "text": f"Someone just completed the task {task.title}" + } + + requests.post(url, headers=headers, json=data) + + response = {"task": task.to_dict()} + + return response, 200 + @tasks_bp.patch("//mark_incomplete") def mark_task_incomplete(task_id): task = validate_task(task_id) diff --git a/migrations/versions/9bf7edbb27cd_.py b/migrations/versions/9bf7edbb27cd_.py new file mode 100644 index 000000000..d40f68b80 --- /dev/null +++ b/migrations/versions/9bf7edbb27cd_.py @@ -0,0 +1,44 @@ +"""empty message + +Revision ID: 9bf7edbb27cd +Revises: 80a00b32f2ea +Create Date: 2024-11-07 01:32:27.133266 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9bf7edbb27cd' +down_revision = '80a00b32f2ea' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) + + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.alter_column('completed_at', + existing_type=sa.BOOLEAN(), + type_=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.alter_column('completed_at', + existing_type=sa.DateTime(), + type_=sa.BOOLEAN(), + nullable=False) + + 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 aee7c52a1..f6f43dfe0 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ import pytest +from app.models.goal import 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_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,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 +30,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 +47,25 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + #raise Exception("Complete test") # Assert + assert response.status_code == 404 + assert "message" in response_body + assert response_body["message"] == "goal 1 not found" # ---- Complete Test ---- # assertion 1 goes here # assertion 2 goes here # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +84,44 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") + #raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title", + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title", + } + } + goal = Goal.query.get(1) + assert goal.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") + #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 "message" in response_body + 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_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -122,29 +136,32 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") + response_body = response.get_json() assert response.status_code == 404 + assert response_body == {"message": "goal 1 not found"} + # assert Goal.query.get(1) is None - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - + #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 "message" in response_body + assert response_body == {"message": "goal 1 not found"} + assert Goal.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From fac5994e89887f11ba544b0df5e293e33519eaee Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 8 Nov 2024 00:29:18 -0500 Subject: [PATCH 06/18] wave 6 Add relationship between Goal and Task --- app/__init__.py | 5 +++ app/models/goal.py | 6 ++- app/models/task.py | 20 ++++----- ..._add_relationship_between_goal_and_task.py | 41 +++++++++++++++++++ migrations/versions/9bf7edbb27cd_.py | 18 ++------ tests/test_wave_06.py | 12 +++--- 6 files changed, 69 insertions(+), 33 deletions(-) create mode 100644 migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py diff --git a/app/__init__.py b/app/__init__.py index d447c7be7..11615e7f6 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,10 +1,15 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate from .db import db, migrate from .models import task, goal from app.routes.task_routes import tasks_bp from app.routes.goal_routes import goals_bp import os +db = SQLAlchemy() +migrate = Migrate() + def create_app(config=None): app = Flask(__name__) diff --git a/app/models/goal.py b/app/models/goal.py index 38e7a4403..37da9a4e3 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,10 +5,14 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title:Mapped[str] + tasks: Mapped[list["Task"]] = relationship("Task", backref="goal", lazy="dynamic") + def to_dict(self): + from .task import Task goal_as_dict = { "id": self.id, - "title": self.title + "title": self.title, + "tasks": [task.id for task in self.tasks] } return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index b6fb754ff..957c38484 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,6 +2,7 @@ from sqlalchemy import ForeignKey from datetime import datetime from typing import Optional +from .goal import Goal from ..db import db class Task(db.Model): @@ -10,21 +11,16 @@ class Task(db.Model): description: Mapped[str] completed_at: Mapped[Optional[datetime]] + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True) + + goal: Mapped[Optional["Goal"]] = relationship("Goal", backref="tasks", lazy="joined") + def to_dict(self): task_as_dict ={ "id": self.id, "title": self.title, "description": self.description, - "is_complete": bool(self.completed_at) + "is_complete": bool(self.completed_at), + "goal_id": self.goal_id } - return task_as_dict - - -# @classmethod -# def from_dict(cls, task_data): -# new_task = cls( -# title=task_data["title"], -# description=task_data["description"], -# completed_at=task_data.get("completed_at") -# ) -# return new_task \ No newline at end of file + return task_as_dict \ No newline at end of file diff --git a/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py b/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py new file mode 100644 index 000000000..bd1a0be81 --- /dev/null +++ b/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py @@ -0,0 +1,41 @@ +"""Add relationship between Goal and Task + +Revision ID: 34aa076d8f80 +Revises: 9bf7edbb27cd +Create Date: 2024-11-08 00:24:57.773119 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '34aa076d8f80' +down_revision = '9bf7edbb27cd' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('goal') + op.drop_table('task') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('task', + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=False), + sa.Column('completed_at', sa.BOOLEAN(), autoincrement=False, nullable=False), + sa.Column('goal_id', sa.INTEGER(), autoincrement=False, nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], name='task_goal_id_fkey'), + sa.PrimaryKeyConstraint('id', name='task_pkey') + ) + op.create_table('goal', + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id', name='goal_pkey') + ) + # ### end Alembic commands ### diff --git a/migrations/versions/9bf7edbb27cd_.py b/migrations/versions/9bf7edbb27cd_.py index d40f68b80..01a2f5f89 100644 --- a/migrations/versions/9bf7edbb27cd_.py +++ b/migrations/versions/9bf7edbb27cd_.py @@ -18,14 +18,9 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('goal', schema=None) as batch_op: - batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) - with op.batch_alter_table('task', schema=None) as batch_op: - batch_op.alter_column('completed_at', - existing_type=sa.BOOLEAN(), - type_=sa.DateTime(), - nullable=True) + 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 ### @@ -33,12 +28,7 @@ def upgrade(): def downgrade(): # ### commands auto generated by Alembic - please adjust! ### with op.batch_alter_table('task', schema=None) as batch_op: - batch_op.alter_column('completed_at', - existing_type=sa.DateTime(), - type_=sa.BOOLEAN(), - nullable=False) - - with op.batch_alter_table('goal', schema=None) as batch_op: - batch_op.drop_column('title') + 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 8afa4325e..8ffbf337e 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -57,7 +57,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +74,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -99,7 +99,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +#@pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From ed8f9ba01138803e449512c243e02c93b13203b8 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 8 Nov 2024 11:26:38 -0500 Subject: [PATCH 07/18] completed Wave 06 --- app/models/goal.py | 2 +- app/routes/goal_routes.py | 33 +++++++++++++++++++++++++++++++++ app/routes/task_routes.py | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 37da9a4e3..8b459b396 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,6 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from .task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) @@ -8,7 +9,6 @@ class Goal(db.Model): tasks: Mapped[list["Task"]] = relationship("Task", backref="goal", lazy="dynamic") def to_dict(self): - from .task import Task goal_as_dict = { "id": self.id, "title": self.title, diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index f35e13e8d..e37d9266a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, request, make_response, abort, jsonify from app.models.goal import Goal +from app.routes.task_routes import validate_task from ..db import db goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @@ -77,6 +78,38 @@ def delete_goal(goal_id): "details": f'Goal {goal.id} "{goal.title}" successfully deleted' }), 200 +@goals_bp.post("//tasks") +def add_tasks_to_goal(goal_id): + goal=validate_goal(goal_id) + request_body=request.get_json() + + task_list= request_body["task_ids"] + + for task in task_list: + task = validate_task(task) + task.goal_id = goal_id + db.session.commit() + + task_ids =[] + for task in goal.tasks: + task_ids.append(task.id) + + response = { + "id": goal.id, + "task_ids": task_ids + } + return response, 200 + +@goals_bp.get("//tasks") +def get_tasks_for_goal(goal_id): + goal = validate_goal(goal_id) + response = { + "id": goal.id, + "title": goal.title, + "tasks":[task.to_dict() for task in goal.tasks] + } + return response + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 48f55b4c6..257e3ad40 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -136,7 +136,7 @@ def mark_task_complete(task_id): }, 200 def patch_complete(task_id): - task = validate_task(Task, task_id) + task = validate_task(task_id) task.completed_at = datetime.now().isoformat() db.session.commit() From 0839c41a6e4c783660912e47994ab830eddbac4c Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 8 Nov 2024 11:31:38 -0500 Subject: [PATCH 08/18] add wave 6 test --- tests/test_wave_06.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8ffbf337e..dff5a5dfa 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -50,8 +50,9 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": f"Goal not found"} - raise Exception("Complete test with assertion about response body") + #raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From 12e18e78481dc04738047a21aa5951e671229747 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 8 Nov 2024 12:23:06 -0500 Subject: [PATCH 09/18] Fix __init__ porblem --- app/__init__.py | 2 -- app/models/goal.py | 7 +++---- app/models/task.py | 8 ++++---- app/routes/goal_routes.py | 4 ++-- tests/test_wave_06.py | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 11615e7f6..26c920961 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,8 +7,6 @@ from app.routes.goal_routes import goals_bp import os -db = SQLAlchemy() -migrate = Migrate() def create_app(config=None): app = Flask(__name__) diff --git a/app/models/goal.py b/app/models/goal.py index 8b459b396..b201e854d 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,14 +1,13 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db -from .task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title:Mapped[str] + title: Mapped[str] = mapped_column() - tasks: Mapped[list["Task"]] = relationship("Task", backref="goal", lazy="dynamic") + #tasks: Mapped[list["Task"]] = relationship("Task", backref="goal", lazy="dynamic") - def to_dict(self): + def to_dict(self): goal_as_dict = { "id": self.id, "title": self.title, diff --git a/app/models/task.py b/app/models/task.py index 957c38484..ca52b3300 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,14 +2,14 @@ from sqlalchemy import ForeignKey from datetime import datetime from typing import Optional -from .goal import Goal from ..db import db class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] - description: Mapped[str] - completed_at: Mapped[Optional[datetime]] + title: Mapped[str] = mapped_column() + description: Mapped[str] = mapped_column() + completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index e37d9266a..31a4863d8 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -43,9 +43,9 @@ def get_one_goal(goal_id): def validate_goal(goal_id): try: goal_id = int(goal_id) - except: + except ValueError: response = {"message": f"goal {goal_id} invalid"} - abort(make_response(response , 400)) + abort(make_response(response, 400)) query = db.select(Goal).where(Goal.id == goal_id) goal = db.session.scalar(query) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index dff5a5dfa..2ef6c0c51 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -50,7 +50,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - assert response_body == {"message": f"Goal not found"} + #assert response_body == {"message": f"goal not found"} #raise Exception("Complete test with assertion about response body") # ***************************************************************** From d1ef313807801970dbae83f8428d0b86861cda56 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 8 Nov 2024 12:53:51 -0500 Subject: [PATCH 10/18] Pass all test! --- app/models/goal.py | 2 +- app/models/task.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index b201e854d..fe5afa2ce 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -11,7 +11,7 @@ def to_dict(self): goal_as_dict = { "id": self.id, "title": self.title, - "tasks": [task.id for task in self.tasks] + "tasks": [task.id for task in self.tasks] # just for wave 6 } return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index ca52b3300..fa80558bf 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -21,6 +21,6 @@ def to_dict(self): "title": self.title, "description": self.description, "is_complete": bool(self.completed_at), - "goal_id": self.goal_id + "goal_id": self.goal_id # just for wave 6 } return task_as_dict \ No newline at end of file From 62841f1bd107447f90ff843f92e64658d52a311b Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 8 Nov 2024 13:20:36 -0500 Subject: [PATCH 11/18] completed wave 6 test --- tests/test_wave_06.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 2ef6c0c51..e3ff7b1c5 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -50,7 +50,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - #assert response_body == {"message": f"goal not found"} + assert response_body == {"message": "goal 1 not found"} #raise Exception("Complete test with assertion about response body") # ***************************************************************** From 03c2d6f73c171fd51809c55eb6d5bf8291d45b3b Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 8 Nov 2024 21:56:38 -0500 Subject: [PATCH 12/18] wave 07 --- app/models/task.py | 7 +++---- app/routes/task_routes.py | 2 +- .../34aa076d8f80_add_relationship_between_goal_and_task.py | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index fa80558bf..f790b59ba 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,10 +6,9 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] = mapped_column() - description: Mapped[str] = mapped_column() - completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) - + title: Mapped[str] = mapped_column() + description: Mapped[str] = mapped_column() + completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 257e3ad40..838fe7275 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -146,7 +146,7 @@ def patch_complete(task_id): "Content-Type": "application/json" } data = { - "channel" : "#task-notifications", + "channel" : "#api-test-channel", "text": f"Someone just completed the task {task.title}" } diff --git a/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py b/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py index bd1a0be81..8a76df8a6 100644 --- a/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py +++ b/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py @@ -18,7 +18,8 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('goal') + #op.drop_table('goal') + op.execute("DROP TABLE IF EXISTS goal CASCADE") op.drop_table('task') # ### end Alembic commands ### From 37d4156b39cd9a444421bcf21c708bd24d2a37e0 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Mon, 11 Nov 2024 00:12:59 -0500 Subject: [PATCH 13/18] Fix wave 6 migrations --- ..._add_relationship_between_goal_and_task.py | 21 ++++++------------- migrations/versions/80a00b32f2ea_.py | 4 ++-- migrations/versions/9bf7edbb27cd_.py | 12 +++++------ 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py b/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py index 8a76df8a6..321a07410 100644 --- a/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py +++ b/migrations/versions/34aa076d8f80_add_relationship_between_goal_and_task.py @@ -19,24 +19,15 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### #op.drop_table('goal') - op.execute("DROP TABLE IF EXISTS goal CASCADE") - op.drop_table('task') + 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! ### - op.create_table('task', - sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), - sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=False), - sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=False), - sa.Column('completed_at', sa.BOOLEAN(), autoincrement=False, nullable=False), - sa.Column('goal_id', sa.INTEGER(), autoincrement=False, nullable=True), - sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], name='task_goal_id_fkey'), - sa.PrimaryKeyConstraint('id', name='task_pkey') - ) - op.create_table('goal', - sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), - sa.PrimaryKeyConstraint('id', name='goal_pkey') - ) + 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/migrations/versions/80a00b32f2ea_.py b/migrations/versions/80a00b32f2ea_.py index cd035a02c..6b5ad08bb 100644 --- a/migrations/versions/80a00b32f2ea_.py +++ b/migrations/versions/80a00b32f2ea_.py @@ -1,4 +1,4 @@ -"""empty message +"""adds Task model Revision ID: 80a00b32f2ea Revises: @@ -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=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), sa.PrimaryKeyConstraint('id') ) # ### end Alembic commands ### diff --git a/migrations/versions/9bf7edbb27cd_.py b/migrations/versions/9bf7edbb27cd_.py index 01a2f5f89..4dc429ba2 100644 --- a/migrations/versions/9bf7edbb27cd_.py +++ b/migrations/versions/9bf7edbb27cd_.py @@ -1,4 +1,4 @@ -"""empty message +"""adds Goal model Revision ID: 9bf7edbb27cd Revises: 80a00b32f2ea @@ -18,17 +18,15 @@ 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']) + 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('task', schema=None) as batch_op: - batch_op.drop_constraint(None, type_='foreignkey') - batch_op.drop_column('goal_id') + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.drop_column('title') # ### end Alembic commands ### From 55cefa37454e438935aa39df6c125f032c20733d Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 15 Nov 2024 11:48:46 -0500 Subject: [PATCH 14/18] pass all test --- app/models/goal.py | 12 ++++++++---- app/models/task.py | 11 ++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index fe5afa2ce..4fbb151af 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,13 +5,17 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] = mapped_column() - #tasks: Mapped[list["Task"]] = relationship("Task", backref="goal", lazy="dynamic") - def to_dict(self): goal_as_dict = { "id": self.id, "title": self.title, - "tasks": [task.id for task in self.tasks] # just for wave 6 } - + + if self.tasks: + goal_as_dict = { + "id": self.id, + "title": self.title, + "tasks": [task.id for task in self.tasks] + } + return goal_as_dict diff --git a/app/models/task.py b/app/models/task.py index f790b59ba..bc64021d3 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -13,13 +13,22 @@ class Task(db.Model): goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True) goal: Mapped[Optional["Goal"]] = relationship("Goal", backref="tasks", lazy="joined") - + def to_dict(self): task_as_dict ={ "id": self.id, "title": self.title, "description": self.description, "is_complete": bool(self.completed_at), + } + + if self.goal: + task_as_dict ={ + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": bool(self.completed_at), "goal_id": self.goal_id # just for wave 6 } + return task_as_dict \ No newline at end of file From 32c9518495c8fe3a39441dd39363deaaffac85c5 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 15 Nov 2024 11:52:19 -0500 Subject: [PATCH 15/18] update ordering by id in get_all_tasks --- app/routes/task_routes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 838fe7275..872a69eef 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -59,8 +59,10 @@ def get_all_tasks(): query = query.order_by(Task.title) if sort_param == "desc": query = query.order_by(desc(Task.title)) + else: + query = query.order_by(Task.id) - tasks = db.session.scalars(query.order_by(Task.id)) + tasks = db.session.scalars(query) tasks_response = [] for task in tasks: From 35f9714079ad0ecb9c960d1a2c8bfbae12ba49a1 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Fri, 15 Nov 2024 11:56:40 -0500 Subject: [PATCH 16/18] Remove backref --- app/models/goal.py | 2 ++ app/models/task.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/goal.py b/app/models/goal.py index 4fbb151af..0f8ba6a6f 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -5,6 +5,8 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] = mapped_column() + tasks: Mapped[list["Task"]] = relationship("Task", back_populates="goal") + def to_dict(self): goal_as_dict = { "id": self.id, diff --git a/app/models/task.py b/app/models/task.py index bc64021d3..0335be4a7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -12,7 +12,7 @@ class Task(db.Model): goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True) - goal: Mapped[Optional["Goal"]] = relationship("Goal", backref="tasks", lazy="joined") + goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") def to_dict(self): task_as_dict ={ From 9a66616897deaf7128b50406a70bec7cb4b94fed Mon Sep 17 00:00:00 2001 From: Weixi He Date: Mon, 18 Nov 2024 02:52:21 -0500 Subject: [PATCH 17/18] update about Pull requests --- app/__init__.py | 2 -- app/models/goal.py | 2 +- app/models/task.py | 8 ++++---- app/routes/goal_routes.py | 6 ++---- tests/test_wave_05.py | 3 ++- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 26c920961..1145a3698 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,4 @@ from flask import Flask -from flask_sqlalchemy import SQLAlchemy -from flask_migrate import Migrate from .db import db, migrate from .models import task, goal from app.routes.task_routes import tasks_bp diff --git a/app/models/goal.py b/app/models/goal.py index 0f8ba6a6f..57ce01799 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,7 +3,7 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] = mapped_column() + title: Mapped[str] tasks: Mapped[list["Task"]] = relationship("Task", back_populates="goal") diff --git a/app/models/task.py b/app/models/task.py index 0335be4a7..7343a4bf9 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,11 +6,11 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] = mapped_column() - description: Mapped[str] = mapped_column() - completed_at: Mapped[Optional[datetime]] = mapped_column(nullable=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[Optional[datetime]] - goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"), nullable=True) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 31a4863d8..048435eea 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -26,10 +26,8 @@ def get_all_goals(): query = db.select(Goal) goals = db.session.scalars(query) - goals_response =[] - for goal in goals: - goals_response.append(goal.to_dict()) - + goals_response = [] + goals_response = [goal.to_dict() for goal in goals] return goals_response @goals_bp.get("/") diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index f6f43dfe0..8367792f0 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,5 +1,6 @@ import pytest from app.models.goal import Goal +from app.db import db #@pytest.mark.skip(reason="No way to test this feature yet") @@ -102,7 +103,7 @@ def test_update_goal(client, one_goal): "title": "Updated Goal Title", } } - goal = Goal.query.get(1) + goal = db.session.get(Goal, 1) assert goal.title == "Updated Goal Title" From f1d7d17914927cdf214a95a7ae1d589e072bb2f8 Mon Sep 17 00:00:00 2001 From: Weixi He Date: Tue, 19 Nov 2024 11:39:36 -0500 Subject: [PATCH 18/18] deploy slack api --- app/routes/task_routes.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 872a69eef..541fd9773 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -124,7 +124,7 @@ def delete_task(task_id): "details": f'Task {task.id} "{task.title}" successfully deleted' }), 200 -@tasks_bp.patch("//mark_complete") + def mark_task_complete(task_id): task = validate_task(task_id) if not task: @@ -137,6 +137,7 @@ def mark_task_complete(task_id): "task":task.to_dict() }, 200 +@tasks_bp.patch("//mark_complete") def patch_complete(task_id): task = validate_task(task_id) task.completed_at = datetime.now().isoformat() @@ -152,11 +153,13 @@ def patch_complete(task_id): "text": f"Someone just completed the task {task.title}" } - requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=data) + + print("Slack API Response:", response.status_code, response.json()) - response = {"task": task.to_dict()} + response_data = {"task": task.to_dict()} - return response, 200 + return response_data, 200 @tasks_bp.patch("//mark_incomplete") def mark_task_incomplete(task_id):