From a4bda727c39a08c1a6fa3a3c4aff8c5b2ce591dd Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Mon, 4 Nov 2024 23:12:34 -0800 Subject: [PATCH 01/17] setup --- ada-project-docs/optional-enhancements.md | 4 +- ada-project-docs/wave_01.md | 9 +- app/__init__.py | 2 + app/models/task.py | 12 +++ app/routes/task_routes.py | 6 +- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++ migrations/env.py | 113 ++++++++++++++++++++++ migrations/script.py.mako | 24 +++++ 9 files changed, 213 insertions(+), 8 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 diff --git a/ada-project-docs/optional-enhancements.md b/ada-project-docs/optional-enhancements.md index 526ea5e42..7b3c8dcc6 100644 --- a/ada-project-docs/optional-enhancements.md +++ b/ada-project-docs/optional-enhancements.md @@ -1,4 +1,4 @@ -# Optional Enhancements +dour# Optional Enhancements ## Goal @@ -42,7 +42,7 @@ Here are some ideas to start: - Create a class method in `Task` named `from_json()` - Converts JSON into a new instance of `Task` - Takes in a dictionary in the shape of the JSON our API receives in the create and update routes - - Returns an instance of `Task` + - Returns an instance of `Task` ### Use List Comprehensions diff --git a/ada-project-docs/wave_01.md b/ada-project-docs/wave_01.md index 30be86ad8..29d3d4275 100644 --- a/ada-project-docs/wave_01.md +++ b/ada-project-docs/wave_01.md @@ -27,7 +27,7 @@ Tasks should contain these attributes. **The tests require the following columns ### Tips -- To work with date information, we can import the `datetime` data type with the import line `from datetime import datetime`. +- To work with date information, we can import the `datetime` data type with the import line `from datetime import datetime`. - SQLAlchemy supports optional, or _nullable_, columns with specific syntax. - Don't forget to run: - `flask db init` once during setup @@ -50,7 +50,7 @@ Tasks should contain these attributes. **The tests require the following columns ### CLI -In addition to testing your code with pytest and postman, you can play test your code with the CLI (Command Line Interface) by running `python3 cli/main.py`. +In addition to testing your code with pytest and postman, you can play test your code with the CLI (Command Line Interface) by running `python3 cli/main.py`. The flask server needs to be running first before running the CLI. @@ -122,8 +122,7 @@ As a client, I want to be able to make a `GET` request to `/tasks` when there ar #### Get One Task: One Saved Task -As a client, I want to be able to make a `GET` request to `/tasks/1` when there is at least one saved task and get this response: - +As a client, I want to be able to make a `GET` request to `/tasks/1` when there is at least one saved task and get this respons `200 OK` ```json @@ -192,7 +191,7 @@ The response code should be `404`. You may choose the response body. Make sure to complete the tests for non-existing tasks to check that the correct response body is returned. - + #### Create a Task: Invalid Task With Missing Data 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 5d99666a4..891e75586 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,17 @@ 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) + name: Mapped[str] + description: Mapped[str] + completed_at: Mapped[Optional[datetime]] + + def to_dict(self): + return dict( + id=self.id, + name=self.name, + description=self.description, + completed_at=self.completed_at) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 3aae38d49..542e70ade 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1 +1,5 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response,request, Response +from app.models.task import Task +from ..db import db + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") 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 2c511d4185c6aac24a15e5bf6c47f6499dd48a48 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Tue, 5 Nov 2024 22:24:31 -0800 Subject: [PATCH 02/17] wave_1 partially completed --- app/models/task.py | 6 +- app/routes/task_routes.py | 83 ++++++++++++++++++- .../5f654b06bedf_change_of_name_to_title.py | 34 ++++++++ migrations/versions/ae51d337ec5a_.py | 39 +++++++++ seed.py | 20 +++++ 5 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/5f654b06bedf_change_of_name_to_title.py create mode 100644 migrations/versions/ae51d337ec5a_.py create mode 100644 seed.py diff --git a/app/models/task.py b/app/models/task.py index 891e75586..85999af70 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,13 +5,13 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - name: Mapped[str] + title: Mapped[str] description: Mapped[str] completed_at: Mapped[Optional[datetime]] def to_dict(self): return dict( id=self.id, - name=self.name, + title=self.title, description=self.description, - completed_at=self.completed_at) + is_complete=False) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 542e70ade..2c9cdc6df 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -1,5 +1,86 @@ -from flask import Blueprint, abort, make_response,request, Response +from flask import Blueprint, abort, make_response, request, Response from app.models.task import Task from ..db import db +from datetime import datetime +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) + db.session.add(new_task) + db.session.commit() + + response = new_task.to_dict() + return response, 201 + + +@tasks_bp.get("") +def get_all_tasks(): + query = db.select(Task) + description_param = request.args.get("description") + if description_param: + query = query.where(Task.description.ilike(f"%{description_param}%")).order_by(Task.id) + + title_param = request.args.get("title") + if title_param: + query = query.where(Task.title.ilike(f"%{title_param}%")).order_by(Task.id) + + + query = query.order_by(Task.id) + tasks = db.session.scalars(query) + + tasks_response = [task.to_dict() for task in tasks] + + return tasks_response, 200 + + +@tasks_bp.get("/") +def get_single_task(task_id): + task = validate_task(task_id) + + return task.to_dict() + +@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() + return Response(status=204, mimetype='application/json') +def validate_task(task_id): + try: + task_id = int(task_id) + except: + response = {"message": f"task {task_id} invalid"} + abort(make_response(response, 400)) + + + query = db.select(Task).where(Task.id == task_id) + task = db.session.scalar(query) + + if not task: + response = {"message": f"task {task_id} not found"} + abort(make_response(response, 404)) + + return task \ No newline at end of file diff --git a/migrations/versions/5f654b06bedf_change_of_name_to_title.py b/migrations/versions/5f654b06bedf_change_of_name_to_title.py new file mode 100644 index 000000000..42934852e --- /dev/null +++ b/migrations/versions/5f654b06bedf_change_of_name_to_title.py @@ -0,0 +1,34 @@ +"""change of name to title + +Revision ID: 5f654b06bedf +Revises: ae51d337ec5a +Create Date: 2024-11-05 18:39:10.228479 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5f654b06bedf' +down_revision = 'ae51d337ec5a' +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('title', sa.String(), nullable=False)) + batch_op.drop_column('name') + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('task', schema=None) as batch_op: + batch_op.add_column(sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False)) + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/migrations/versions/ae51d337ec5a_.py b/migrations/versions/ae51d337ec5a_.py new file mode 100644 index 000000000..725e63680 --- /dev/null +++ b/migrations/versions/ae51d337ec5a_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: ae51d337ec5a +Revises: +Create Date: 2024-11-05 09:38:45.285803 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ae51d337ec5a' +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('name', 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/seed.py b/seed.py new file mode 100644 index 000000000..fbc204eb7 --- /dev/null +++ b/seed.py @@ -0,0 +1,20 @@ +from app import create_app, db +from app.models.task import Task +from datetime import datetime + + +my_app = create_app() +with my_app.app_context(): + db.session.add_all([ + Task(title="Finish Project Report", description="Complete the final report for the project", completed_at=datetime(2024, 10, 1, 14, 30)), + Task(title="Team Meeting", description="Attend the weekly team sync-up meeting", completed_at=datetime(2024, 10, 2, 9, 0)), + Task(title="Code Review", description="Review code for recent pull requests", completed_at=datetime(2024, 10, 3, 11, 15)), + Task(title="Client Call", description="Discuss requirements with the client", completed_at=datetime(2024, 10, 4, 15, 0)), + Task(title="Update Documentation", description="Add details to the API documentation", completed_at=datetime(2024, 10, 5, 10, 30)), + Task(title="Research on Tech Trends", description="Research new technology trends for the next project", completed_at=datetime(2024, 10, 6, 13, 0)), + Task(title="Design New Feature", description="Design wireframes for new app feature", completed_at=datetime(2024, 10, 7, 16, 45)), + Task(title="Team Outing", description="Organize a fun team-building outing", completed_at=datetime(2024, 10, 8, 18, 0)), + Task(title="Debugging Issue #123", description="Fix the bug reported in issue #123", completed_at=datetime(2024, 10, 9, 12, 0)), + Task(title="Final Presentation", description="Prepare the slides for the final presentation", completed_at=datetime(2024, 10, 10, 9, 0)) +]) + db.session.commit() From 8888e1b8277f356d34ef8d4d7de4e33458d22022 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Wed, 6 Nov 2024 23:15:18 -0800 Subject: [PATCH 03/17] completed wave 1 --- app/models/task.py | 4 +++- app/routes/task_routes.py | 40 ++++++++++++++++++++++++--------------- seed.py | 2 +- tests/test_wave_01.py | 38 +++++++++++++++++++++++-------------- 4 files changed, 53 insertions(+), 31 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 85999af70..5fba30ca3 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,9 +9,11 @@ class Task(db.Model): description: Mapped[str] completed_at: Mapped[Optional[datetime]] + def to_dict(self): + return dict( id=self.id, title=self.title, description=self.description, - is_complete=False) + is_complete=bool(self.completed_at)) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 2c9cdc6df..6f6631f93 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -11,15 +11,19 @@ @tasks_bp.post("") def create_task(): request_body = request.get_json() + + if "title" not in request_body or "description" not in request_body: + return {"details": "Invalid data"}, 400 title = request_body["title"] description = request_body["description"] - completed_at = request_body["completed_at"] + completed_at = request_body.get("completed_at") new_task = Task(title=title, description=description, completed_at=completed_at) + db.session.add(new_task) db.session.commit() - response = new_task.to_dict() + response = {"task": new_task.to_dict()} return response, 201 @@ -47,7 +51,9 @@ def get_all_tasks(): def get_single_task(task_id): task = validate_task(task_id) - return task.to_dict() + + return {"task": task.to_dict()} + @tasks_bp.put("/") def update_task(task_id): @@ -55,11 +61,13 @@ def update_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"] + task.description = request_body.get("description") + task.completed_at = request_body.get("completed_at") db.session.commit() - return Response(status=204, mimetype='application/json') + response = {"task": task.to_dict()} + return response, 200 + @tasks_bp.delete("/") def delete_task(task_id): @@ -67,20 +75,22 @@ def delete_task(task_id): db.session.delete(task) db.session.commit() - return Response(status=204, mimetype='application/json') + response = { + "details": f'Task {task_id} "{task.title}" successfully deleted' + } + return response, 200 + def validate_task(task_id): try: task_id = int(task_id) - except: - response = {"message": f"task {task_id} invalid"} - abort(make_response(response, 400)) - + except ValueError: + response = {"details": f"Task {task_id} invalid"} + abort(make_response(response, 404)) - query = db.select(Task).where(Task.id == task_id) - task = db.session.scalar(query) + task = Task.query.get(task_id) if not task: - response = {"message": f"task {task_id} not found"} - abort(make_response(response, 404)) + response = {"message": f"task {task_id} not found"} + abort(make_response(response, 404)) return task \ No newline at end of file diff --git a/seed.py b/seed.py index fbc204eb7..860dc71cf 100644 --- a/seed.py +++ b/seed.py @@ -6,7 +6,7 @@ my_app = create_app() with my_app.app_context(): db.session.add_all([ - Task(title="Finish Project Report", description="Complete the final report for the project", completed_at=datetime(2024, 10, 1, 14, 30)), + Task(title="Go on my daily walk 🏞", description="Notice something new every day", completed_at=None), Task(title="Team Meeting", description="Attend the weekly team sync-up meeting", completed_at=datetime(2024, 10, 2, 9, 0)), Task(title="Code Review", description="Review code for recent pull requests", completed_at=datetime(2024, 10, 3, 11, 15)), Task(title="Client Call", description="Discuss requirements with the client", completed_at=datetime(2024, 10, 4, 15, 0)), diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..2c5f56a66 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") @@ -60,13 +60,17 @@ 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*************** # ***************************************************************** + id = 1 + assert response_body == {"message": f"task {id} not found"} -@pytest.mark.skip(reason="No way to test this feature yet") + + +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -78,6 +82,7 @@ def test_create_task(client): # Assert assert response.status_code == 201 assert "task" in response_body + assert response_body == { "task": { "id": 1, @@ -93,7 +98,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 +124,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={ @@ -131,13 +136,15 @@ 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*************** # ***************************************************************** + id = 1 + assert response_body == {"message": f"task {id} 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 +159,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,15 +168,18 @@ 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 response.status_code == 404 + 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 +196,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 e410b1910abf37a4477ba05f9a8ca105c98590d7 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:10:18 -0800 Subject: [PATCH 04/17] completed wave 3 --- app/models/task.py | 8 +++++++ app/routes/task_routes.py | 50 +++++++++++++++++++++++++++++++-------- tests/test_wave_02.py | 4 ++-- tests/test_wave_03.py | 20 +++++++++------- 4 files changed, 62 insertions(+), 20 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 5fba30ca3..895be1ee6 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -17,3 +17,11 @@ def to_dict(self): title=self.title, description=self.description, is_complete=bool(self.completed_at)) + + @classmethod + def from_dict(cls, task_data): + return cls( + title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at", None) + ) diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 6f6631f93..74761eb2c 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -12,13 +12,20 @@ def create_task(): request_body = request.get_json() - if "title" not in request_body or "description" not in request_body: - return {"details": "Invalid data"}, 400 - title = request_body["title"] - description = request_body["description"] - completed_at = request_body.get("completed_at") + try: + new_task = Task.from_dict(request_body) + + except KeyError: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + # if "title" not in request_body or "description" not in request_body: + # return {"details": "Invalid data"}, 400 + # title = request_body["title"] + # description = request_body["description"] + # completed_at = request_body.get("completed_at") - new_task = Task(title=title, description=description, completed_at=completed_at) + # new_task = Task(title=title, description=description, completed_at=completed_at) db.session.add(new_task) db.session.commit() @@ -35,13 +42,19 @@ def get_all_tasks(): query = query.where(Task.description.ilike(f"%{description_param}%")).order_by(Task.id) title_param = request.args.get("title") + sort = request.args.get("sort", "asc") # Default to ascending order + + query = db.select(Task) + if title_param: - query = query.where(Task.title.ilike(f"%{title_param}%")).order_by(Task.id) + query = query.where(Task.title.ilike(f"%{title_param}%")) + if sort == "desc": + query = query.order_by(Task.title.desc()) + else: + query = query.order_by(Task.title.asc()) - query = query.order_by(Task.id) tasks = db.session.scalars(query) - tasks_response = [task.to_dict() for task in tasks] return tasks_response, 200 @@ -68,6 +81,23 @@ def update_task(task_id): response = {"task": task.to_dict()} return response, 200 +@tasks_bp.patch("//mark_complete") +def mark_task_complete(task_id): + task = validate_task(task_id) + task.completed_at = datetime.now() + db.session.commit() + + return {"task": task.to_dict()}, 200 + +@tasks_bp.patch("//mark_incomplete") +def mark_task_incomplete(task_id): + task = validate_task(task_id) + task.completed_at = None + + db.session.commit() + + return {"task": task.to_dict()}, 200 + @tasks_bp.delete("/") def delete_task(task_id): @@ -87,7 +117,7 @@ def validate_task(task_id): response = {"details": f"Task {task_id} invalid"} abort(make_response(response, 404)) - task = Task.query.get(task_id) + task = db.session.get(Task,task_id) if not task: response = {"message": f"task {task_id} 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..f234f260b 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,15 @@ 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*************** # ***************************************************************** + id =1 + assert response_body == {"message": f"task {id} 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_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -143,7 +145,9 @@ 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*************** # ***************************************************************** + id =1 + assert response_body == {"message": f"task {id} not found"} From 681df2bea8013fbfdea646e48d4765dc1071b184 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Thu, 7 Nov 2024 21:37:10 -0800 Subject: [PATCH 05/17] completed wave 5 --- app/__init__.py | 2 + app/models/goal.py | 13 ++ app/routes/goal_routes.py | 112 +++++++++++++++++- app/routes/task_routes.py | 7 -- .../a953a5edae31_goal_modelv_createc.py | 32 +++++ tests/test_wave_05.py | 66 ++++++++--- 6 files changed, 206 insertions(+), 26 deletions(-) create mode 100644 migrations/versions/a953a5edae31_goal_modelv_createc.py diff --git a/app/__init__.py b/app/__init__.py index 80dc0d60a..de06dac09 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,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..aa9cc5388 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,16 @@ 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) + + @classmethod + def from_dict(cls, goal_data): + return cls( + title=goal_data["title"]) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3aae38d49..295137181 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1 +1,111 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, abort, make_response, request, Response +from app.models.goal import Goal +from ..db import db +from datetime import datetime + +goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") + + + +@goals_bp.post("") +def create_goal(): + request_body = request.get_json() + + try: + new_goal = Goal.from_dict(request_body) + + except KeyError: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) + + db.session.add(new_goal) + db.session.commit() + + response = {"goal": new_goal.to_dict()} + return response, 201 + + +@goals_bp.get("") +def get_all_goals(): + query = db.select(Goal) + + title_param = request.args.get("title") + sort = request.args.get("sort", "asc") # Default to ascending order + + query = db.select(Goal) + + if title_param: + query = query.where(Goal.title.ilike(f"%{title_param}%")) + + if sort == "desc": + query = query.order_by(Goal.title.asc()) + + goals = db.session.scalars(query) + goals_response = [goal.to_dict() for goal in goals] + + return goals_response, 200 + + +@goals_bp.get("/") +def get_single_goal(goal_id): + goal = validate_goal(goal_id) + + + return {"goal": goal.to_dict()} + + +@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() + response = {"goal": goal.to_dict()} + return response, 200 + +@goals_bp.patch("//mark_complete") +def mark_goal_complete(goal_id): + goal = validate_goal(goal_id) + goal.completed_at = datetime.now() + db.session.commit() + + return {"goal": goal.to_dict()}, 200 + +@goals_bp.patch("//mark_incomplete") +def mark_goal_incomplete(goal_id): + goal = validate_goal(goal_id) + goal.completed_at = None + + db.session.commit() + + return {"goal": goal.to_dict()}, 200 + + +@goals_bp.delete("/") +def delete_goal(goal_id): + goal = validate_goal(goal_id) + + db.session.delete(goal) + db.session.commit() + response = { + "details": f'Goal {goal_id} "{goal.title}" successfully deleted' + } + return response, 200 + +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except ValueError: + response = {"details": f"Goal {goal_id} invalid"} + abort(make_response(response, 404)) + + goal = db.session.get(Goal,goal_id) + + if not goal: + response = {"message": f"goal {goal_id} not found"} + abort(make_response(response, 404)) + + return goal diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index 74761eb2c..454b6573d 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -19,13 +19,6 @@ def create_task(): response = {"details": "Invalid data"} abort(make_response(response, 400)) - # if "title" not in request_body or "description" not in request_body: - # return {"details": "Invalid data"}, 400 - # title = request_body["title"] - # description = request_body["description"] - # completed_at = request_body.get("completed_at") - - # new_task = Task(title=title, description=description, completed_at=completed_at) db.session.add(new_task) db.session.commit() diff --git a/migrations/versions/a953a5edae31_goal_modelv_createc.py b/migrations/versions/a953a5edae31_goal_modelv_createc.py new file mode 100644 index 000000000..8985c8551 --- /dev/null +++ b/migrations/versions/a953a5edae31_goal_modelv_createc.py @@ -0,0 +1,32 @@ +"""Goal modelv createc + +Revision ID: a953a5edae31 +Revises: 5f654b06bedf +Create Date: 2024-11-07 17:45:39.011299 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a953a5edae31' +down_revision = '5f654b06bedf' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.add_column(sa.Column('title', sa.String(), nullable=False)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('goal', schema=None) as batch_op: + batch_op.drop_column('title') + + # ### end Alembic commands ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..74a502b58 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ import pytest +from app.models.goal import Goal -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +47,24 @@ 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 # ---- Complete Test ---- + id = 1 + assert response_body == {"message": f"goal {id} 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 +83,55 @@ 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 + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # ---- Complete Act Here ---- # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert response.status_code == 200 # assertion 2 goes here + assert "goal" in response_body # assertion 3 goes here # ---- Complete Assertions Here ---- + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title", + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) # ---- Complete Act Here ---- + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here # ---- Complete Assertions Here ---- + id = 1 + assert response_body == {"message": f"goal {id} 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") @@ -124,27 +148,33 @@ def test_delete_goal(client, one_goal): 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 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 # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + # ---- Complete Assertions Here ---- + assert response_body == {"message": "goal 1 not found"} + + assert Goal.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) From de119b748542902d8e965efc63eacb132f36f2f1 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:31:30 -0800 Subject: [PATCH 06/17] added wave 6 --- app/models/goal.py | 3 ++- app/models/task.py | 23 +++++++++++++++-------- app/routes/goal_routes.py | 38 ++++++++++++++++++++++++++++++-------- tests/test_wave_06.py | 17 +++++++++-------- 4 files changed, 56 insertions(+), 25 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index aa9cc5388..c7bb1d709 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,9 +1,10 @@ -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('Task', back_populates='goal') diff --git a/app/models/task.py b/app/models/task.py index 895be1ee6..bbdb5cf3b 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 ..db import db from datetime import datetime from typing import Optional @@ -8,20 +9,26 @@ class Task(db.Model): title: Mapped[str] description: Mapped[str] completed_at: Mapped[Optional[datetime]] + goal_id: Mapped[Optional[int]] = db.Column(db.Integer, db.ForeignKey('goal.id')) + goal: Mapped[Optional['Goal']] = db.relationship('Goal', back_populates='tasks') def to_dict(self): - - return dict( - id=self.id, - title=self.title, - description=self.description, - is_complete=bool(self.completed_at)) + task_dict = { + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": self.completed_at is not None + } + if self.goal_id is not None: + task_dict["goal_id"] = self.goal_id + return task_dict @classmethod def from_dict(cls, task_data): return cls( + goal_id=task_data.get("goal_id"), title=task_data["title"], description=task_data["description"], completed_at=task_data.get("completed_at", None) - ) + ) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 295137181..3093ba234 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint, abort, make_response, request, Response from app.models.goal import Goal +from app.models.task import Task from ..db import db from datetime import datetime @@ -95,17 +96,38 @@ def delete_goal(goal_id): } return response, 200 -def validate_goal(goal_id): - try: - goal_id = int(goal_id) - except ValueError: +@goals_bp.get("/tasks") +def get_tasks_by_goal(goal_id): + goal = validate_goal(Goal, goal_id) + + goal_dict = goal.to_dict() + goal_dict["tasks"] = [task.to_dict() for task in goal.tasks] + + return goal_dict + +@goals_bp.get("/tasks/") +def get_one_task_by_goal(goal_id, task_id): + + goal = validate_goal(Goal, goal_id) + task = validate_goal(Task, task_id) + + if task in goal.tasks: + goal_dict = goal.to_dict() + goal_dict["task"] = task.to_dict() + return goal_dict + return {"details": f"Task {task.id} not found for Goal {goal.id}"}, 404 + +def validate_goal(cls, goal_id): + try: + goal_id = int(goal_id) + except ValueError: response = {"details": f"Goal {goal_id} invalid"} abort(make_response(response, 404)) - goal = db.session.get(Goal,goal_id) + goal = db.session.get(cls, goal_id) - if not goal: - response = {"message": f"goal {goal_id} not found"} + if not goal: + response = {"message": f"Goal {goal_id} not found"} abort(make_response(response, 404)) - return goal + return goal diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..423cc77f3 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") @@ -51,13 +51,14 @@ 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*************** # ***************************************************************** + id = 1 + assert response_body == {"message": f"Goal {id} not found"} - -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +75,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 +100,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 77f3cbab8a0e28b0770684da25e1871a8e09bef7 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:13:28 -0800 Subject: [PATCH 07/17] completed wave 6 all tests passing --- app/routes/goal_routes.py | 35 +++++++++++++++++++++++------------ tests/test_wave_06.py | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 3093ba234..574d60ab9 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -96,15 +96,29 @@ def delete_goal(goal_id): } return response, 200 -@goals_bp.get("/tasks") -def get_tasks_by_goal(goal_id): - goal = validate_goal(Goal, goal_id) +@goals_bp.post("//tasks") +@goals_bp.post("//tasks") +def assign_tasks_to_goal(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + task_ids = request_body.get("task_ids", []) + + tasks = Task.query.filter(Task.id.in_(task_ids)).all() + + goal.tasks.extend(tasks) + db.session.commit() + + return {"id": goal.id, "task_ids": task_ids}, 200 + +@goals_bp.get("//tasks") +def get_tasks_by_goal(goal_id): + goal = validate_goal(goal_id) goal_dict = goal.to_dict() goal_dict["tasks"] = [task.to_dict() for task in goal.tasks] - return goal_dict + @goals_bp.get("/tasks/") def get_one_task_by_goal(goal_id, task_id): @@ -117,17 +131,14 @@ def get_one_task_by_goal(goal_id, task_id): return goal_dict return {"details": f"Task {task.id} not found for Goal {goal.id}"}, 404 -def validate_goal(cls, goal_id): +def validate_goal(goal_id): try: goal_id = int(goal_id) except ValueError: - response = {"details": f"Goal {goal_id} invalid"} - abort(make_response(response, 404)) - - goal = db.session.get(cls, goal_id) + abort(400, description="Invalid goal_id") - if not goal: - response = {"message": f"Goal {goal_id} not found"} - abort(make_response(response, 404)) + goal = Goal.query.get(goal_id) + if goal is None: + abort(make_response({"message": f"goal {goal_id} not found"}, 404)) return goal diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 423cc77f3..7148d0740 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -56,7 +56,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): # **Complete test with assertion about response body*************** # ***************************************************************** id = 1 - assert response_body == {"message": f"Goal {id} not found"} + assert response_body == {"message": f"goal {id} not found"} # @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): From 59dc8bdf2d932f1761139b4b2545d442eb964015 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:36:13 -0800 Subject: [PATCH 08/17] setup for deployment --- app/__init__.py | 5 ++- app/models/goal.py | 14 +++---- app/models/task.py | 26 ++++++------- app/routes/goal_routes.py | 78 +++++++++++++++++++-------------------- requirements.txt | 2 + tests/test_wave_06.py | 31 ++++++---------- 6 files changed, 73 insertions(+), 83 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index de06dac09..cda3d76d7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,11 +5,12 @@ from .routes.goal_routes import goals_bp import os + def create_app(config=None): app = Flask(__name__) - app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI") if config: # Merge `config` into the app's configuration diff --git a/app/models/goal.py b/app/models/goal.py index c7bb1d709..a02345ee2 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,19 +1,15 @@ -from sqlalchemy.orm import Mapped, mapped_column,relationship +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('Task', back_populates='goal') - - + tasks: Mapped[list["Task"]] = relationship("Task", back_populates="goal") def to_dict(self): - return dict( - id=self.id, - title=self.title) + return dict(id=self.id, title=self.title) @classmethod def from_dict(cls, goal_data): - return cls( - title=goal_data["title"]) + return cls(title=goal_data["title"]) diff --git a/app/models/task.py b/app/models/task.py index bbdb5cf3b..1ebb903cc 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,24 +1,24 @@ -from sqlalchemy.orm import Mapped, mapped_column,relationship +from sqlalchemy.orm import Mapped, mapped_column, relationship from sqlalchemy import ForeignKey from ..db import db from datetime import datetime from typing import Optional + class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) title: Mapped[str] description: Mapped[str] completed_at: Mapped[Optional[datetime]] - goal_id: Mapped[Optional[int]] = db.Column(db.Integer, db.ForeignKey('goal.id')) - goal: Mapped[Optional['Goal']] = db.relationship('Goal', back_populates='tasks') - + goal_id: Mapped[Optional[int]] = db.Column(db.Integer, db.ForeignKey("goal.id")) + goal: Mapped[Optional["Goal"]] = db.relationship("Goal", back_populates="tasks") def to_dict(self): task_dict = { - "id": self.id, - "title": self.title, - "description": self.description, - "is_complete": self.completed_at is not None + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": self.completed_at is not None, } if self.goal_id is not None: task_dict["goal_id"] = self.goal_id @@ -27,8 +27,8 @@ def to_dict(self): @classmethod def from_dict(cls, task_data): return cls( - goal_id=task_data.get("goal_id"), - title=task_data["title"], - description=task_data["description"], - completed_at=task_data.get("completed_at", None) - ) + goal_id=task_data.get("goal_id"), + title=task_data["title"], + description=task_data["description"], + completed_at=task_data.get("completed_at", None), + ) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 574d60ab9..6b34a6444 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -7,65 +7,63 @@ goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals") - @goals_bp.post("") def create_goal(): - request_body = request.get_json() + request_body = request.get_json() - try: - new_goal = Goal.from_dict(request_body) + try: + new_goal = Goal.from_dict(request_body) - except KeyError: - response = {"details": "Invalid data"} - abort(make_response(response, 400)) + except KeyError: + response = {"details": "Invalid data"} + abort(make_response(response, 400)) - db.session.add(new_goal) - db.session.commit() + db.session.add(new_goal) + db.session.commit() - response = {"goal": new_goal.to_dict()} - return response, 201 + response = {"goal": new_goal.to_dict()} + return response, 201 @goals_bp.get("") def get_all_goals(): - query = db.select(Goal) + query = db.select(Goal) - title_param = request.args.get("title") - sort = request.args.get("sort", "asc") # Default to ascending order + title_param = request.args.get("title") + sort = request.args.get("sort", "asc") # Default to ascending order - query = db.select(Goal) + query = db.select(Goal) - if title_param: - query = query.where(Goal.title.ilike(f"%{title_param}%")) + if title_param: + query = query.where(Goal.title.ilike(f"%{title_param}%")) - if sort == "desc": - query = query.order_by(Goal.title.asc()) + if sort == "desc": + query = query.order_by(Goal.title.asc()) - goals = db.session.scalars(query) - goals_response = [goal.to_dict() for goal in goals] + goals = db.session.scalars(query) + goals_response = [goal.to_dict() for goal in goals] - return goals_response, 200 + return goals_response, 200 @goals_bp.get("/") def get_single_goal(goal_id): - goal = validate_goal(goal_id) - + goal = validate_goal(goal_id) - return {"goal": goal.to_dict()} + return {"goal": goal.to_dict()} @goals_bp.put("/") def update_goal(goal_id): - goal = validate_goal(goal_id) - request_body = request.get_json() + goal = validate_goal(goal_id) + request_body = request.get_json() - goal.title = request_body["title"] + goal.title = request_body["title"] + db.session.commit() + response = {"goal": goal.to_dict()} + return response, 200 - db.session.commit() - response = {"goal": goal.to_dict()} - return response, 200 @goals_bp.patch("//mark_complete") def mark_goal_complete(goal_id): @@ -75,6 +73,7 @@ def mark_goal_complete(goal_id): return {"goal": goal.to_dict()}, 200 + @goals_bp.patch("//mark_incomplete") def mark_goal_incomplete(goal_id): goal = validate_goal(goal_id) @@ -87,16 +86,14 @@ def mark_goal_incomplete(goal_id): @goals_bp.delete("/") def delete_goal(goal_id): - goal = validate_goal(goal_id) + goal = validate_goal(goal_id) + + db.session.delete(goal) + db.session.commit() + response = {"details": f'Goal {goal_id} "{goal.title}" successfully deleted'} + return response, 200 - db.session.delete(goal) - db.session.commit() - response = { - "details": f'Goal {goal_id} "{goal.title}" successfully deleted' - } - return response, 200 -@goals_bp.post("//tasks") @goals_bp.post("//tasks") def assign_tasks_to_goal(goal_id): goal = validate_goal(goal_id) @@ -108,7 +105,7 @@ def assign_tasks_to_goal(goal_id): goal.tasks.extend(tasks) db.session.commit() - return {"id": goal.id, "task_ids": task_ids}, 200 + return {"id": goal.id, "task_ids": task_ids}, 200 @goals_bp.get("//tasks") @@ -131,6 +128,7 @@ def get_one_task_by_goal(goal_id, task_id): return goal_dict return {"details": f"Task {task.id} not found for Goal {goal.id}"}, 404 + def validate_goal(goal_id): try: goal_id = int(goal_id) diff --git a/requirements.txt b/requirements.txt index af8fc4cf4..5e98f339c 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 +exceptiongroup==1.2.2 Flask==3.0.2 Flask-Migrate==4.0.5 Flask-SQLAlchemy==3.1.1 @@ -21,6 +22,7 @@ pytest==8.0.0 python-dotenv==1.0.1 requests==2.32.3 SQLAlchemy==2.0.25 +tomli==2.0.2 typing_extensions==4.9.0 urllib3==2.2.3 Werkzeug==3.0.1 diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 7148d0740..fbaeaf5c6 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -5,40 +5,32 @@ # @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={ - "task_ids": [1, 2, 3] - }) + response = client.post("/goals/1/tasks", json={"task_ids": [1, 2, 3]}) response_body = response.get_json() # Assert assert response.status_code == 200 assert "id" in response_body assert "task_ids" in response_body - assert response_body == { - "id": 1, - "task_ids": [1, 2, 3] - } + assert response_body == {"id": 1, "task_ids": [1, 2, 3]} # Check that Goal was updated in the db assert len(Goal.query.get(1).tasks) == 3 # @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): +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={ - "task_ids": [1, 4] - }) + response = client.post("/goals/1/tasks", json={"task_ids": [1, 4]}) response_body = response.get_json() # Assert assert response.status_code == 200 assert "id" in response_body assert "task_ids" in response_body - assert response_body == { - "id": 1, - "task_ids": [1, 4] - } + assert response_body == {"id": 1, "task_ids": [1, 4]} assert len(Goal.query.get(1).tasks) == 2 @@ -58,6 +50,7 @@ def test_get_tasks_for_specific_goal_no_goal(client): id = 1 assert response_body == {"message": f"goal {id} not found"} + # @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act @@ -71,7 +64,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): assert response_body == { "id": 1, "title": "Build a habit of going outside daily", - "tasks": [] + "tasks": [], } @@ -94,9 +87,9 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): "goal_id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, } - ] + ], } @@ -114,6 +107,6 @@ def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): "goal_id": 1, "title": "Go on my daily walk 🏞", "description": "Notice something new every day", - "is_complete": False + "is_complete": False, } } From 8eb38ad0565d8e26579698c692424b805d0795c3 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:09:19 -0800 Subject: [PATCH 09/17] migrations changed --- .../5f654b06bedf_change_of_name_to_title.py | 34 ---------------- .../a953a5edae31_goal_modelv_createc.py | 32 --------------- migrations/versions/ae51d337ec5a_.py | 39 ------------------- 3 files changed, 105 deletions(-) delete mode 100644 migrations/versions/5f654b06bedf_change_of_name_to_title.py delete mode 100644 migrations/versions/a953a5edae31_goal_modelv_createc.py delete mode 100644 migrations/versions/ae51d337ec5a_.py diff --git a/migrations/versions/5f654b06bedf_change_of_name_to_title.py b/migrations/versions/5f654b06bedf_change_of_name_to_title.py deleted file mode 100644 index 42934852e..000000000 --- a/migrations/versions/5f654b06bedf_change_of_name_to_title.py +++ /dev/null @@ -1,34 +0,0 @@ -"""change of name to title - -Revision ID: 5f654b06bedf -Revises: ae51d337ec5a -Create Date: 2024-11-05 18:39:10.228479 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '5f654b06bedf' -down_revision = 'ae51d337ec5a' -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('title', sa.String(), nullable=False)) - batch_op.drop_column('name') - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('task', schema=None) as batch_op: - batch_op.add_column(sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False)) - batch_op.drop_column('title') - - # ### end Alembic commands ### diff --git a/migrations/versions/a953a5edae31_goal_modelv_createc.py b/migrations/versions/a953a5edae31_goal_modelv_createc.py deleted file mode 100644 index 8985c8551..000000000 --- a/migrations/versions/a953a5edae31_goal_modelv_createc.py +++ /dev/null @@ -1,32 +0,0 @@ -"""Goal modelv createc - -Revision ID: a953a5edae31 -Revises: 5f654b06bedf -Create Date: 2024-11-07 17:45:39.011299 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'a953a5edae31' -down_revision = '5f654b06bedf' -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/migrations/versions/ae51d337ec5a_.py b/migrations/versions/ae51d337ec5a_.py deleted file mode 100644 index 725e63680..000000000 --- a/migrations/versions/ae51d337ec5a_.py +++ /dev/null @@ -1,39 +0,0 @@ -"""empty message - -Revision ID: ae51d337ec5a -Revises: -Create Date: 2024-11-05 09:38:45.285803 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'ae51d337ec5a' -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('name', 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 ### From 69fe2bf0e66e6f4ed708390966e76f4622019048 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 8 Nov 2024 16:08:26 -0800 Subject: [PATCH 10/17] changed database --- migrations/versions/0150dc2aa100_.py | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 migrations/versions/0150dc2aa100_.py diff --git a/migrations/versions/0150dc2aa100_.py b/migrations/versions/0150dc2aa100_.py new file mode 100644 index 000000000..90228969c --- /dev/null +++ b/migrations/versions/0150dc2aa100_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 0150dc2aa100 +Revises: +Create Date: 2024-11-08 16:02:12.714867 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0150dc2aa100' +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 77f22b64e2c80fda3da99e054d3e802e1356ac86 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:32:03 -0800 Subject: [PATCH 11/17] seed goals --- seed.py | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/seed.py b/seed.py index 860dc71cf..ef624ac35 100644 --- a/seed.py +++ b/seed.py @@ -1,20 +1,33 @@ from app import create_app, db from app.models.task import Task +from app.models.goal import Goal from datetime import datetime my_app = create_app() + with my_app.app_context(): - db.session.add_all([ - Task(title="Go on my daily walk 🏞", description="Notice something new every day", completed_at=None), - Task(title="Team Meeting", description="Attend the weekly team sync-up meeting", completed_at=datetime(2024, 10, 2, 9, 0)), - Task(title="Code Review", description="Review code for recent pull requests", completed_at=datetime(2024, 10, 3, 11, 15)), - Task(title="Client Call", description="Discuss requirements with the client", completed_at=datetime(2024, 10, 4, 15, 0)), - Task(title="Update Documentation", description="Add details to the API documentation", completed_at=datetime(2024, 10, 5, 10, 30)), - Task(title="Research on Tech Trends", description="Research new technology trends for the next project", completed_at=datetime(2024, 10, 6, 13, 0)), - Task(title="Design New Feature", description="Design wireframes for new app feature", completed_at=datetime(2024, 10, 7, 16, 45)), - Task(title="Team Outing", description="Organize a fun team-building outing", completed_at=datetime(2024, 10, 8, 18, 0)), - Task(title="Debugging Issue #123", description="Fix the bug reported in issue #123", completed_at=datetime(2024, 10, 9, 12, 0)), - Task(title="Final Presentation", description="Prepare the slides for the final presentation", completed_at=datetime(2024, 10, 10, 9, 0)) -]) - db.session.commit() + + goal1 = Goal(title="Health and Well-being") + goal2 = Goal(title="Team Collaboration") + goal3 = Goal(title="Skill Development") + goal4 = Goal(title="Project Planning") + + db.session.add_all([goal1, goal2, goal3, goal4]) + db.session.commit() + + tasks = [ + Task(title="Go on my daily walk 🏞", description="Notice something new every day", completed_at=None, goal_id=goal1.id), + Task(title="Yoga Practice", description="30 minutes of morning yoga", completed_at=None, goal_id=goal1.id), + Task(title="Team Meeting", description="Attend the weekly team sync-up meeting", completed_at=datetime(2024, 10, 2, 9, 0), goal_id=goal2.id), + Task(title="Code Review", description="Review code for recent pull requests", completed_at=datetime(2024, 10, 3, 11, 15), goal_id=goal2.id), + Task(title="Client Call", description="Discuss requirements with the client", completed_at=datetime(2024, 10, 4, 15, 0), goal_id=goal2.id), + Task(title="Update Documentation", description="Add details to the API documentation", completed_at=datetime(2024, 10, 5, 10, 30), goal_id=goal3.id), + Task(title="Research on Tech Trends", description="Research new technology trends for the next project", completed_at=datetime(2024, 10, 6, 13, 0), goal_id=goal3.id), + Task(title="Design New Feature", description="Design wireframes for new app feature", completed_at=datetime(2024, 10, 7, 16, 45), goal_id=goal3.id), + Task(title="Project Roadmap", description="Create roadmap for the new project", completed_at=None, goal_id=goal4.id), + Task(title="Sprint Planning", description="Plan tasks for upcoming sprint", completed_at=None, goal_id=goal4.id) + ] + + db.session.add_all(tasks) + db.session.commit() From aadbb26c76390a3de8c2d8448945afa3da3f1966 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:56:15 -0800 Subject: [PATCH 12/17] Update app/models/task.py Co-authored-by: Ashley Yang --- app/models/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 1ebb903cc..909ea0739 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,7 +7,7 @@ class Task(db.Model): id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) - title: Mapped[str] + title: Mapped[str] = mapped_column(String, nullable=False) description: Mapped[str] completed_at: Mapped[Optional[datetime]] goal_id: Mapped[Optional[int]] = db.Column(db.Integer, db.ForeignKey("goal.id")) From 1bb52da649916cae06dd8c509d1517a5d399f04f Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:58:16 -0800 Subject: [PATCH 13/17] Update app/models/task.py Co-authored-by: Ashley Yang --- app/models/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 909ea0739..15d7485c8 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -11,7 +11,7 @@ class Task(db.Model): description: Mapped[str] completed_at: Mapped[Optional[datetime]] goal_id: Mapped[Optional[int]] = db.Column(db.Integer, db.ForeignKey("goal.id")) - goal: Mapped[Optional["Goal"]] = db.relationship("Goal", back_populates="tasks") + goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") def to_dict(self): task_dict = { From e7a22aa75ae3be669727ae8c05e6c47d9be6ea64 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:58:50 -0800 Subject: [PATCH 14/17] Update app/models/task.py Co-authored-by: Ashley Yang --- app/models/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 15d7485c8..1e8ad74f2 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -18,7 +18,7 @@ def to_dict(self): "id": self.id, "title": self.title, "description": self.description, - "is_complete": self.completed_at is not None, + "is_complete": task.is_complete()}) } if self.goal_id is not None: task_dict["goal_id"] = self.goal_id From 9e389bc74d0ba30d29629b529e6c46a0376f83e1 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:59:13 -0800 Subject: [PATCH 15/17] Update app/routes/goal_routes.py Co-authored-by: Ashley Yang --- app/routes/goal_routes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 6b34a6444..99dc5db40 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -14,8 +14,8 @@ def create_goal(): try: new_goal = Goal.from_dict(request_body) - except KeyError: - response = {"details": "Invalid data"} + except KeyError as error: + response = {"details": f"Invalid data - missing {error.args[0]}"} abort(make_response(response, 400)) db.session.add(new_goal) From 483bfeceddc1e5131a73e7a74515ef89105f3366 Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:59:36 -0800 Subject: [PATCH 16/17] Update app/models/task.py Co-authored-by: Ashley Yang --- app/models/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/task.py b/app/models/task.py index 1e8ad74f2..84ec70ed7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -10,7 +10,7 @@ class Task(db.Model): title: Mapped[str] = mapped_column(String, nullable=False) description: Mapped[str] completed_at: Mapped[Optional[datetime]] - goal_id: Mapped[Optional[int]] = db.Column(db.Integer, db.ForeignKey("goal.id")) + goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id")) goal: Mapped[Optional["Goal"]] = relationship("Goal", back_populates="tasks") def to_dict(self): From e41e51a98494eec3e2881633618baf9dbdb8045f Mon Sep 17 00:00:00 2001 From: nelasunitha <80846358+nelasunitha@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:00:39 -0800 Subject: [PATCH 17/17] Update app/routes/goal_routes.py Co-authored-by: Ashley Yang --- app/routes/goal_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 99dc5db40..f9b1bb567 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -100,7 +100,7 @@ def assign_tasks_to_goal(goal_id): request_body = request.get_json() task_ids = request_body.get("task_ids", []) - tasks = Task.query.filter(Task.id.in_(task_ids)).all() + tasks = [validate_model(Task, task_id) for task_id in task_ids] goal.tasks.extend(tasks) db.session.commit()