From 2619e34cdf9b7ee1962e97f50aee37ec8ceaec73 Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Thu, 7 Nov 2024 17:20:35 -0500 Subject: [PATCH 01/13] made all tests pass --- app/__init__.py | 2 + app/models/task.py | 5 ++ app/routes/task_routes.py | 102 +++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++++ migrations/env.py | 113 +++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/393dca8969e4_.py | 39 +++++++++ tests/test_wave_01.py | 43 ++++------ 9 files changed, 351 insertions(+), 28 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/393dca8969e4_.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..a356fed22 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from .db import db, migrate from .models import task, goal import os +from .routes.task_routes import tasks_bp def create_app(config=None): app = Flask(__name__) @@ -18,5 +19,6 @@ def create_app(config=None): migrate.init_app(app, db) # Register Blueprints here + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..e884d51f4 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,10 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from datetime import datetime +from typing import Optional class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[Optional[datetime]] diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..e7a0e8183 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,101 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, Response, abort, make_response +from ..models.task import Task +from ..db import db + + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +# make a POST request to /tasks with the following HTTP request body +@tasks_bp.post("") +def create_task(): + request_body = request.get_json() + + title = request_body.get("title", None) + description = request_body.get("description", None) + completed_at = request_body.get("completed_at", None) + + if not title or not description: + response = {"details": f"Invalid data"} + abort(make_response(response, 400)) + + new_task = Task(title=title, description=description, completed_at=completed_at) + db.session.add(new_task) + db.session.commit() + + response = {"task": dict( + id=new_task.id, + title=new_task.title, + description=new_task.description, + is_complete=True if new_task.completed_at is not None else False + )} + + return response, 201 + +# GET request to /tasks +@tasks_bp.get("") +def get_all_task(): + query = db.select(Task).order_by(Task.id) + tasks = db.session.scalars(query) + + tasks_response = [] + for task in tasks: + tasks_response.append(dict( + id=task.id, + title=task.title, + description=task.description, + is_complete=True if task.completed_at is not None else False + )) + return tasks_response + +@tasks_bp.get("/") +def get_one_task(task_id): + task = validate_task(task_id) + + return {"task": dict( + id=task.id, + title=task.title, + description=task.description, + is_complete=True if task.completed_at is not None else False + )} + +@tasks_bp.put("/") +def update_task(task_id): + task = validate_task(task_id) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return { "task": dict( + id=task.id, + title=task.title, + description=task.description, + is_complete=True if task.completed_at is not None else False + )} + +@tasks_bp.delete("/") +def delete_task(task_id): + task = validate_task(task_id) + db.session.delete(task) + db.session.commit() + + return {"details": f"Task {task_id} \"{task.title}\" successfully deleted"} + +def validate_task(task_id): + try: + task_id = int(task_id) + except: + response = {"message": f"Task {task_id} is 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} was not found"} + abort(make_response(response, 404)) + + return task + 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/393dca8969e4_.py b/migrations/versions/393dca8969e4_.py new file mode 100644 index 000000000..d224e7d8d --- /dev/null +++ b/migrations/versions/393dca8969e4_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 393dca8969e4 +Revises: +Create Date: 2024-11-01 12:24:55.062105 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '393dca8969e4' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('task', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..6fa03a9f8 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,12 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + ##### new added assertion + assert response_body == {"message": "Task 1 was not found"} + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +91,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 +117,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 +128,10 @@ 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 1 was 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") @@ -152,7 +146,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,16 +154,11 @@ 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 1 was not found"} 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 +175,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={ From f153a4d8363d527f538df5d85e8b13c8446622c0 Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Fri, 8 Nov 2024 13:12:54 -0500 Subject: [PATCH 02/13] created obj_to_dict to refactor task obj creation --- app/models/task.py | 22 ++++++++++++++++ app/routes/task_routes.py | 55 ++++++++++++++++++++------------------- tests/test_wave_02.py | 4 +-- tests/test_wave_03.py | 28 +++++++++----------- 4 files changed, 64 insertions(+), 45 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index e884d51f4..cbfd7ee87 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,3 +8,25 @@ class Task(db.Model): title: Mapped[str] description: Mapped[str] completed_at: Mapped[Optional[datetime]] + + # book object to dict representation + def obj_to_dict(self): + task_as_dict = {} + task_as_dict["id"] = self.id + task_as_dict["title"] = self.title + task_as_dict["description"] = self.description + task_as_dict["is_complete"] = True if self.completed_at is not None else False + + return task_as_dict + + @classmethod + # create instance from request body + def obj_from_dict(cls, task_data): + + new_task = cls( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at", None) + ) + + return new_task \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index e7a0e8183..fd2b24dbc 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, request, Response, abort, make_response from ..models.task import Task from ..db import db +from datetime import datetime tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -22,41 +23,33 @@ def create_task(): db.session.add(new_task) db.session.commit() - response = {"task": dict( - id=new_task.id, - title=new_task.title, - description=new_task.description, - is_complete=True if new_task.completed_at is not None else False - )} + response = {"task": new_task.obj_to_dict()} return response, 201 # GET request to /tasks @tasks_bp.get("") def get_all_task(): - query = db.select(Task).order_by(Task.id) + query = db.select(Task) + sort = request.args.get("sort") + + if sort == "asc": + query = query.order_by(Task.title.asc()) + elif sort == "desc": + query = query.order_by(Task.title.desc()) + else: + query = query.order_by(Task.id) tasks = db.session.scalars(query) - tasks_response = [] - for task in tasks: - tasks_response.append(dict( - id=task.id, - title=task.title, - description=task.description, - is_complete=True if task.completed_at is not None else False - )) + tasks_response = [task.obj_to_dict() for task in tasks] + return tasks_response @tasks_bp.get("/") def get_one_task(task_id): task = validate_task(task_id) - return {"task": dict( - id=task.id, - title=task.title, - description=task.description, - is_complete=True if task.completed_at is not None else False - )} + return {"task": task.obj_to_dict()} @tasks_bp.put("/") def update_task(task_id): @@ -68,12 +61,20 @@ def update_task(task_id): db.session.commit() - return { "task": dict( - id=task.id, - title=task.title, - description=task.description, - is_complete=True if task.completed_at is not None else False - )} + return { "task": task.obj_to_dict()} + +@tasks_bp.patch("//") +def update_is_complete(task_id, mark_as): + task = validate_task(task_id) + + if mark_as == "mark_complete": + task.completed_at = datetime.utcnow() + else: + task.completed_at = None + + db.session.commit() + + return { "task": task.obj_to_dict()} @tasks_bp.delete("/") def delete_task(task_id): 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") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..b14153e1d 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,12 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + # added assertion + assert response_body == {"message": "Task 1 was 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") @@ -142,8 +140,6 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # added assertion + assert response_body == {"message": "Task 1 was not found"} + \ No newline at end of file From 7fb6281124072e4d9c35a20995f5bf79e8373905 Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Fri, 8 Nov 2024 13:21:14 -0500 Subject: [PATCH 03/13] created obj_from_dict to refactor post (task obj creation) --- app/models/task.py | 13 ++++++++++--- app/routes/task_routes.py | 12 ++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index cbfd7ee87..37e257a1d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,6 +2,7 @@ from ..db import db from datetime import datetime from typing import Optional +from flask import make_response, abort class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) @@ -22,10 +23,16 @@ def obj_to_dict(self): @classmethod # create instance from request body def obj_from_dict(cls, task_data): - + title = task_data.get("title", None) + description = task_data.get("description", None) + + if not title or not description: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + new_task = cls( - title=task_data["title"], - description=task_data["description"], + title=title, + description=description, completed_at=task_data.get("completed_at", None) ) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index fd2b24dbc..48e3f712d 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -10,16 +10,8 @@ @tasks_bp.post("") def create_task(): request_body = request.get_json() - - title = request_body.get("title", None) - description = request_body.get("description", None) - completed_at = request_body.get("completed_at", None) - - if not title or not description: - response = {"details": f"Invalid data"} - abort(make_response(response, 400)) - - new_task = Task(title=title, description=description, completed_at=completed_at) + new_task = Task.obj_from_dict(request_body) + db.session.add(new_task) db.session.commit() From 53766316ffbbf25b1395cfb60deee30971b877ff Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Fri, 8 Nov 2024 14:01:23 -0500 Subject: [PATCH 04/13] create goal bp and post --- app/__init__.py | 5 ++++- app/models/goal.py | 24 +++++++++++++++++++++ app/routes/goal_routes.py | 16 +++++++++++++- app/routes/task_routes.py | 14 ++++++------ migrations/versions/a86c4336095b_.py | 32 ++++++++++++++++++++++++++++ tests/test_wave_05.py | 6 +++--- 6 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 migrations/versions/a86c4336095b_.py diff --git a/app/__init__.py b/app/__init__.py index a356fed22..1873a6984 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,7 +2,8 @@ from .db import db, migrate from .models import task, goal import os -from .routes.task_routes import tasks_bp +from .routes.task_routes import bp as tasks_bp +from .routes.goal_routes import bp as goals_bp def create_app(config=None): app = Flask(__name__) @@ -20,5 +21,7 @@ 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..3ba71a5d6 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,29 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from flask import abort, make_response class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + + def obj_to_dict(self): + goal_as_dict = {} + goal_as_dict["id"] = self.id + goal_as_dict["title"] = self.title + + return goal_as_dict + + + @classmethod + def obj_from_dict(cls, goal_data): + title = goal_data.get("title", None) + + if not title: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + new_goal = cls( + title=title + ) + + return new_goal \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..b47235cd1 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,15 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, Response, request +from ..models.goal import Goal +from ..db import db + +bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@bp.post("") +def create_goal(): + request_body = request.get_json() + new_goal = Goal.obj_from_dict(request_body) + + db.session.add(new_goal) + db.session.commit() + response = {"goal": new_goal.obj_to_dict()} + return response, 201 diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 48e3f712d..776eb90dd 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -4,10 +4,10 @@ from datetime import datetime -tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") # make a POST request to /tasks with the following HTTP request body -@tasks_bp.post("") +@bp.post("") def create_task(): request_body = request.get_json() new_task = Task.obj_from_dict(request_body) @@ -20,7 +20,7 @@ def create_task(): return response, 201 # GET request to /tasks -@tasks_bp.get("") +@bp.get("") def get_all_task(): query = db.select(Task) sort = request.args.get("sort") @@ -37,13 +37,13 @@ def get_all_task(): return tasks_response -@tasks_bp.get("/") +@bp.get("/") def get_one_task(task_id): task = validate_task(task_id) return {"task": task.obj_to_dict()} -@tasks_bp.put("/") +@bp.put("/") def update_task(task_id): task = validate_task(task_id) request_body = request.get_json() @@ -55,7 +55,7 @@ def update_task(task_id): return { "task": task.obj_to_dict()} -@tasks_bp.patch("//") +@bp.patch("//") def update_is_complete(task_id, mark_as): task = validate_task(task_id) @@ -68,7 +68,7 @@ def update_is_complete(task_id, mark_as): return { "task": task.obj_to_dict()} -@tasks_bp.delete("/") +@bp.delete("/") def delete_task(task_id): task = validate_task(task_id) db.session.delete(task) diff --git a/migrations/versions/a86c4336095b_.py b/migrations/versions/a86c4336095b_.py new file mode 100644 index 000000000..aea2aa69b --- /dev/null +++ b/migrations/versions/a86c4336095b_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: a86c4336095b +Revises: 393dca8969e4 +Create Date: 2024-11-08 13:51:19.555538 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a86c4336095b' +down_revision = '393dca8969e4' +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 aee7c52a1..bd5fca6b0 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -61,7 +61,7 @@ def test_get_goal_not_found(client): # ---- 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={ @@ -144,7 +144,7 @@ def test_delete_goal_not_found(client): # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From 6cd79bce56966fdbc08ecebb57761a8531790385 Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Fri, 8 Nov 2024 14:09:53 -0500 Subject: [PATCH 05/13] finishes get all endpoint --- app/routes/goal_routes.py | 9 +++++++++ tests/test_wave_05.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index b47235cd1..1f024f91c 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -13,3 +13,12 @@ def create_goal(): db.session.commit() response = {"goal": new_goal.obj_to_dict()} return response, 201 + +@bp.get("") +def get_all_goals(): + query = db.select(Goal).order_by(Goal.id) + goals = db.session.scalars(query) + + goals_response = [goal.obj_to_dict() for goal in goals] + return goals_response + diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index bd5fca6b0..26d37fc4f 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -12,7 +12,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +29,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") From 4ab176d0b1567edb67b15c66a12b9ce5a1a250c8 Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Fri, 8 Nov 2024 14:22:35 -0500 Subject: [PATCH 06/13] finishes get one goal endpoint --- app/routes/goal_routes.py | 24 +++++++++++++++++++++++- app/routes/task_routes.py | 2 +- tests/test_wave_05.py | 10 +++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 1f024f91c..2a9dac4cd 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint, Response, request +from flask import Blueprint, Response, request, abort, make_response from ..models.goal import Goal from ..db import db @@ -22,3 +22,25 @@ def get_all_goals(): goals_response = [goal.obj_to_dict() for goal in goals] return goals_response +@bp.get("/") +def get_one_goal(goal_id): + goal = validate_goal(goal_id) + + return {"goal": goal.obj_to_dict()}, 200 + + +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except: + response = {"message": f"Goal {goal_id} is 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} was not found"} + abort(make_response(response, 404)) + + return goal \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 776eb90dd..400dd5c4c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -41,7 +41,7 @@ def get_all_task(): def get_one_task(task_id): task = validate_task(task_id) - return {"task": task.obj_to_dict()} + return {"task": task.obj_to_dict()}, 200 @bp.put("/") def update_task(task_id): diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 26d37fc4f..c69e37e12 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -46,19 +46,15 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") - # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 was not found"} # @pytest.mark.skip(reason="No way to test this feature yet") From 4fc1c430a8ed4175f8f07222540f9738a944557e Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Fri, 8 Nov 2024 14:31:17 -0500 Subject: [PATCH 07/13] makes delete one goal endpoint --- app/routes/goal_routes.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 2a9dac4cd..8db592259 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -29,6 +29,17 @@ def get_one_goal(goal_id): return {"goal": goal.obj_to_dict()}, 200 +@bp.delete("/") +def delete_one_goal(goal_id): + goal = validate_goal(goal_id) + + db.session.delete(goal) + db.session.commit() + + response = {"details": f"Goal {goal.id} \"{goal.title}\" successfully deleted "} + return response, 200 + + def validate_goal(goal_id): try: goal_id = int(goal_id) From 011c7399343d383d18fdfb10332a80eb58d55dbc Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Fri, 8 Nov 2024 14:37:23 -0500 Subject: [PATCH 08/13] edit delete endpoint response and added test assertions --- app/routes/goal_routes.py | 3 ++- tests/test_wave_05.py | 25 ++++++++----------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 8db592259..fbde1274a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -36,10 +36,11 @@ def delete_one_goal(goal_id): db.session.delete(goal) db.session.commit() - response = {"details": f"Goal {goal.id} \"{goal.title}\" successfully deleted "} + response = {"details": f"Goal {goal.id} \"{goal.title}\" successfully deleted"} return response, 200 + def validate_goal(goal_id): try: goal_id = int(goal_id) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index c69e37e12..fb13847d5 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -103,7 +103,7 @@ def test_update_goal_not_found(client): # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -118,26 +118,17 @@ 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 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message": "Goal 1 was not found"} -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - - # Act - # ---- Complete Act Here ---- - - # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 was not found"} # @pytest.mark.skip(reason="No way to test this feature yet") From e5fa34d187928cc6472fab70dcb65837db8b757c Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Sun, 10 Nov 2024 18:02:47 -0500 Subject: [PATCH 09/13] finished wave 5, then went to implement wave 4 --- app/routes/goal_routes.py | 13 +++++++++ app/routes/task_routes.py | 60 +++++++++++++++++++++++++++++++++------ tests/test_wave_05.py | 43 ++++++++++++++-------------- 3 files changed, 87 insertions(+), 29 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index fbde1274a..bcf06126a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -29,6 +29,19 @@ def get_one_goal(goal_id): return {"goal": goal.obj_to_dict()}, 200 +@bp.put("/") +def update_one_goal(goal_id): + goal = validate_goal(goal_id) + + request_body = request.get_json() + goal.title = request_body["title"] + + db.session.commit() + + response = {"goal": goal.obj_to_dict()} + return response, 200 + + @bp.delete("/") def delete_one_goal(goal_id): goal = validate_goal(goal_id) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 400dd5c4c..509c3ba3b 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,6 +2,8 @@ from ..models.task import Task from ..db import db from datetime import datetime +import requests +import os bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -55,18 +57,60 @@ def update_task(task_id): return { "task": task.obj_to_dict()} -@bp.patch("//") -def update_is_complete(task_id, mark_as): +@bp.patch("//mark_complete") +def update_complete(task_id): task = validate_task(task_id) + task.completed_at = datetime.utcnow() - if mark_as == "mark_complete": - task.completed_at = datetime.utcnow() - else: - task.completed_at = None - db.session.commit() - return { "task": task.obj_to_dict()} + path = "https://slack.com/api/chat.postMessage" + token = os.environ.get("SLACK_BOT_TOKEN") + channel_id = "C07V4J7ABF1" + + headers = { + "Authorization": f"Bearer {token}" + } + data = { + "channel": channel_id, + "text": f"Someone just completed the task {task.title}" + } + + requests.post(path, headers=headers, json=data) + + response = {"task": task.obj_to_dict()} + return response, 200 + + +@bp.patch("//mark_incomplete") +def update_incomplete(task_id): + task = validate_task(task_id) + task.completed_at = None + + db.session.commit() + + response = {"task": task.obj_to_dict()} + return response, 200 + + + + + + + + + # channel_id = "C07V4J7ABF1" + # try: + # result = client.chat_postMessage( + # channel=channel_id, + # text=f"Someone just completed the task {task.title}" + # ) + # logger.info(result) + + # except SlackApiError as e: + # logger.error(f"Error posting message: {e}") + + # return { "task": task.obj_to_dict()} @bp.delete("/") def delete_task(task_id): diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index fb13847d5..99b0154ec 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -70,37 +70,38 @@ def test_create_goal(client): assert "goal" in response_body assert response_body == { "goal": { - "id": 1, - "title": "My New Goal" + "id": 1, + "title": "My New 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(client, one_goal): - 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 response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } + -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated 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 1 was not found"} # @pytest.mark.skip(reason="No way to test this feature yet") From 5a6b41144a234f8296f4c448ddd672ecff530e3c Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Sun, 10 Nov 2024 22:22:04 -0500 Subject: [PATCH 10/13] wave 6 --- app/models/goal.py | 6 +++-- app/models/task.py | 11 +++++++-- app/routes/goal_routes.py | 33 +++++++++++++++++++++++++++ app/routes/task_routes.py | 20 ---------------- migrations/versions/8c5898a18698_.py | 34 ++++++++++++++++++++++++++++ tests/test_wave_06.py | 20 ++++++++-------- 6 files changed, 89 insertions(+), 35 deletions(-) create mode 100644 migrations/versions/8c5898a18698_.py diff --git a/app/models/goal.py b/app/models/goal.py index 3ba71a5d6..6e6986178 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,10 +1,11 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db from flask import abort, make_response class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") def obj_to_dict(self): goal_as_dict = {} @@ -26,4 +27,5 @@ def obj_from_dict(cls, goal_data): title=title ) - return new_goal \ No newline at end of file + return new_goal + \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 37e257a1d..36c406317 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,19 +1,25 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db from datetime import datetime from typing import Optional from flask import make_response, abort +from sqlalchemy import ForeignKey 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]] + completed_at: Mapped[Optional[datetime]] + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") + # book object to dict representation def obj_to_dict(self): task_as_dict = {} task_as_dict["id"] = self.id + if self.goal: + task_as_dict["goal_id"] = self.goal.id task_as_dict["title"] = self.title task_as_dict["description"] = self.description task_as_dict["is_complete"] = True if self.completed_at is not None else False @@ -34,6 +40,7 @@ def obj_from_dict(cls, task_data): title=title, description=description, completed_at=task_data.get("completed_at", None) + ) return new_task \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index bcf06126a..bdfb2d314 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, Response, request, abort, make_response from ..models.goal import Goal from ..db import db +from ..models.task import Task bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @@ -14,6 +15,23 @@ def create_goal(): response = {"goal": new_goal.obj_to_dict()} return response, 201 +@bp.post("//tasks") +def add_tasks_to_goals(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + task_ids = request_body["task_ids"] + tasks = Task.query.filter(Task.id.in_(task_ids)).all() + goal.tasks = tasks + + db.session.commit() + response = { + "id": goal.id, + "task_ids": task_ids + } + + return response, 200 + + @bp.get("") def get_all_goals(): query = db.select(Goal).order_by(Goal.id) @@ -28,6 +46,21 @@ def get_one_goal(goal_id): return {"goal": goal.obj_to_dict()}, 200 +# get all tasks of a certain goal +@bp.get("//tasks") +def get_all_tasks_of_goal(goal_id): + goal = validate_goal(goal_id) + + tasks_list = [task.obj_to_dict() for task in goal.tasks] + print(tasks_list) + response = { + "id": goal.id, + "title": goal.title, + "tasks": tasks_list + } + + return response, 200 + @bp.put("/") def update_one_goal(goal_id): diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 509c3ba3b..c1ea3c50c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -92,26 +92,6 @@ def update_incomplete(task_id): response = {"task": task.obj_to_dict()} return response, 200 - - - - - - - - # channel_id = "C07V4J7ABF1" - # try: - # result = client.chat_postMessage( - # channel=channel_id, - # text=f"Someone just completed the task {task.title}" - # ) - # logger.info(result) - - # except SlackApiError as e: - # logger.error(f"Error posting message: {e}") - - # return { "task": task.obj_to_dict()} - @bp.delete("/") def delete_task(task_id): task = validate_task(task_id) diff --git a/migrations/versions/8c5898a18698_.py b/migrations/versions/8c5898a18698_.py new file mode 100644 index 000000000..34a4eebb4 --- /dev/null +++ b/migrations/versions/8c5898a18698_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 8c5898a18698 +Revises: a86c4336095b +Create Date: 2024-11-10 18:20:36.233759 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8c5898a18698' +down_revision = 'a86c4336095b' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True)) + batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id']) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.drop_constraint(None, type_='foreignkey') + batch_op.drop_column('goal_id') + + # ### end Alembic commands ### diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..8799541b4 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") @@ -50,14 +50,10 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Goal 1 was not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,12 +70,14 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") response_body = response.get_json() + print(response_body) + # Assert assert response.status_code == 200 assert "tasks" in response_body @@ -99,7 +97,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 224ce9e4f86045e105cfe8729636ca5a8fed1aad Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Sun, 10 Nov 2024 22:24:20 -0500 Subject: [PATCH 11/13] made validate model in route utilities file --- app/routes/route_utilities.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 app/routes/route_utilities.py diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..e9c3d4380 --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,18 @@ +from flask import abort, make_response +from ..db import db + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + response = {"message": f"{cls.__name__} {model_id} is invalid"} + abort(make_response(response, 400)) + + query = db.select(cls).where(cls.id == model_id) + model = db.session.scalar(query) + + if not model: + response = {"message": f"{cls.__name__} {model_id} was not found"} + abort(make_response(response, 404)) + + return model \ No newline at end of file From ff1ccbb74fea01e212bd59e1bc224ae469f4550f Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Sun, 10 Nov 2024 22:50:48 -0500 Subject: [PATCH 12/13] passes all waves --- app/routes/goal_routes.py | 29 +++++++---------------------- app/routes/task_routes.py | 12 ++++++------ 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index bdfb2d314..940a692b3 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,7 +1,8 @@ from flask import Blueprint, Response, request, abort, make_response from ..models.goal import Goal from ..db import db -from ..models.task import Task +from ..models.task import Task +from .route_utilities import validate_model bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @@ -17,7 +18,7 @@ def create_goal(): @bp.post("//tasks") def add_tasks_to_goals(goal_id): - goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) request_body = request.get_json() task_ids = request_body["task_ids"] tasks = Task.query.filter(Task.id.in_(task_ids)).all() @@ -42,14 +43,14 @@ def get_all_goals(): @bp.get("/") def get_one_goal(goal_id): - goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) return {"goal": goal.obj_to_dict()}, 200 # get all tasks of a certain goal @bp.get("//tasks") def get_all_tasks_of_goal(goal_id): - goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) tasks_list = [task.obj_to_dict() for task in goal.tasks] print(tasks_list) @@ -64,7 +65,7 @@ def get_all_tasks_of_goal(goal_id): @bp.put("/") def update_one_goal(goal_id): - goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) request_body = request.get_json() goal.title = request_body["title"] @@ -77,7 +78,7 @@ def update_one_goal(goal_id): @bp.delete("/") def delete_one_goal(goal_id): - goal = validate_goal(goal_id) + goal = validate_model(Goal, goal_id) db.session.delete(goal) db.session.commit() @@ -86,19 +87,3 @@ def delete_one_goal(goal_id): return response, 200 - -def validate_goal(goal_id): - try: - goal_id = int(goal_id) - except: - response = {"message": f"Goal {goal_id} is 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} was not found"} - abort(make_response(response, 404)) - - return goal \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index c1ea3c50c..b1e34ceec 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -41,13 +41,13 @@ def get_all_task(): @bp.get("/") def get_one_task(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) return {"task": task.obj_to_dict()}, 200 @bp.put("/") def update_task(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) request_body = request.get_json() task.title = request_body["title"] @@ -59,7 +59,7 @@ def update_task(task_id): @bp.patch("//mark_complete") def update_complete(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) task.completed_at = datetime.utcnow() db.session.commit() @@ -84,7 +84,7 @@ def update_complete(task_id): @bp.patch("//mark_incomplete") def update_incomplete(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) task.completed_at = None db.session.commit() @@ -94,13 +94,13 @@ def update_incomplete(task_id): @bp.delete("/") def delete_task(task_id): - task = validate_task(task_id) + task = validate_model(Task, task_id) db.session.delete(task) db.session.commit() return {"details": f"Task {task_id} \"{task.title}\" successfully deleted"} -def validate_task(task_id): +def validate_model(Task, task_id): try: task_id = int(task_id) except: From 3234ded36113c6262368c5babb8ae8e518c94c7a Mon Sep 17 00:00:00 2001 From: mayboolean <> Date: Sun, 5 Jan 2025 16:55:40 -0500 Subject: [PATCH 13/13] added CORS --- app/__init__.py | 4 +++- app/models/task.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 1873a6984..87c1e682e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,13 +4,15 @@ import os from .routes.task_routes import bp as tasks_bp from .routes.goal_routes import bp as goals_bp +from flask_cors import CORS 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') - + CORS(app) + app.config['CORS_HEADERS'] = 'Content-Type' if config: # Merge `config` into the app's configuration # to override the app's default settings for testing diff --git a/app/models/task.py b/app/models/task.py index 36c406317..cc98dafd1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,7 +8,7 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] - description: Mapped[str] + description: Mapped[Optional[str]] completed_at: Mapped[Optional[datetime]] goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")