From 26146004d079e885ff343d3add833ea853fceb7c Mon Sep 17 00:00:00 2001 From: Dana Delgado Date: Thu, 31 Oct 2024 13:37:26 -0700 Subject: [PATCH 1/6] initial project setup --- migrations/README | 1 + migrations/alembic.ini | 50 +++++++++++++++++ migrations/env.py | 113 ++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++ 4 files changed, 188 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic,flask_migrate + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..4c9709271 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option('sqlalchemy.url', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=get_metadata(), literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} From 6a24f81deb3a67a9a8dc506c36714b68938e54c3 Mon Sep 17 00:00:00 2001 From: Dana Delgado Date: Fri, 1 Nov 2024 10:10:53 -0700 Subject: [PATCH 2/6] completed wave 1 --- app/__init__.py | 3 + app/models/task.py | 5 ++ app/routes/task_routes.py | 83 ++++++++++++++++++- .../1d211acba8af_create_task_table.py | 39 +++++++++ requirements.txt | 2 + tests/test_wave_01.py | 43 ++++------ 6 files changed, 148 insertions(+), 27 deletions(-) create mode 100644 migrations/versions/1d211acba8af_create_task_table.py diff --git a/app/__init__.py b/app/__init__.py index 3c581ceeb..1fc9746f6 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,7 @@ 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..5eca20d15 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,10 @@ from sqlalchemy.orm import Mapped, mapped_column +from datetime import datetime from ..db import db class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] + description: Mapped[str] + completed_at: Mapped[datetime] = mapped_column(nullable=True) + diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..a447e01d3 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,82 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, request, Response, jsonify +from app.models.task import Task +from ..db import db + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +@tasks_bp.post("") +def create_task(): + request_body = request.get_json() + + title = request_body.get("title") + description = request_body.get("description") + + # Validate input + if not title or not description: + return {"details": "Invalid data"}, 400 + + new_task = Task(title=title, description=description) + db.session.add(new_task) + db.session.commit() + + return {"task": { + "id": new_task.id, + "title": new_task.title, + "description": new_task.description, + "is_complete": False + }}, 201 + +@tasks_bp.get("") +def get_tasks(): + tasks = Task.query.all() + return jsonify([{ + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": task.completed_at is not None + } for task in tasks]), 200 + +@tasks_bp.get("/") +def get_task(task_id): + task = Task.query.get(task_id) + if not task: + return {"message": f"Task {task_id} not found"}, 404 + + return {"task": { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": task.completed_at is not None + }}, 200 + +@tasks_bp.put("/") +def update_task(task_id): + task = Task.query.get(task_id) + if not task: + return {"message": f"Task {task_id} not found"}, 404 + + request_body = request.get_json() + title = request_body.get("title") + description = request_body.get("description") + + # Update attributes + task.title = title + task.description = description + db.session.commit() + + return {"task": { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": False + }}, 200 + +@tasks_bp.delete("/") +def delete_task(task_id): + task = Task.query.get(task_id) + if not task: + return {"message": f"Task {task_id} not found"}, 404 + + db.session.delete(task) + db.session.commit() + return {"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200 diff --git a/migrations/versions/1d211acba8af_create_task_table.py b/migrations/versions/1d211acba8af_create_task_table.py new file mode 100644 index 000000000..0bb461555 --- /dev/null +++ b/migrations/versions/1d211acba8af_create_task_table.py @@ -0,0 +1,39 @@ +"""create task table + +Revision ID: 1d211acba8af +Revises: +Create Date: 2024-10-31 21:50:20.062298 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1d211acba8af' +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/requirements.txt b/requirements.txt index af8fc4cf4..a5f981da7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ blinker==1.7.0 certifi==2024.8.30 charset-normalizer==3.3.2 click==8.1.7 +coverage==7.6.4 Flask==3.0.2 Flask-Migrate==4.0.5 Flask-SQLAlchemy==3.1.1 @@ -18,6 +19,7 @@ packaging==23.2 pluggy==1.4.0 psycopg2-binary==2.9.9 pytest==8.0.0 +pytest-cov==6.0.0 python-dotenv==1.0.1 requests==2.32.3 SQLAlchemy==2.0.25 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..4c45a4b3e 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,11 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 + assert "message" in response_body + assert response_body == {"message": "Task 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **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 +90,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 +116,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 +127,11 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert "message" in response_body + assert response_body == {"message": "Task 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -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,13 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert "message" in response_body + assert response_body == {"message": "Task 1 not found"} assert 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 +177,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 adbe03c604e32eee82eddef9467fe2871f8cb867 Mon Sep 17 00:00:00 2001 From: Dana Delgado Date: Thu, 7 Nov 2024 22:35:44 -0800 Subject: [PATCH 3/6] commiting all waves --- app/__init__.py | 3 + app/models/goal.py | 12 +- app/models/task.py | 16 +- app/routes/goal_routes.py | 138 ++++++++++++++++- app/routes/task_routes.py | 141 ++++++++++++++---- ...one_to_many_relationships_goal_to_tasks.py | 34 +++++ .../versions/e87c62c1c781_adds_task_model.py | 56 +++++++ .../fb334535b2ec_create_goal_model.py | 32 ++++ tests/conftest.py | 5 +- tests/test_wave_01.py | 5 +- tests/test_wave_02.py | 4 +- tests/test_wave_03.py | 23 +-- tests/test_wave_05.py | 80 ++++------ tests/test_wave_06.py | 19 +-- 14 files changed, 451 insertions(+), 117 deletions(-) create mode 100644 migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py create mode 100644 migrations/versions/e87c62c1c781_adds_task_model.py create mode 100644 migrations/versions/fb334535b2ec_create_goal_model.py diff --git a/app/__init__.py b/app/__init__.py index 1fc9746f6..968245b8d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from .db import db, migrate from .models import task, goal from .routes.task_routes import tasks_bp +from .routes.goal_routes import goals_bp import os def create_app(config=None): @@ -20,6 +21,8 @@ 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..3d3262257 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,15 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey from ..db import db class Goal(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + title: Mapped[str] = mapped_column(nullable=False) + + tasks = relationship("Task", back_populates="goal", cascade="all, delete-orphan") + + def to_dict(self): + return { + 'id': self.id, + 'title': self.title, + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 5eca20d15..a1d129f3d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,4 +1,5 @@ -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import ForeignKey from datetime import datetime from ..db import db @@ -7,4 +8,17 @@ class Task(db.Model): title: Mapped[str] description: Mapped[str] completed_at: Mapped[datetime] = mapped_column(nullable=True) + + goal_id = mapped_column(db.Integer, db.ForeignKey('goal.id')) + goal = relationship("Goal", back_populates="tasks") + + + def to_dict(self): + return { + 'id': self.id, + 'goal_id': self.goal_id, + 'title': self.title, + 'description': self.description, + 'is_complete': bool(self.completed_at is not None), + } \ No newline at end of file diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..e1436d082 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,137 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request +from app.models.goal import Goal +from app.models.task import Task +from app.db import db + +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +@goals_bp.post("") +def create_goal(): + request_data = request.get_json() + title = request_data.get("title") + + if not title: + return {"details": "Invalid data"}, 400 + + goal = Goal(title=title) + db.session.add(goal) + db.session.commit() + + return {"goal": {"id": goal.id, "title": goal.title}}, 201 + +# Get All Goals +@goals_bp.get("") +def get_goals(): + goals = Goal.query.all() + return [ + { + "id": goal.id, + "title": goal.title + } + for goal in goals + ], 200 + +# Get One Goal by ID +@goals_bp.get("/") +def get_goal(goal_id): + goal = Goal.query.get(goal_id) + if goal: + return { + "goal": { + "id": goal.id, + "title": goal.title + } + }, 200 + return { + "message": f"Goal {goal_id} not found" + }, 404 + +@goals_bp.put("/") +def update_goal(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return {"message": f"Goal {goal_id} not found"}, 404 + + request_data = request.get_json() + title = request_data.get("title") + + if not title: + return {"details": "Invalid data"}, 400 + + goal.title = title + db.session.commit() + + return { + "goal": { + "id": goal.id, + "title": goal.title + } + }, 200 + +@goals_bp.delete("/") +def delete_goal(goal_id): + goal = Goal.query.get(goal_id) + + if not goal: + return { + "message": f"Goal {goal_id} not found" + }, 404 + + db.session.delete(goal) + db.session.commit() + + return { + "details": f'Goal {goal_id} "{goal.title}" successfully deleted' + }, 200 + + +@goals_bp.post("//tasks") +def post_task_ids_to_goal(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return { + "message": f"Goal {goal_id} not found" + }, 404 + + request_data = request.get_json() + task_ids = request_data.get("task_ids", []) + + tasks = Task.query.filter(Task.id.in_(task_ids)).all() + + if len(tasks) != len(task_ids): + return { + "message": "Some task IDs are invalid" + }, 400 + + for task in tasks: + task.goal_id = goal.id + db.session.commit() + + return { + "id": goal.id, + "task_ids": [task.id for task in tasks] + }, 200 + +@goals_bp.get("//tasks") +def get_tasks_for_goal(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return { + "message": f"Goal {goal_id} not found" + }, 404 + + tasks = goal.tasks + + return { + "id": goal.id, + "title": goal.title, + "tasks": [ + { + "id": task.id, + "goal_id": task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": task.completed_at is not None + } for task in tasks + ] + }, 200 diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index a447e01d3..1ad316643 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,21 +1,67 @@ +import os +import requests from flask import Blueprint, abort, make_response, request, Response, jsonify +from datetime import datetime, timezone from app.models.task import Task from ..db import db +from dotenv import load_dotenv +from app.models.goal import Goal + +load_dotenv() tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +@tasks_bp.get("") +def get_tasks(): + sort_order = request.args.get("sort", "asc").lower() # Default to ascending + + if sort_order == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.order_by(Task.title.asc()).all() + + # Prepare response data + task_list = [ + { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": task.completed_at is not None + } + for task in tasks + ] + + return jsonify(task_list), 200 + +@tasks_bp.get("/") +def get_task(task_id): + task = Task.query.get(task_id) + if not task: + return {"message": f"Task {task_id} not found"}, 404 + + return {"task": { + "id": task.id, + "goal_id": task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": task.completed_at is not None + }}, 200 + @tasks_bp.post("") def create_task(): request_body = request.get_json() - + title = request_body.get("title") description = request_body.get("description") + completed_at = request_body.get("completed_at") - # Validate input if not title or not description: return {"details": "Invalid data"}, 400 - new_task = Task(title=title, description=description) + if completed_at is None: + completed_at = None + + new_task = Task(title=title, description=description, completed_at=completed_at) db.session.add(new_task) db.session.commit() @@ -23,32 +69,9 @@ def create_task(): "id": new_task.id, "title": new_task.title, "description": new_task.description, - "is_complete": False + "is_complete": new_task.completed_at is not None }}, 201 -@tasks_bp.get("") -def get_tasks(): - tasks = Task.query.all() - return jsonify([{ - "id": task.id, - "title": task.title, - "description": task.description, - "is_complete": task.completed_at is not None - } for task in tasks]), 200 - -@tasks_bp.get("/") -def get_task(task_id): - task = Task.query.get(task_id) - if not task: - return {"message": f"Task {task_id} not found"}, 404 - - return {"task": { - "id": task.id, - "title": task.title, - "description": task.description, - "is_complete": task.completed_at is not None - }}, 200 - @tasks_bp.put("/") def update_task(task_id): task = Task.query.get(task_id) @@ -58,17 +81,23 @@ def update_task(task_id): request_body = request.get_json() title = request_body.get("title") description = request_body.get("description") + completed_at = request_body.get("completed_at") + + # Update attributes if provided in request body + if title: + task.title = title + if description: + task.description = description + if completed_at is not None: + task.completed_at = completed_at - # Update attributes - task.title = title - task.description = description db.session.commit() return {"task": { "id": task.id, "title": task.title, "description": task.description, - "is_complete": False + "is_complete": task.completed_at is not None }}, 200 @tasks_bp.delete("/") @@ -80,3 +109,53 @@ def delete_task(task_id): db.session.delete(task) db.session.commit() return {"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200 + +@tasks_bp.patch("//mark_complete") +def task_complete(task_id): + task = Task.query.get(task_id) + + if not task: + return {"message": f"Task {task_id} not found"}, 404 + + task.completed_at = datetime.now() + db.session.commit() + + slack_token = os.environ.get('SLACK_TOKEN') + slack_url = "https://slack.com/api/chat.postMessage" + slack_data = { + "channel": "api-test-channel", + "text": "My Beautiful Task" + } + slack_header = { + "Authorization": f"Bearer {slack_token}", + } + + requests.post(slack_url, data=slack_data, headers=slack_header) + + return { + "task": { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": True + } + }, 200 + +@tasks_bp.patch("//mark_incomplete") +def task_incomplete(task_id): + task = Task.query.get(task_id) + + if not task: + return {"message": f"Task {task_id} not found"}, 404 + + task.completed_at = None + db.session.commit() + + return { + "task": { + "id": task.id, + "title": task.title, + "description": task.description, + "is_complete": False + } + }, 200 \ No newline at end of file diff --git a/migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py b/migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py new file mode 100644 index 000000000..59de42420 --- /dev/null +++ b/migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py @@ -0,0 +1,34 @@ +"""one to many relationships goal to tasks + +Revision ID: 67974d3bfe48 +Revises: fb334535b2ec +Create Date: 2024-11-07 21:50:31.756523 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '67974d3bfe48' +down_revision = 'fb334535b2ec' +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/migrations/versions/e87c62c1c781_adds_task_model.py b/migrations/versions/e87c62c1c781_adds_task_model.py new file mode 100644 index 000000000..fe96bf866 --- /dev/null +++ b/migrations/versions/e87c62c1c781_adds_task_model.py @@ -0,0 +1,56 @@ +"""adds task model + +Revision ID: e87c62c1c781 +Revises: 1d211acba8af +Create Date: 2024-11-06 22:15:06.086421 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e87c62c1c781' +down_revision = '1d211acba8af' +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.alter_column('id', + existing_type=sa.INTEGER(), + server_default=None, + existing_nullable=False, + autoincrement=True) + batch_op.alter_column('title', + existing_type=sa.TEXT(), + type_=sa.String(), + nullable=False) + batch_op.alter_column('description', + existing_type=sa.TEXT(), + type_=sa.String(), + nullable=False) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.alter_column('description', + existing_type=sa.String(), + type_=sa.TEXT(), + nullable=True) + batch_op.alter_column('title', + existing_type=sa.String(), + type_=sa.TEXT(), + nullable=True) + batch_op.alter_column('id', + existing_type=sa.INTEGER(), + server_default=sa.Identity(always=True, start=1, increment=1, minvalue=1, maxvalue=2147483647, cycle=False, cache=1), + existing_nullable=False, + autoincrement=True) + + # ### end Alembic commands ### diff --git a/migrations/versions/fb334535b2ec_create_goal_model.py b/migrations/versions/fb334535b2ec_create_goal_model.py new file mode 100644 index 000000000..c86aed143 --- /dev/null +++ b/migrations/versions/fb334535b2ec_create_goal_model.py @@ -0,0 +1,32 @@ +"""Create Goal model + +Revision ID: fb334535b2ec +Revises: e87c62c1c781 +Create Date: 2024-11-07 16:30:19.239043 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fb334535b2ec' +down_revision = 'e87c62c1c781' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/tests/conftest.py b/tests/conftest.py index e370e597b..fc27614be 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,7 +6,7 @@ import os from app.models.task import Task from app.models.goal import Goal -from datetime import datetime +from datetime import datetime, timezone load_dotenv() @@ -77,11 +77,10 @@ def three_tasks(app): def completed_task(app): new_task = Task(title="Go on my daily walk 🏞", description="Notice something new every day", - completed_at=datetime.utcnow()) + completed_at=datetime.now(timezone.utc)) db.session.add(new_task) db.session.commit() - # This fixture gets called in every test that # references "one_goal" # This fixture creates a goal and saves it in the database diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 4c45a4b3e..fc19246e5 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -46,7 +46,8 @@ def test_get_task(client, one_task): "id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, + "goal_id": None } } @@ -59,7 +60,6 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - assert "message" in response_body assert response_body == {"message": "Task 1 not found"} @@ -127,7 +127,6 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - assert "message" in response_body assert response_body == {"message": "Task 1 not found"} 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..850344816 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,10 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body["message"] == "Task 1 not found" - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +138,5 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response_body["message"] == "Task 1 not found" - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..766005c23 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +12,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +29,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -45,23 +45,17 @@ def test_get_goal(client, one_goal): } } - -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") - # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- - + assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +74,31 @@ 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") - # Act - # ---- Complete Act Here ---- - - # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + response = client.put("/goals/1", json={"title": "Updated Goal Title"}) + response_body = response.get_json() + 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 ---- +# Act + response = client.put("/goals/1", json={"title": "New 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": f"Goal 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -123,28 +114,21 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + assert response.get_json() == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - - -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + # Assert + assert response_body == {"message": "Goal 1 not found"} -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..f096cc381 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,9 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert response_body == {"message": "Goal 1 not found"} - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** - - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +69,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 +94,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 7d6f0a8ca0bccf65540d8574fc1da9c6245ada3b Mon Sep 17 00:00:00 2001 From: Dana Delgado Date: Fri, 8 Nov 2024 11:16:08 -0800 Subject: [PATCH 4/6] re do migrations --- app/models/task.py | 3 +- app/routes/task_routes.py | 6 +- ..._create_task_table.py => 585532773e56_.py} | 11 ++-- ...one_to_many_relationships_goal_to_tasks.py | 34 ----------- .../versions/e87c62c1c781_adds_task_model.py | 56 ------------------- .../fb334535b2ec_create_goal_model.py | 32 ----------- 6 files changed, 11 insertions(+), 131 deletions(-) rename migrations/versions/{1d211acba8af_create_task_table.py => 585532773e56_.py} (76%) delete mode 100644 migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py delete mode 100644 migrations/versions/e87c62c1c781_adds_task_model.py delete mode 100644 migrations/versions/fb334535b2ec_create_goal_model.py diff --git a/app/models/task.py b/app/models/task.py index a1d129f3d..9c61a35ed 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,11 +9,10 @@ class Task(db.Model): description: Mapped[str] completed_at: Mapped[datetime] = mapped_column(nullable=True) - goal_id = mapped_column(db.Integer, db.ForeignKey('goal.id')) + goal_id = mapped_column(db.Integer, db.ForeignKey('goal.id'), nullable=True) goal = relationship("Goal", back_populates="tasks") - def to_dict(self): return { 'id': self.id, diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 1ad316643..0f671ec4a 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,6 +1,6 @@ import os import requests -from flask import Blueprint, abort, make_response, request, Response, jsonify +from flask import Blueprint, abort, make_response, request, Response from datetime import datetime, timezone from app.models.task import Task from ..db import db @@ -31,7 +31,7 @@ def get_tasks(): for task in tasks ] - return jsonify(task_list), 200 + return (task_list), 200 @tasks_bp.get("/") def get_task(task_id): @@ -124,7 +124,7 @@ def task_complete(task_id): slack_url = "https://slack.com/api/chat.postMessage" slack_data = { "channel": "api-test-channel", - "text": "My Beautiful Task" + "text": "Someone just completed the task " + task.title } slack_header = { "Authorization": f"Bearer {slack_token}", diff --git a/migrations/versions/1d211acba8af_create_task_table.py b/migrations/versions/585532773e56_.py similarity index 76% rename from migrations/versions/1d211acba8af_create_task_table.py rename to migrations/versions/585532773e56_.py index 0bb461555..68d5c20ed 100644 --- a/migrations/versions/1d211acba8af_create_task_table.py +++ b/migrations/versions/585532773e56_.py @@ -1,8 +1,8 @@ -"""create task table +"""empty message -Revision ID: 1d211acba8af +Revision ID: 585532773e56 Revises: -Create Date: 2024-10-31 21:50:20.062298 +Create Date: 2024-11-08 10:39:53.740884 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '1d211acba8af' +revision = '585532773e56' down_revision = None branch_labels = None depends_on = None @@ -20,6 +20,7 @@ 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', @@ -27,6 +28,8 @@ def upgrade(): 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 ### diff --git a/migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py b/migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py deleted file mode 100644 index 59de42420..000000000 --- a/migrations/versions/67974d3bfe48_one_to_many_relationships_goal_to_tasks.py +++ /dev/null @@ -1,34 +0,0 @@ -"""one to many relationships goal to tasks - -Revision ID: 67974d3bfe48 -Revises: fb334535b2ec -Create Date: 2024-11-07 21:50:31.756523 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '67974d3bfe48' -down_revision = 'fb334535b2ec' -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/migrations/versions/e87c62c1c781_adds_task_model.py b/migrations/versions/e87c62c1c781_adds_task_model.py deleted file mode 100644 index fe96bf866..000000000 --- a/migrations/versions/e87c62c1c781_adds_task_model.py +++ /dev/null @@ -1,56 +0,0 @@ -"""adds task model - -Revision ID: e87c62c1c781 -Revises: 1d211acba8af -Create Date: 2024-11-06 22:15:06.086421 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'e87c62c1c781' -down_revision = '1d211acba8af' -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.alter_column('id', - existing_type=sa.INTEGER(), - server_default=None, - existing_nullable=False, - autoincrement=True) - batch_op.alter_column('title', - existing_type=sa.TEXT(), - type_=sa.String(), - nullable=False) - batch_op.alter_column('description', - existing_type=sa.TEXT(), - type_=sa.String(), - nullable=False) - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('task', schema=None) as batch_op: - batch_op.alter_column('description', - existing_type=sa.String(), - type_=sa.TEXT(), - nullable=True) - batch_op.alter_column('title', - existing_type=sa.String(), - type_=sa.TEXT(), - nullable=True) - batch_op.alter_column('id', - existing_type=sa.INTEGER(), - server_default=sa.Identity(always=True, start=1, increment=1, minvalue=1, maxvalue=2147483647, cycle=False, cache=1), - existing_nullable=False, - autoincrement=True) - - # ### end Alembic commands ### diff --git a/migrations/versions/fb334535b2ec_create_goal_model.py b/migrations/versions/fb334535b2ec_create_goal_model.py deleted file mode 100644 index c86aed143..000000000 --- a/migrations/versions/fb334535b2ec_create_goal_model.py +++ /dev/null @@ -1,32 +0,0 @@ -"""Create Goal model - -Revision ID: fb334535b2ec -Revises: e87c62c1c781 -Create Date: 2024-11-07 16:30:19.239043 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'fb334535b2ec' -down_revision = 'e87c62c1c781' -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 ### From 76c242678a6deaedbf6332c56415ec2612d5bb16 Mon Sep 17 00:00:00 2001 From: Dana Delgado Date: Wed, 18 Dec 2024 15:17:15 -0500 Subject: [PATCH 5/6] updates to the init.py file --- app/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 968245b8d..b909cf28c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,6 +3,7 @@ from .models import task, goal from .routes.task_routes import tasks_bp from .routes.goal_routes import goals_bp +from flask_cors import CORS import os def create_app(config=None): @@ -12,17 +13,19 @@ def create_app(config=None): app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') if config: - # Merge `config` into the app's configuration - # to override the app's default settings for testing app.config.update(config) db.init_app(app) migrate.init_app(app, db) + CORS(app) + app.config['CORS_HEADERS'] = 'Content-Type' + # Register Blueprints here app.register_blueprint(tasks_bp) app.register_blueprint(goals_bp) + return app return app From 4ff8b3796faee2c04ad4ed8b4c717478483a3768 Mon Sep 17 00:00:00 2001 From: Dana Delgado Date: Wed, 18 Dec 2024 15:34:58 -0500 Subject: [PATCH 6/6] Add flask-cors to requirements.txt --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index a5f981da7..27b940059 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ charset-normalizer==3.3.2 click==8.1.7 coverage==7.6.4 Flask==3.0.2 +Flask-Cors==5.0.0 Flask-Migrate==4.0.5 Flask-SQLAlchemy==3.1.1 greenlet==3.0.3 @@ -21,6 +22,7 @@ psycopg2-binary==2.9.9 pytest==8.0.0 pytest-cov==6.0.0 python-dotenv==1.0.1 +pytz==2024.2 requests==2.32.3 SQLAlchemy==2.0.25 typing_extensions==4.9.0