From d6ba97c8483e51d1a79d089880e8faa06eb3325f Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Sun, 3 Nov 2024 23:16:06 -0500 Subject: [PATCH 01/14] finished creating Task model, and wave 1, but no wave 1 tests have passed --- app/models/task.py | 13 +++ app/routes/task_routes.py | 99 ++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++++ migrations/env.py | 113 +++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/584e9f08d2e1_.py | 39 +++++++++ tests/test_wave_01.py | 20 ++--- 8 files changed, 348 insertions(+), 11 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/584e9f08d2e1_.py diff --git a/app/models/task.py b/app/models/task.py index 5d99666a4..373a7c5d2 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,18 @@ from sqlalchemy.orm import Mapped, mapped_column from ..db import db +from datetime import datetime class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[datetime] = mapped_column(nullable=True) + + + def to_dict(self): + return dict( + id=self.id, + title=self.title, + description=self.description, + completed_at=self.completed_at, + ) \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..138b30892 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,98 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, request, Response +from app.db import db +from app.models.task import Task + + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +@tasks_bp.post("") +def create_task(): + request_body = request.get_json() + title = request_body["title"] + description = request_body["description"] + completed_at = request_body["completed_at"] + + new_task = Task(title=title, description=description, completed_at=completed_at) + + # validating a new task with ALL required info + if not new_task: + response = {"details": f"Invalid data"} + abort(make_response(response, 400)) + + db.session.add(new_task) + db.session.commit() + response = new_task.to_dict() + + return response, 201 + +@tasks_bp.get("") +def get_all_task(): + query = db.select(Task) + title_param = request.args.get("title") + + if title_param: + query = query.where(Task.title == 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: + query = query.where(Task.completed_at.ilike(f"%{completed_at_param}%")) + + query = query.order_by(Task.id) + + tasks = db.session.scalars(query) + + tasks_response = [task.to_dict() for task in tasks] + + return tasks_response + + +@tasks_bp.get("/") +def get_one_task(task_id): + task = validate_task(task_id) + response = task.to_dict() + return response + + +@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"] + task.completed_at = request_body["completed_at"] + db.session.commit() + + return Response(status=204, mimetype="application/json") + +@tasks_bp.delete("/") +def delete_task(task_id): + task = validate_task(task_id) + db.session.delete(task) + db.session.commit() + + response = {"details": f"Task {task_id} \{task}\ successfully deleted"} + + # CHECK IF THIS IS CORRECT + return Response(response, status=204, mimetype="application/json") + +def validate_task(task_id): + try: + task_id = int(task_id) + + except: + response = {"details": f"Invalid data"} + abort(make_response(response, 400)) + + query = db.select(Task).where(Task.id == task_id) + task = db.session.scalar(query) + + if not task: + response = {"details": f"Task {task_id} 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/584e9f08d2e1_.py b/migrations/versions/584e9f08d2e1_.py new file mode 100644 index 000000000..a8cdc8b1f --- /dev/null +++ b/migrations/versions/584e9f08d2e1_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 584e9f08d2e1 +Revises: +Create Date: 2024-11-03 23:11:55.913934 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '584e9f08d2e1' +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..dbf9dae64 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") @@ -66,7 +66,7 @@ def test_get_task_not_found(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_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +93,7 @@ def test_create_task(client): assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -119,7 +119,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={ @@ -137,7 +137,7 @@ def test_update_task_not_found(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_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -169,7 +169,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 +186,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 19a1d4be512a50736f44b160ba79c442b174c3a0 Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Wed, 6 Nov 2024 09:16:33 -0500 Subject: [PATCH 02/14] finished wave 1 and 2 - must add get_all_tasks() route back to routes file --- app/__init__.py | 2 + app/models/task.py | 18 ++++++-- app/routes/task_routes.py | 63 +++++++++++++--------------- migrations/versions/9f0b21c68086_.py | 34 +++++++++++++++ tests/test_wave_01.py | 18 +++++--- tests/test_wave_02.py | 4 +- 6 files changed, 94 insertions(+), 45 deletions(-) create mode 100644 migrations/versions/9f0b21c68086_.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..80dc0d60a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,7 @@ from flask import Flask from .db import db, migrate from .models import task, goal +from .routes.task_routes import 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 373a7c5d2..9fb2a58dd 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,18 +1,28 @@ 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[datetime] = mapped_column(nullable=True) - + completed_at: Mapped[Optional[datetime]] + def to_dict(self): + if not self.completed_at: + is_complete = False + + else: + is_complete = True + return dict( id=self.id, title=self.title, description=self.description, - completed_at=self.completed_at, - ) \ No newline at end of file + is_complete=is_complete + ) + + + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 138b30892..2a1433f1c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint, abort, make_response, request, Response +from flask import Blueprint, abort, jsonify, make_response, request, Response from app.db import db from app.models.task import Task @@ -7,53 +7,44 @@ @tasks_bp.post("") def create_task(): - request_body = request.get_json() - title = request_body["title"] - description = request_body["description"] - completed_at = request_body["completed_at"] + + try: + request_body = request.get_json() + title = request_body["title"] + description = request_body["description"] + new_task = Task(title=title, description=description) - new_task = Task(title=title, description=description, completed_at=completed_at) + db.session.add(new_task) + db.session.commit() - # validating a new task with ALL required info - if not new_task: + return {"task": new_task.to_dict()}, 201 + + except KeyError as error: response = {"details": f"Invalid data"} abort(make_response(response, 400)) - db.session.add(new_task) - db.session.commit() - response = new_task.to_dict() - - return response, 201 @tasks_bp.get("") -def get_all_task(): - query = db.select(Task) - title_param = request.args.get("title") - - if title_param: - query = query.where(Task.title == title_param) - - description_param = request.args.get("description") - if description_param: - query = query.where(Task.description.ilike(f"%{description_param}%")) +def get_tasks_sort_title(): - completed_at_param = request.args.get("completed_at") - if completed_at_param: - query = query.where(Task.completed_at.ilike(f"%{completed_at_param}%")) + title_sort = request.args.get("sort") + + if title_sort == 'asc': + tasks = Task.query.order_by(Task.title.asc()).all() - query = query.order_by(Task.id) + elif title_sort == 'desc': + tasks = Task.query.order_by(Task.title.desc()).all() - tasks = db.session.scalars(query) tasks_response = [task.to_dict() for task in tasks] - return tasks_response + return jsonify(tasks_response) @tasks_bp.get("/") def get_one_task(task_id): task = validate_task(task_id) - response = task.to_dict() + response = {"task": task.to_dict()} return response @@ -64,21 +55,22 @@ def update_task(task_id): task.title = request_body["title"] task.description = request_body["description"] - task.completed_at = request_body["completed_at"] + db.session.commit() - return Response(status=204, mimetype="application/json") + return {"task": task.to_dict()} # Response(status=204, mimetype="application/json") @tasks_bp.delete("/") def delete_task(task_id): task = validate_task(task_id) + db.session.delete(task) db.session.commit() - response = {"details": f"Task {task_id} \{task}\ successfully deleted"} + response = {"details": f'Task {task_id} "{task.title}" successfully deleted'} # CHECK IF THIS IS CORRECT - return Response(response, status=204, mimetype="application/json") + return jsonify(response) # Response(status=200, mimetype="application/json") def validate_task(task_id): try: @@ -96,3 +88,6 @@ def validate_task(task_id): abort(make_response(response, 404)) return task + + + diff --git a/migrations/versions/9f0b21c68086_.py b/migrations/versions/9f0b21c68086_.py new file mode 100644 index 000000000..685da3db5 --- /dev/null +++ b/migrations/versions/9f0b21c68086_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 9f0b21c68086 +Revises: 584e9f08d2e1 +Create Date: 2024-11-04 19:05:02.373852 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9f0b21c68086' +down_revision = '584e9f08d2e1' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + 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') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dbf9dae64..120c64aa7 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -60,9 +60,12 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - 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*************** + assert "details" in response_body + assert response_body == {"details": f"Task 1 not found"} + # ***************************************************************** @@ -131,9 +134,11 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - 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*************** + assert "details" in response_body + assert response_body == {"details": "Task 1 not found"} # ***************************************************************** @@ -152,7 +157,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") @@ -161,12 +166,15 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - 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*************** + assert "details" in response_body + assert response_body == {"details": f"Task 1 not found"} + assert Task.query.all() == [] # ***************************************************************** - assert Task.query.all() == [] + # @pytest.mark.skip(reason="No way to test this feature yet") diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From d0678a5e6916a34a288e931b68bc06f0ad4a988c Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Thu, 7 Nov 2024 02:22:10 -0500 Subject: [PATCH 03/14] commiting new changes to task_routes.py and test_wave_03.py --- app/routes/task_routes.py | 53 +++++++++++++++++++++++++++++++++------ tests/test_wave_03.py | 16 ++++++------ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 2a1433f1c..6484cea2e 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,7 +1,7 @@ from flask import Blueprint, abort, jsonify, make_response, request, Response from app.db import db from app.models.task import Task - +from datetime import datetime tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -24,18 +24,57 @@ def create_task(): abort(make_response(response, 400)) + + +@tasks_bp.patch("//mark_complete") +def mark_task_complete(task_id): + + slack + current_task = validate_task(task_id) + + if not current_task.completed_at: + current_task.completed_at = datetime.now() + + db.session.add(current_task) + db.session.commit() + + response = {"task": current_task.to_dict()} + + return jsonify(response) + + + + +@tasks_bp.patch("//mark_incomplete") +def mark_task_incomplete(task_id): + + current_task = validate_task(task_id) + + if current_task.completed_at: + current_task.completed_at = None + + db.session.add(current_task) + db.session.commit() + + response = {"task": current_task.to_dict()} + + return jsonify(response) + + @tasks_bp.get("") def get_tasks_sort_title(): - + + query = db.select(Task) + title_sort = request.args.get("sort") - if title_sort == 'asc': - tasks = Task.query.order_by(Task.title.asc()).all() + if title_sort and title_sort == 'asc': + query = query.order_by(Task.title.asc()) - elif title_sort == 'desc': - tasks = Task.query.order_by(Task.title.desc()).all() - + elif title_sort and title_sort == 'desc': + query = query.order_by(Task.title.desc()) + tasks = db.session.scalars(query) tasks_response = [task.to_dict() for task in tasks] return jsonify(tasks_response) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..1e198cda5 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") @@ -128,13 +128,13 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - 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") @@ -143,7 +143,7 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - 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 3f5d2935a9acfcf0fe05e4cc154894986b618de7 Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Thu, 7 Nov 2024 18:05:01 -0500 Subject: [PATCH 04/14] completed waves 1-5, and finished tests waves 1-5 --- app/__init__.py | 4 +- app/models/goal.py | 7 +++ app/routes/goal_routes.py | 85 +++++++++++++++++++++++++++- app/routes/task_routes.py | 38 ++++++++++--- migrations/versions/9107b7cd3ea4_.py | 32 +++++++++++ tests/test_wave_01.py | 5 +- tests/test_wave_03.py | 2 + tests/test_wave_05.py | 77 +++++++++++++++++-------- tests/test_wave_06.py | 10 ++-- 9 files changed, 219 insertions(+), 41 deletions(-) create mode 100644 migrations/versions/9107b7cd3ea4_.py diff --git a/app/__init__.py b/app/__init__.py index 80dc0d60a..d447c7be7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,8 @@ from flask import Flask from .db import db, migrate from .models import task, goal -from .routes.task_routes import tasks_bp +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..570a744a9 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,10 @@ class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + + def to_dict(self): + return dict( + id=self.id, + title=self.title + ) \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..aecdce91a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,84 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, jsonify, make_response, request +from app.db import db +from app.models.goal import Goal +import os +import requests + + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + +@goals_bp.post("") +def create_goal(): + + try: + request_body = request.get_json() + title = request_body["title"] + + new_goal = Goal(title=title) + + db.session.add(new_goal) + db.session.commit() + + return {"goal": new_goal.to_dict()}, 201 + + except KeyError as error: + response = {"details": f"Invalid data"} + abort(make_response(response, 400)) + +@goals_bp.get("") +def get_all_goals(): + + query = db.select(Goal).order_by(Goal.id) + goals = db.session.scalars(query) + + goals_response = [goal.to_dict() for goal in goals] + + return goals_response + +@goals_bp.get("/") +def get_one_goal(goal_id): + + goal = validate_goal(goal_id) + response = {"goal": goal.to_dict()} + + return response + +@goals_bp.delete("/") +def delete_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 jsonify(response) + +@goals_bp.put("/") +def update_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + + return {"goal": goal.to_dict()} + + +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + + except: + response = {"details": f"Invalid data"} + abort(make_response(response, 400)) + + query = db.select(Goal).where(Goal.id == goal_id) + goal = db.session.scalar(query) + + if not goal: + response = {"details": f"Goal {goal_id} 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 6484cea2e..09511171d 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,8 +1,12 @@ -from flask import Blueprint, abort, jsonify, make_response, request, Response +from flask import Blueprint, abort, jsonify, make_response, request from app.db import db from app.models.task import Task from datetime import datetime +import os +import requests +TOKEN = os.environ.get("SLACK_TOKEN") +SLACK_CHANNEL = "#avieyra-task-notification" tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @tasks_bp.post("") @@ -25,16 +29,36 @@ def create_task(): - +def send_slack_msg(task_title): + """ + Information obtained from Slack Wep API Docmentation: + https://api.slack.com/methods/chat.postMessage + """ + + url = "https://slack.com/api/chat.postMessage" + headers = { + "Content-Type": "application/json", + "Authorization": f"Bearer {TOKEN}" + } + + data = { + "channel": SLACK_CHANNEL, + "text": f"Someone just completed the task: {task_title}" + } + + requests.post(url, headers=headers, json=data) + + @tasks_bp.patch("//mark_complete") def mark_task_complete(task_id): - slack current_task = validate_task(task_id) if not current_task.completed_at: current_task.completed_at = datetime.now() + send_slack_msg(current_task.title) + db.session.add(current_task) db.session.commit() @@ -68,10 +92,10 @@ def get_tasks_sort_title(): title_sort = request.args.get("sort") - if title_sort and title_sort == 'asc': + if title_sort and title_sort == "asc": query = query.order_by(Task.title.asc()) - elif title_sort and title_sort == 'desc': + elif title_sort and title_sort == "desc": query = query.order_by(Task.title.desc()) tasks = db.session.scalars(query) @@ -97,7 +121,7 @@ def update_task(task_id): db.session.commit() - return {"task": task.to_dict()} # Response(status=204, mimetype="application/json") + return {"task": task.to_dict()} @tasks_bp.delete("/") def delete_task(task_id): @@ -109,7 +133,7 @@ def delete_task(task_id): response = {"details": f'Task {task_id} "{task.title}" successfully deleted'} # CHECK IF THIS IS CORRECT - return jsonify(response) # Response(status=200, mimetype="application/json") + return jsonify(response) def validate_task(task_id): try: diff --git a/migrations/versions/9107b7cd3ea4_.py b/migrations/versions/9107b7cd3ea4_.py new file mode 100644 index 000000000..c64cd1da0 --- /dev/null +++ b/migrations/versions/9107b7cd3ea4_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 9107b7cd3ea4 +Revises: 9f0b21c68086 +Create Date: 2024-11-07 10:50:40.589452 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9107b7cd3ea4' +down_revision = '9f0b21c68086' +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_01.py b/tests/test_wave_01.py index 120c64aa7..2e89dff44 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -64,7 +64,7 @@ def test_get_task_not_found(client): # ***************************************************************** # **Complete test with assertion about response body*************** assert "details" in response_body - assert response_body == {"details": f"Task 1 not found"} + assert response_body["details"] == "Task 1 not found" # ***************************************************************** @@ -170,8 +170,7 @@ def test_delete_task_not_found(client): # ***************************************************************** # **Complete test with assertion about response body*************** assert "details" in response_body - assert response_body == {"details": f"Task 1 not found"} - assert Task.query.all() == [] + assert response_body ["details"] == "Task 1 not found" # ***************************************************************** diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 1e198cda5..b1c194aca 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -131,6 +131,7 @@ def test_mark_complete_missing_task(client): # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** + assert response_body == {"details": f"Task 1 not found"} # ***************************************************************** @@ -146,4 +147,5 @@ def test_mark_incomplete_missing_task(client): # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** + assert response_body == {"details": f"Task 1 not found"} # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..6f1033c64 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ +from app.models.goal import Goal import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +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,26 @@ 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 # ---- Complete Test ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here + assert "details" in response_body + assert response_body == {"details": + "Goal 1 not found" + } # ---- 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 +85,52 @@ 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 + assert response.status_code == 200 + assert "goal" in response_body # assertion 2 goes here + goal = Goal.query.get(1) + assert response_body == {"goal": { + "id": 1, + "title": "Updated Goal Title" + } } # assertion 3 goes here + assert goal.id == 1 + assert goal.title == "Updated Goal Title" # ---- Complete Assertions Here ---- + -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + response = client.put("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here + assert response_body == {"details": f"Goal 1 not found"} # ---- 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") @@ -115,36 +138,41 @@ def test_delete_goal(client, one_goal): # Assert assert response.status_code == 200 - assert "details" in response_body - assert response_body == { - "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted' - } + # Check that the goal was deleted - response = client.get("/goals/1") - assert response.status_code == 404 - - 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*************** + assert "details" in response_body + assert response_body == { + "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted' + } + assert Goal.query.get(1) == None # ***************************************************************** -@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 + response.status_code == 404 # ---- Complete Assertions Here ---- # assertion 1 goes here + assert "details" in response_body # assertion 2 goes here + assert response_body == {"details": "Goal 1 not found"} # ---- 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={}) @@ -152,6 +180,7 @@ def test_create_goal_missing_title(client): # Assert assert response.status_code == 400 + assert "details" in response_body assert response_body == { "details": "Invalid data" } diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..ebfcbac67 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={ @@ -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 a8b1a3abc5f1073fc0f1405f1df2631350a0e2ae Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Fri, 8 Nov 2024 07:05:56 -0500 Subject: [PATCH 05/14] route_utilties.py file added - will proceed to refactor the code as in Part7/8 of lessons --- app/models/goal.py | 10 +++++-- app/models/task.py | 18 ++++++++++-- app/routes/goal_routes.py | 8 +++++- app/routes/route_utilities.py | 42 ++++++++++++++++++++++++++++ app/routes/task_routes.py | 8 +++--- migrations/versions/ac812160f398_.py | 34 ++++++++++++++++++++++ 6 files changed, 110 insertions(+), 10 deletions(-) create mode 100644 app/routes/route_utilities.py create mode 100644 migrations/versions/ac812160f398_.py diff --git a/app/models/goal.py b/app/models/goal.py index 570a744a9..c7620bee3 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,12 +1,18 @@ -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] + tasks: Mapped[list("Task")] = relationship(back_populates="goal") def to_dict(self): return dict( id=self.id, title=self.title - ) \ No newline at end of file + ) + + @classmethod + def from_dict(cls, goal_data): + new_goal = cls(title=goal_data["title"]) + return new_goal \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 9fb2a58dd..a170dac1f 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,7 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db from datetime import datetime +from sqlalchemy import ForeignKey from typing import Optional class Task(db.Model): @@ -9,6 +10,9 @@ class Task(db.Model): description: Mapped[str] completed_at: Mapped[Optional[datetime]] + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") + def to_dict(self): if not self.completed_at: @@ -21,8 +25,16 @@ def to_dict(self): id=self.id, title=self.title, description=self.description, - is_complete=is_complete + is_complete=is_complete, + + goal=self.goal.title if self.goal else None ) - + @classmethod + def from_dict(cls, task_data): + return cls( + title=task_data["title"], + goal_id=task_data.get("goal_id", None) + ) + diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index aecdce91a..d32c0529a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,7 +1,6 @@ from flask import Blueprint, abort, jsonify, make_response, request from app.db import db from app.models.goal import Goal -import os import requests @@ -25,6 +24,13 @@ def create_goal(): response = {"details": f"Invalid data"} abort(make_response(response, 400)) +@goals_bp.get("//tasks") +def get_tasks_by_goal(goal_id): + goal = validate_goal(goal_id) + response = [task.to_dict() for task in goal.tasks] + return response + + @goals_bp.get("") def get_all_goals(): diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py new file mode 100644 index 000000000..935fb109a --- /dev/null +++ b/app/routes/route_utilities.py @@ -0,0 +1,42 @@ +from flask import abort, make_response +from ..db import db + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{cls.__name__} id {(model_id)} invalid"}, 400)) + + query = db.select(cls).where(cls.id == model_id) + model = db.session.scalar(query) + + if not model: + abort(make_response({ "message": f"{cls.__name__} {model_id} not found"}, 404)) + + return model + +def create_model(cls, model_data): + try: + new_model = cls.from_dict(model_data) + + except KeyError as error: + response = {"message": f"Invalid request: missing {error.args[0]}"} + abort(make_response(response, 400)) + + db.session.add(new_model) + db.session.commit() + + return new_model.to_dict(), 201 + +def get_models_with_filters(cls, filters=None): + query = db.select(cls) + + if filters: + for attribute, value in filters.items(): + if hasattr(cls, attribute): + query = query.where(getattr(cls, attribute).ilike(f"%{value}%")) + + models = db.session.scalars(query.order_by(cls.id)) + models_response = [model.to_dict() for model in models] + + return models_response \ No newline at end of file diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 09511171d..29ba235b8 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -6,7 +6,7 @@ import requests TOKEN = os.environ.get("SLACK_TOKEN") -SLACK_CHANNEL = "#avieyra-task-notification" +SLACK_CHANNEL = os.environ["SLACK_CHANNEL"] tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @tasks_bp.post("") @@ -35,13 +35,13 @@ def send_slack_msg(task_title): https://api.slack.com/methods/chat.postMessage """ - url = "https://slack.com/api/chat.postMessage" - headers = { + url=os.environ.get("SLACK_URL") + headers={ "Content-Type": "application/json", "Authorization": f"Bearer {TOKEN}" } - data = { + data={ "channel": SLACK_CHANNEL, "text": f"Someone just completed the task: {task_title}" } diff --git a/migrations/versions/ac812160f398_.py b/migrations/versions/ac812160f398_.py new file mode 100644 index 000000000..66d5965fb --- /dev/null +++ b/migrations/versions/ac812160f398_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: ac812160f398 +Revises: 9107b7cd3ea4 +Create Date: 2024-11-07 23:46:58.933200 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ac812160f398' +down_revision = '9107b7cd3ea4' +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 ### From f071a284c31397f3f0f0d90c85745dad41c24be9 Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Fri, 8 Nov 2024 12:07:20 -0500 Subject: [PATCH 06/14] reverted refactoring to pevious commit in order to work on wave 6 --- app/__init__.py | 4 ++-- app/models/goal.py | 2 +- app/models/task.py | 2 +- app/routes/goal_routes.py | 16 +++++++------- app/routes/route_utilities.py | 39 +++++++++++++++++++++++++++++------ app/routes/task_routes.py | 4 +++- 6 files changed, 49 insertions(+), 18 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index d447c7be7..e7e5b9f47 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +1,8 @@ from flask import Flask 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 +from app.routes.task_routes import bp as tasks_bp +from app.routes.goal_routes import bp as goals_bp import os def create_app(config=None): diff --git a/app/models/goal.py b/app/models/goal.py index c7620bee3..664ff0c4c 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,7 +4,7 @@ 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") + tasks: Mapped[list["Task"]] = relationship(back_populates="goal") def to_dict(self): return dict( diff --git a/app/models/task.py b/app/models/task.py index a170dac1f..483fd8c73 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -11,7 +11,7 @@ class Task(db.Model): completed_at: Mapped[Optional[datetime]] goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) - goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") # type: ignore def to_dict(self): diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index d32c0529a..03e733a6a 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -2,11 +2,13 @@ from app.db import db from app.models.goal import Goal import requests +# from .route_utilities import validate_model, create_model, validate_task, validate_goal +from app.models.task import Task -goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") +bp = Blueprint("goals_bp", __name__, url_prefix="/goals") -@goals_bp.post("") +@bp.post("") def create_goal(): try: @@ -24,14 +26,14 @@ def create_goal(): response = {"details": f"Invalid data"} abort(make_response(response, 400)) -@goals_bp.get("//tasks") +@bp.get("//tasks") def get_tasks_by_goal(goal_id): goal = validate_goal(goal_id) response = [task.to_dict() for task in goal.tasks] return response -@goals_bp.get("") +@bp.get("") def get_all_goals(): query = db.select(Goal).order_by(Goal.id) @@ -41,7 +43,7 @@ def get_all_goals(): return goals_response -@goals_bp.get("/") +@bp.get("/") def get_one_goal(goal_id): goal = validate_goal(goal_id) @@ -49,7 +51,7 @@ def get_one_goal(goal_id): return response -@goals_bp.delete("/") +@bp.delete("/") def delete_goal(goal_id): goal = validate_goal(goal_id) @@ -60,7 +62,7 @@ def delete_goal(goal_id): response = {"details": f'Goal {goal_id} "{goal.title}" successfully deleted'} return jsonify(response) -@goals_bp.put("/") +@bp.put("/") def update_goal(goal_id): goal = validate_goal(goal_id) request_body = request.get_json() diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py index 935fb109a..a35e4ec56 100644 --- a/app/routes/route_utilities.py +++ b/app/routes/route_utilities.py @@ -1,32 +1,39 @@ from flask import abort, make_response from ..db import db +from app.models.task import Task +from app.models.goal import Goal def validate_model(cls, model_id): try: model_id = int(model_id) except: - abort(make_response({"message":f"{cls.__name__} id {(model_id)} invalid"}, 400)) + response = {"details": f"Invalid data"} + abort(make_response(response, 400)) query = db.select(cls).where(cls.id == model_id) model = db.session.scalar(query) if not model: - abort(make_response({ "message": f"{cls.__name__} {model_id} not found"}, 404)) + abort(make_response({ "details": f"{cls.__name__} {model_id} not found"}, 404)) return model + + def create_model(cls, model_data): try: new_model = cls.from_dict(model_data) except KeyError as error: - response = {"message": f"Invalid request: missing {error.args[0]}"} + response = {"details": f"Invalid data"} abort(make_response(response, 400)) db.session.add(new_model) db.session.commit() + model_name = cls.__name__ + + return {f"{model_name.lower()}": new_model.to_dict()}, 201 - return new_model.to_dict(), 201 def get_models_with_filters(cls, filters=None): query = db.select(cls) @@ -34,9 +41,29 @@ def get_models_with_filters(cls, filters=None): if filters: for attribute, value in filters.items(): if hasattr(cls, attribute): - query = query.where(getattr(cls, attribute).ilike(f"%{value}%")) + query = query.order_by(getattr(cls, attribute).ilike(f"%{value}%")) models = db.session.scalars(query.order_by(cls.id)) models_response = [model.to_dict() for model in models] - return models_response \ No newline at end of file + return models_response + + +def validate_task(task_id): + try: + task_id = int(task_id) + + except: + response = {"details": f"Invalid data"} + abort(make_response(response, 400)) + + query = db.select(Task).where(Task.id == task_id) + task = db.session.scalar(query) + + if not task: + response = {"details": f"Task {task_id} not found"} + abort(make_response(response, 404)) + + return task + + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 29ba235b8..7e33b6d91 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -2,6 +2,7 @@ from app.db import db from app.models.task import Task from datetime import datetime +# from .route_utilities import validate_model, create_model, validate_task import os import requests @@ -132,7 +133,6 @@ def delete_task(task_id): response = {"details": f'Task {task_id} "{task.title}" successfully deleted'} - # CHECK IF THIS IS CORRECT return jsonify(response) def validate_task(task_id): @@ -152,5 +152,7 @@ def validate_task(task_id): return task +# + From 13530809b42e060cc16aa793f397a0790f4cf4a4 Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Sat, 9 Nov 2024 17:45:29 -0500 Subject: [PATCH 07/14] all waves 1 to 6 have now passed, ready to deploy on render --- app/models/goal.py | 37 ++++++++++++++++++++++++++++---- app/models/task.py | 35 ++++++++++++++++++++++++------ app/routes/goal_routes.py | 45 +++++++++++++++++++++++++++++++-------- app/routes/task_routes.py | 32 +++++++++++++++------------- tests/conftest.py | 2 +- tests/test_wave_06.py | 6 +++--- 6 files changed, 118 insertions(+), 39 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 664ff0c4c..df0cb1dfa 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,16 +1,45 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship from ..db import db +from ..routes.task_routes import validate_task +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .task import Task class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] tasks: Mapped[list["Task"]] = relationship(back_populates="goal") + + def check_goal_tasks(self): + tasks_assigned = [] + if self.tasks: + for task in self.tasks: + task = validate_task(task.id) + tasks_assigned.append(task.to_nested_dict()) + + return tasks_assigned + def to_dict(self): - return dict( - id=self.id, - title=self.title - ) + goal_to_dict = {} + goal_to_dict["id"] = self.id + goal_to_dict["title"] = self.title + return goal_to_dict + + def to_nested_dict(self): + goal_to_dict = {} + goal_to_dict["id"] = self.id + goal_to_dict["title"] = self.title + if not self.check_goal_tasks(): + goal_to_dict["tasks"] = [] + else: + goal_to_dict["tasks"] = self.check_goal_tasks() + + return goal_to_dict + + + + @classmethod def from_dict(cls, goal_data): diff --git a/app/models/task.py b/app/models/task.py index 483fd8c73..e38956d35 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,31 +4,52 @@ from sqlalchemy import ForeignKey from typing import Optional +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .goal import Goal + + class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] description: Mapped[str] - completed_at: Mapped[Optional[datetime]] + completed_at: Mapped[Optional[datetime]] # = completed_at if completed_at is not None goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) - goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") # type: ignore + goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") def to_dict(self): if not self.completed_at: is_complete = False - else: is_complete = True - + return dict( id=self.id, title=self.title, description=self.description, - is_complete=is_complete, + is_complete=is_complete + ) + + def to_nested_dict(self): + if not self.completed_at: + is_complete = False + else: + is_complete = True + + task_dictionary = dict( + id=self.id, + title=self.title, + description=self.description, + is_complete=is_complete + ) + + if self.goal_id: + task_dictionary["goal_id"] = self.goal_id + + return task_dictionary - goal=self.goal.title if self.goal else None - ) @classmethod def from_dict(cls, task_data): return cls( diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 03e733a6a..5897b440c 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,9 +1,10 @@ from flask import Blueprint, abort, jsonify, make_response, request from app.db import db -from app.models.goal import Goal +from ..models.goal import Goal import requests # from .route_utilities import validate_model, create_model, validate_task, validate_goal from app.models.task import Task +from ..routes.task_routes import validate_task bp = Blueprint("goals_bp", __name__, url_prefix="/goals") @@ -26,13 +27,6 @@ def create_goal(): response = {"details": f"Invalid data"} abort(make_response(response, 400)) -@bp.get("//tasks") -def get_tasks_by_goal(goal_id): - goal = validate_goal(goal_id) - response = [task.to_dict() for task in goal.tasks] - return response - - @bp.get("") def get_all_goals(): @@ -45,12 +39,45 @@ def get_all_goals(): @bp.get("/") def get_one_goal(goal_id): - goal = validate_goal(goal_id) response = {"goal": goal.to_dict()} + return response + +@bp.get("//tasks") +def get_tasks_by_goal(goal_id): + goal = validate_goal(goal_id) + response = goal.to_nested_dict() return response +# @bp.get("//tasks") +# def get_tasks_for_one_goal(goal_id): +# goal = validate_goal(goal_id) +# return goal.to_nested_dict() + + + +@bp.post("//tasks") +def create_new_tasks_for_goal(goal_id): + + # current_goal = validate_goal(goal_id) + request_body = request.get_json() + + + current_goal_tasks = request_body["task_ids"] + + for task in current_goal_tasks: + current_task = validate_task(task) + query = db.select(Task).where(current_task.goal_id == goal_id) + current_task.goal_id = goal_id + + db.session.commit() + + return {"id": int(goal_id), + "task_ids": current_goal_tasks + } + + @bp.delete("/") def delete_goal(goal_id): diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 7e33b6d91..b475f9be3 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,16 +1,17 @@ from flask import Blueprint, abort, jsonify, make_response, request -from app.db import db -from app.models.task import Task +from ..db import db +from ..models.task import Task from datetime import datetime # from .route_utilities import validate_model, create_model, validate_task import os import requests TOKEN = os.environ.get("SLACK_TOKEN") -SLACK_CHANNEL = os.environ["SLACK_CHANNEL"] -tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +SLACK_CHANNEL=os.environ.get("SLACK_CHANNEL") +bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") -@tasks_bp.post("") + +@bp.post("") def create_task(): try: @@ -50,7 +51,7 @@ def send_slack_msg(task_title): requests.post(url, headers=headers, json=data) -@tasks_bp.patch("//mark_complete") +@bp.patch("//mark_complete") def mark_task_complete(task_id): current_task = validate_task(task_id) @@ -70,7 +71,7 @@ def mark_task_complete(task_id): -@tasks_bp.patch("//mark_incomplete") +@bp.patch("//mark_incomplete") def mark_task_incomplete(task_id): current_task = validate_task(task_id) @@ -86,15 +87,14 @@ def mark_task_incomplete(task_id): return jsonify(response) -@tasks_bp.get("") +@bp.get("") def get_tasks_sort_title(): query = db.select(Task) title_sort = request.args.get("sort") - if title_sort and title_sort == "asc": - query = query.order_by(Task.title.asc()) + query = query.order_by(Task.title) elif title_sort and title_sort == "desc": query = query.order_by(Task.title.desc()) @@ -105,14 +105,15 @@ def get_tasks_sort_title(): return jsonify(tasks_response) -@tasks_bp.get("/") +@bp.get("/") def get_one_task(task_id): task = validate_task(task_id) - response = {"task": task.to_dict()} + response = {"task": task.to_nested_dict()} return response -@tasks_bp.put("/") + +@bp.put("/") def update_task(task_id): task = validate_task(task_id) request_body = request.get_json() @@ -124,7 +125,7 @@ def update_task(task_id): return {"task": task.to_dict()} -@tasks_bp.delete("/") +@bp.delete("/") def delete_task(task_id): task = validate_task(task_id) @@ -133,7 +134,8 @@ def delete_task(task_id): response = {"details": f'Task {task_id} "{task.title}" successfully deleted'} - return jsonify(response) + return jsonify(response) + def validate_task(task_id): try: diff --git a/tests/conftest.py b/tests/conftest.py index e370e597b..a2061c874 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -43,7 +43,7 @@ def client(app): @pytest.fixture def one_task(app): new_task = Task(title="Go on my daily walk 🏞", - description="Notice something new every day", + description="Notice something new every day", completed_at=None) db.session.add(new_task) db.session.commit() diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index ebfcbac67..a24b2acc1 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -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,10 +50,10 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** + # ***************************************************************** From 6eb7bcb72cd6babca3ce44445f7bc9505a31bd7d Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Sun, 10 Nov 2024 15:59:59 -0500 Subject: [PATCH 08/14] ready to deploy on render, and connect to render database --- app/routes/goal_routes.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 5897b440c..faa759153 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -60,7 +60,7 @@ def get_tasks_by_goal(goal_id): @bp.post("//tasks") def create_new_tasks_for_goal(goal_id): - # current_goal = validate_goal(goal_id) + current_goal = validate_goal(goal_id) request_body = request.get_json() @@ -68,12 +68,12 @@ def create_new_tasks_for_goal(goal_id): for task in current_goal_tasks: current_task = validate_task(task) - query = db.select(Task).where(current_task.goal_id == goal_id) + # query = db.select(Task).where(current_task.goal_id == goal_id) current_task.goal_id = goal_id db.session.commit() - return {"id": int(goal_id), + return {"id": current_goal.id, "task_ids": current_goal_tasks } @@ -88,6 +88,7 @@ def delete_goal(goal_id): response = {"details": f'Goal {goal_id} "{goal.title}" successfully deleted'} return jsonify(response) + @bp.put("/") def update_goal(goal_id): From 2184a9ae88dc48b735497d93d088d8cf0da9746f Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Sun, 10 Nov 2024 16:11:57 -0500 Subject: [PATCH 09/14] deleted original migrations file; then reran flask db init to restart a new migrations folder --- migrations/versions/979027730a6c_.py | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 migrations/versions/979027730a6c_.py diff --git a/migrations/versions/979027730a6c_.py b/migrations/versions/979027730a6c_.py new file mode 100644 index 000000000..572c9404a --- /dev/null +++ b/migrations/versions/979027730a6c_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 979027730a6c +Revises: +Create Date: 2024-11-10 16:07:25.244457 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '979027730a6c' +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.Column('title', sa.String(), 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.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### From 136c02c2bf84ef416de72ab8e6a8a633d1627e4f Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Tue, 12 Nov 2024 07:27:04 -0500 Subject: [PATCH 10/14] modified task and goal model to remove unused code --- app/models/goal.py | 9 ----- app/models/task.py | 6 --- app/routes/route_utilities.py | 69 ----------------------------------- 3 files changed, 84 deletions(-) delete mode 100644 app/routes/route_utilities.py diff --git a/app/models/goal.py b/app/models/goal.py index df0cb1dfa..ee9754c25 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -36,12 +36,3 @@ def to_nested_dict(self): goal_to_dict["tasks"] = self.check_goal_tasks() return goal_to_dict - - - - - - @classmethod - def from_dict(cls, goal_data): - new_goal = cls(title=goal_data["title"]) - return new_goal \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index e38956d35..ba9ff6457 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -50,12 +50,6 @@ def to_nested_dict(self): return task_dictionary - @classmethod - def from_dict(cls, task_data): - return cls( - title=task_data["title"], - goal_id=task_data.get("goal_id", None) - ) diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py deleted file mode 100644 index a35e4ec56..000000000 --- a/app/routes/route_utilities.py +++ /dev/null @@ -1,69 +0,0 @@ -from flask import abort, make_response -from ..db import db -from app.models.task import Task -from app.models.goal import Goal - -def validate_model(cls, model_id): - try: - model_id = int(model_id) - except: - response = {"details": f"Invalid data"} - abort(make_response(response, 400)) - - query = db.select(cls).where(cls.id == model_id) - model = db.session.scalar(query) - - if not model: - abort(make_response({ "details": f"{cls.__name__} {model_id} not found"}, 404)) - - return model - - - -def create_model(cls, model_data): - try: - new_model = cls.from_dict(model_data) - - except KeyError as error: - response = {"details": f"Invalid data"} - abort(make_response(response, 400)) - - db.session.add(new_model) - db.session.commit() - model_name = cls.__name__ - - return {f"{model_name.lower()}": new_model.to_dict()}, 201 - - -def get_models_with_filters(cls, filters=None): - query = db.select(cls) - - if filters: - for attribute, value in filters.items(): - if hasattr(cls, attribute): - query = query.order_by(getattr(cls, attribute).ilike(f"%{value}%")) - - models = db.session.scalars(query.order_by(cls.id)) - models_response = [model.to_dict() for model in models] - - return models_response - - -def validate_task(task_id): - try: - task_id = int(task_id) - - except: - response = {"details": f"Invalid data"} - abort(make_response(response, 400)) - - query = db.select(Task).where(Task.id == task_id) - task = db.session.scalar(query) - - if not task: - response = {"details": f"Task {task_id} not found"} - abort(make_response(response, 404)) - - return task - - From bab0ce1422e7cfa2720f6f3f6c735dface6fc7a0 Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Fri, 20 Dec 2024 11:50:12 -0500 Subject: [PATCH 11/14] adding CORS for Task-List-front end connection --- app/__init__.py | 16 +++++++++++----- app/models/goal.py | 2 +- app/models/task.py | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index e7e5b9f47..7f9887c61 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,18 +3,24 @@ from .models import task, goal from app.routes.task_routes import bp as tasks_bp from app.routes.goal_routes import bp as goals_bp +from dotenv import load_dotenv +from flask_cors import CORS import os -def create_app(config=None): +load_dotenv() + +def create_app(test_config=None): app = Flask(__name__) + CORS(app) + app.config['CORS_HEADERS'] = 'Content-Type' app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') - if config: - # Merge `config` into the app's configuration - # to override the app's default settings for testing - app.config.update(config) + # if config: + # # Merge `config` into the app's configuration + # # to override the app's default settings for testing + # app.config.update(config) db.init_app(app) migrate.init_app(app, db) diff --git a/app/models/goal.py b/app/models/goal.py index ee9754c25..31c8273a2 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy.orm import Mapped, mapped_column, relationship # type: ignore from ..db import db from ..routes.task_routes import validate_task from typing import TYPE_CHECKING diff --git a/app/models/task.py b/app/models/task.py index ba9ff6457..3b5b0c75a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,7 +1,7 @@ -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy.orm import Mapped, mapped_column, relationship # type: ignore from ..db import db from datetime import datetime -from sqlalchemy import ForeignKey +from sqlalchemy import ForeignKey # type: ignore from typing import Optional from typing import TYPE_CHECKING From 7af8ae80959cf9d98adbf5e36717ea180f17876b Mon Sep 17 00:00:00 2001 From: Aleida Vieyra <116933322+aleidavi@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:35:31 -0500 Subject: [PATCH 12/14] Update __init__.py Adding comments to understand the dunder init file --- app/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/__init__.py b/app/__init__.py index 7f9887c61..9857a2131 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,6 +22,7 @@ def create_app(test_config=None): # # to override the app's default settings for testing # app.config.update(config) + # Initialize app with SQLAlchemy and Migrate db.init_app(app) migrate.init_app(app, db) From 5e5caabad3fa3afa01d36b8b8476df2df6414cac Mon Sep 17 00:00:00 2001 From: Aleida Vieyra <116933322+aleidavi@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:38:15 -0500 Subject: [PATCH 13/14] Update __init__.py updating the config lines in the dunder init file for the task-list-api project --- app/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 9857a2131..b5d1c802a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -17,10 +17,10 @@ def create_app(test_config=None): app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') - # if config: - # # Merge `config` into the app's configuration - # # to override the app's default settings for testing - # app.config.update(config) + if config: + # Merge `config` into the app's configuration + # to override the app's default settings for testing + app.config.update(config) # Initialize app with SQLAlchemy and Migrate db.init_app(app) From cd408b525df7f6ee024b7615870bb788ada8feae Mon Sep 17 00:00:00 2001 From: Aleida Vieyra Date: Tue, 21 Jan 2025 15:02:05 -0500 Subject: [PATCH 14/14] changed back-end responses for mark task complete and posting a new task git push --- app/__init__.py | 4 ++-- app/routes/task_routes.py | 4 ++-- requirements.txt | 14 +++++++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index b5d1c802a..e0b5a7793 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -17,10 +17,10 @@ def create_app(test_config=None): app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') - if config: + if test_config: # Merge `config` into the app's configuration # to override the app's default settings for testing - app.config.update(config) + app.config.update(test_config) # Initialize app with SQLAlchemy and Migrate db.init_app(app) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index b475f9be3..35eab7ef5 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -23,7 +23,7 @@ def create_task(): db.session.add(new_task) db.session.commit() - return {"task": new_task.to_dict()}, 201 + return new_task.to_dict(), 201 except KeyError as error: response = {"details": f"Invalid data"} @@ -64,7 +64,7 @@ def mark_task_complete(task_id): db.session.add(current_task) db.session.commit() - response = {"task": current_task.to_dict()} + response = current_task.to_dict() return jsonify(response) diff --git a/requirements.txt b/requirements.txt index af8fc4cf4..e6f8d5f26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,10 +3,15 @@ blinker==1.7.0 certifi==2024.8.30 charset-normalizer==3.3.2 click==8.1.7 +colorama==0.4.6 +filelock==3.16.1 Flask==3.0.2 +Flask-Cors==5.0.0 Flask-Migrate==4.0.5 Flask-SQLAlchemy==3.1.1 -greenlet==3.0.3 +future==1.0.0 +gevent==24.11.1 +greenlet==3.1.1 gunicorn==21.2.0 idna==3.10 iniconfig==2.0.0 @@ -17,10 +22,17 @@ MarkupSafe==2.1.5 packaging==23.2 pluggy==1.4.0 psycopg2-binary==2.9.9 +PySocks==1.7.1 pytest==8.0.0 python-dotenv==1.0.1 requests==2.32.3 +requests-file==2.1.0 +setuptools==75.8.0 +slack_sdk==3.33.3 SQLAlchemy==2.0.25 +tldextract==5.1.3 typing_extensions==4.9.0 urllib3==2.2.3 Werkzeug==3.0.1 +zope.event==5.0 +zope.interface==7.2