From 88a9a4665cb488e908e4484f2d74c39b38d666ac Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 4 May 2023 14:07:34 -0400 Subject: [PATCH 01/29] created Task model --- app/models/task.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..17f1531b1 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,3 +3,6 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime,nullable=True) From 7622bd3accb0773c7a325431732481ca57a1abc0 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 14:48:19 -0400 Subject: [PATCH 02/29] set up app --- app/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..90f13d662 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - + from .routes import tasks_bp + app.register_blueprint(tasks_bp) + return app From 86a87f72250af6df44207464123cb76cd4bf5d2c Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 14:48:35 -0400 Subject: [PATCH 03/29] created task model --- app/models/task.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/models/task.py b/app/models/task.py index 17f1531b1..51e07e57a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,3 +6,21 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime,nullable=True) + + def to_dict(self): + task_as_dict = {} + task_as_dict["id"] = self.task_id + task_as_dict["title"] = self.title + task_as_dict["description"] = self.description + task_as_dict["is_complete"] = bool(self.completed_at) + + return task_as_dict + + @classmethod + def from_dict(cls, task_data): + new_task = Task( + title = task_data["title"], + description = task_data["description"] + ) + + return new_task \ No newline at end of file From 5c6e3e7a9e705fd216d429ceca46b5540ee4cdbf Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 14:48:52 -0400 Subject: [PATCH 04/29] created routes for tasks --- app/routes.py | 105 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 3aae38d49..52561912d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,104 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, jsonify, abort, make_response, request +from app import db +from app.models.task import Task + +tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST"]) +def create_task(): + + request_body = request.get_json() + + + try: + new_task = Task(title=request_body["title"], + description=request_body["description"]) + + except: + abort(make_response({ + "details": "Invalid data" + }, 400)) + + db.session.add(new_task) + db.session.commit() + + + return make_response(jsonify({"task":{ + "id" : new_task.task_id, + "title" : new_task.title, + "description" : new_task.description, + "is_complete" : False + }}),201) + +@tasks_bp.route("", methods=["GET"]) +def get_tasks(): + sort_query = request.args.get("sort") + + if sort_query == "asc": + tasks = Task.query.order_by(Task.title.asc()).all() + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.all() + + tasks_response = [] + + for task in tasks: + tasks_response.append( + task.to_dict() + ) + + return jsonify(tasks_response) + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{model_id} is not valid type ({type(model_id)}) invalid. Please use integer."}, 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} does not exist"}, 404)) + + return model + +@tasks_bp.route("/", methods=["GET"]) +def get_one_task(task_id): + task = validate_model(Task, task_id) + + return {"task":task.to_dict()}, 200 + +@tasks_bp.route("/", methods=["PUT"]) +def update_one_task(task_id): + task = validate_model(Task, task_id) + + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return make_response(jsonify({"task":{ + "id" : task.task_id, + "title" : task.title, + "description" : task.description, + "is_complete" : False + }}),200) + +@tasks_bp.route("/mark_complete", methods=["PATCH"]) +def mark_complete(task_id): + + + +@tasks_bp.route("/", methods=["DELETE"]) +def remove_one_task(task_id): + task = validate_model(Task, task_id) + + db.session.delete(task) + db.session.commit() + + return make_response({ + "details": f'{Task.__name__} {task_id} "{task.title}" successfully deleted' + }), 200 \ No newline at end of file From 72c00ef25820b2be01263fd78eb2c32b1573947e Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 14:49:06 -0400 Subject: [PATCH 05/29] finished tests for wave 1 --- tests/test_wave_01.py | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..403d0b9b7 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,10 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":"Task 1 does not exist"} -@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={ @@ -131,13 +128,10 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":"Task 1 does not exist"} -@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") @@ -161,15 +155,12 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":"Task 1 does not exist"} 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 94bc32120eaee200f972bcb6be018fec3b1928b8 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 14:49:18 -0400 Subject: [PATCH 06/29] finished tests for wave 2 --- tests/test_wave_02.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From 4751c94c1db032147a1ca11763ae6618a29663d5 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 14:49:34 -0400 Subject: [PATCH 07/29] finished tests for wave 3 --- tests/test_wave_03.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..08a1436f9 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 """ @@ -24,7 +24,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): mock_get.return_value.status_code = 200 # Act - response = client.patch("/tasks/1/mark_complete") + response = client.patch("/tasks/1/mark_complete") response_body = response.get_json() # Assert @@ -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,10 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":"Task 1 does not exist"} -@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 +140,4 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == {"message":"Task 1 does not exist"} From 31f6ac00c875d7ca7261313f7a82d6828a4eda02 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 15:15:40 -0400 Subject: [PATCH 08/29] finished wave 3: added mark_complete and mark_incomplete endpoints --- app/routes.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/routes.py b/app/routes.py index 52561912d..129ba180e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, jsonify, abort, make_response, request from app import db from app.models.task import Task +from datetime import datetime tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks") @@ -90,7 +91,33 @@ def update_one_task(task_id): @tasks_bp.route("/mark_complete", methods=["PATCH"]) def mark_complete(task_id): + task = validate_model(Task, task_id) + + task.completed_at = datetime.utcnow() + + db.session.commit() + + return make_response(jsonify({"task":{ + "id" : task.task_id, + "title" : task.title, + "description" : task.description, + "is_complete" : bool(task.completed_at) + }}),200) + +@tasks_bp.route("/mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + task = validate_model(Task, task_id) + + task.completed_at = None + db.session.commit() + + return make_response(jsonify({"task":{ + "id" : task.task_id, + "title" : task.title, + "description" : task.description, + "is_complete" : bool(task.completed_at) + }}),200) @tasks_bp.route("/", methods=["DELETE"]) def remove_one_task(task_id): @@ -99,6 +126,8 @@ def remove_one_task(task_id): db.session.delete(task) db.session.commit() + + return make_response({ "details": f'{Task.__name__} {task_id} "{task.title}" successfully deleted' }), 200 \ No newline at end of file From 24d4469c5471bc68c3243d8b13c6c4e04f2d97e8 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Thu, 11 May 2023 15:15:50 -0400 Subject: [PATCH 09/29] migrations --- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/17e485e0eb65_.py | 39 +++++++++++ 5 files changed, 205 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 create mode 100644 migrations/versions/17e485e0eb65_.py diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# 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 + +[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 + +[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..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +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') + +# 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', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# 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 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=target_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.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/17e485e0eb65_.py b/migrations/versions/17e485e0eb65_.py new file mode 100644 index 000000000..15ab33e2b --- /dev/null +++ b/migrations/versions/17e485e0eb65_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 17e485e0eb65 +Revises: +Create Date: 2023-05-04 13:58:54.971543 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '17e485e0eb65' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_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 7adc19d14d4ca6c4eb6b29252eb508f1323c1a26 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 07:25:23 -0400 Subject: [PATCH 10/29] changed routes to goal and task routes --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 90f13d662..b9f256431 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import tasks_bp + from .task_routes import tasks_bp app.register_blueprint(tasks_bp) return app From 127279934671f097bc3947f8987e0a9305252e17 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 07:25:46 -0400 Subject: [PATCH 11/29] changed name --- app/routes.py | 133 -------------------------------------------------- 1 file changed, 133 deletions(-) delete mode 100644 app/routes.py diff --git a/app/routes.py b/app/routes.py deleted file mode 100644 index 129ba180e..000000000 --- a/app/routes.py +++ /dev/null @@ -1,133 +0,0 @@ -from flask import Blueprint, jsonify, abort, make_response, request -from app import db -from app.models.task import Task -from datetime import datetime - -tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks") - -@tasks_bp.route("", methods=["POST"]) -def create_task(): - - request_body = request.get_json() - - - try: - new_task = Task(title=request_body["title"], - description=request_body["description"]) - - except: - abort(make_response({ - "details": "Invalid data" - }, 400)) - - db.session.add(new_task) - db.session.commit() - - - return make_response(jsonify({"task":{ - "id" : new_task.task_id, - "title" : new_task.title, - "description" : new_task.description, - "is_complete" : False - }}),201) - -@tasks_bp.route("", methods=["GET"]) -def get_tasks(): - sort_query = request.args.get("sort") - - if sort_query == "asc": - tasks = Task.query.order_by(Task.title.asc()).all() - elif sort_query == "desc": - tasks = Task.query.order_by(Task.title.desc()).all() - else: - tasks = Task.query.all() - - tasks_response = [] - - for task in tasks: - tasks_response.append( - task.to_dict() - ) - - return jsonify(tasks_response) - -def validate_model(cls, model_id): - try: - model_id = int(model_id) - except: - abort(make_response({"message":f"{model_id} is not valid type ({type(model_id)}) invalid. Please use integer."}, 400)) - - model = cls.query.get(model_id) - - if not model: - abort(make_response({"message":f"{cls.__name__} {model_id} does not exist"}, 404)) - - return model - -@tasks_bp.route("/", methods=["GET"]) -def get_one_task(task_id): - task = validate_model(Task, task_id) - - return {"task":task.to_dict()}, 200 - -@tasks_bp.route("/", methods=["PUT"]) -def update_one_task(task_id): - task = validate_model(Task, task_id) - - request_body = request.get_json() - - task.title = request_body["title"] - task.description = request_body["description"] - - db.session.commit() - - return make_response(jsonify({"task":{ - "id" : task.task_id, - "title" : task.title, - "description" : task.description, - "is_complete" : False - }}),200) - -@tasks_bp.route("/mark_complete", methods=["PATCH"]) -def mark_complete(task_id): - - task = validate_model(Task, task_id) - - task.completed_at = datetime.utcnow() - - db.session.commit() - - return make_response(jsonify({"task":{ - "id" : task.task_id, - "title" : task.title, - "description" : task.description, - "is_complete" : bool(task.completed_at) - }}),200) - -@tasks_bp.route("/mark_incomplete", methods=["PATCH"]) -def mark_incomplete(task_id): - - task = validate_model(Task, task_id) - - task.completed_at = None - db.session.commit() - - return make_response(jsonify({"task":{ - "id" : task.task_id, - "title" : task.title, - "description" : task.description, - "is_complete" : bool(task.completed_at) - }}),200) - -@tasks_bp.route("/", methods=["DELETE"]) -def remove_one_task(task_id): - task = validate_model(Task, task_id) - - db.session.delete(task) - db.session.commit() - - - - return make_response({ - "details": f'{Task.__name__} {task_id} "{task.title}" successfully deleted' - }), 200 \ No newline at end of file From d00d80b479773201495845e676dd9d457a485bf2 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 07:26:20 -0400 Subject: [PATCH 12/29] added slack into requirements --- requirements.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/requirements.txt b/requirements.txt index 453f0ef6a..b42eb3e6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,19 @@ +aiohttp==3.8.4 +aiosignal==1.3.1 alembic==1.5.4 +async-timeout==4.0.2 attrs==20.3.0 autopep8==1.5.5 blinker==1.4 certifi==2020.12.5 chardet==4.0.0 +charset-normalizer==3.1.0 click==7.1.2 +coverage==7.2.5 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 +frozenlist==1.3.3 gunicorn==20.1.0 idna==2.10 iniconfig==1.1.1 @@ -15,6 +21,7 @@ itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +multidict==6.0.4 packaging==20.9 pluggy==0.13.1 psycopg2-binary==2.9.5 @@ -28,7 +35,12 @@ python-dotenv==0.15.0 python-editor==1.0.4 requests==2.25.1 six==1.15.0 +slack==0.0.2 +slack-sdk==3.21.3 +slackclient==2.9.4 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.5 Werkzeug==1.0.1 +yarl==1.9.2 From 56bc34ad7b1bb4fd05f054acb465441d4d92b00e Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 07:26:38 -0400 Subject: [PATCH 13/29] created file for goal routes --- app/goal_routes.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/goal_routes.py diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..e69de29bb From 550405672d478774616112e65de13efea235952e Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 07:27:01 -0400 Subject: [PATCH 14/29] changed name of routes to task_routes and added in slackbot info for wave 4 --- app/task_routes.py | 157 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 app/task_routes.py diff --git a/app/task_routes.py b/app/task_routes.py new file mode 100644 index 000000000..ad044bc95 --- /dev/null +++ b/app/task_routes.py @@ -0,0 +1,157 @@ +from flask import Blueprint, jsonify, abort, make_response, request +from app import db +from app.models.task import Task +from datetime import datetime +import requests +from dotenv import load_dotenv +import os +from slack_sdk import WebClient +from slack_sdk.errors import SlackApiError + +load_dotenv() + + +tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST"]) +def create_task(): + + request_body = request.get_json() + + + try: + new_task = Task(title=request_body["title"], + description=request_body["description"]) + + except: + abort(make_response({ + "details": "Invalid data" + }, 400)) + + db.session.add(new_task) + db.session.commit() + + + return make_response(jsonify({"task":{ + "id" : new_task.task_id, + "title" : new_task.title, + "description" : new_task.description, + "is_complete" : False + }}),201) + +@tasks_bp.route("", methods=["GET"]) +def get_tasks(): + sort_query = request.args.get("sort") + + if sort_query == "asc": + tasks = Task.query.order_by(Task.title.asc()).all() + elif sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.all() + + tasks_response = [] + + for task in tasks: + tasks_response.append( + task.to_dict() + ) + + return jsonify(tasks_response) + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{model_id} is not valid type ({type(model_id)}) invalid. Please use integer."}, 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} does not exist"}, 404)) + + return model + +@tasks_bp.route("/", methods=["GET"]) +def get_one_task(task_id): + task = validate_model(Task, task_id) + + return {"task":task.to_dict()}, 200 + +@tasks_bp.route("/", methods=["PUT"]) +def update_one_task(task_id): + task = validate_model(Task, task_id) + + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return make_response(jsonify({"task":{ + "id" : task.task_id, + "title" : task.title, + "description" : task.description, + "is_complete" : False + }}),200) + +def send_slack_message(task_title): + slack_token = os.environ.get(SLACK_API_KEY) + + client = WebClient(token=slack_token) + + try: + response = client.chat_postMessage( + channel="C057TBBCLQH", + text=f"Someone just completed the task {task_title}" + ) + except SlackApiError as e: + assert e.response["error"] + +@tasks_bp.route("/mark_complete", methods=["PATCH"]) +def mark_complete(task_id): + + task = validate_model(Task, task_id) + + send_slack_message(task.title) + + task.completed_at = datetime.utcnow() + + db.session.commit() + + return make_response(jsonify({"task":{ + "id" : task.task_id, + "title" : task.title, + "description" : task.description, + "is_complete" : bool(task.completed_at) + }}),200) + + +@tasks_bp.route("/mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + + task = validate_model(Task, task_id) + + task.completed_at = None + db.session.commit() + + return make_response(jsonify({"task":{ + "id" : task.task_id, + "title" : task.title, + "description" : task.description, + "is_complete" : bool(task.completed_at) + }}),200) + +@tasks_bp.route("/", methods=["DELETE"]) +def remove_one_task(task_id): + task = validate_model(Task, task_id) + + db.session.delete(task) + db.session.commit() + + + + return make_response({ + "details": f'{Task.__name__} {task_id} "{task.title}" successfully deleted' + }), 200 \ No newline at end of file From f1173053395dbdf0f471361453bc0855b0c0b46e Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 10:29:03 -0400 Subject: [PATCH 15/29] registered goals blueprint --- app/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index b9f256431..b8aba69ee 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -32,5 +32,8 @@ def create_app(test_config=None): # Register Blueprints here from .task_routes import tasks_bp app.register_blueprint(tasks_bp) + + from .goal_routes import goals_bp + app.register_blueprint(goals_bp) return app From 8184a2020286d40a72fd5e61509af4c98f7f2bbb Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 10:29:35 -0400 Subject: [PATCH 16/29] added GET, POST, PUT, DELETE endpoints for goal --- app/goal_routes.py | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/app/goal_routes.py b/app/goal_routes.py index e69de29bb..ad17a75ac 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -0,0 +1,86 @@ +from flask import Blueprint, jsonify, abort, make_response, request +from app import db +from app.models.task import Task +from app.models.goal import Goal +from .task_routes import validate_model +from datetime import datetime +import requests + +goals_bp = Blueprint("goals",__name__,url_prefix="/goals") + +@goals_bp.route("", methods=["POST"]) +def create_goal(): + + request_body = request.get_json() + + + try: + new_goal = Goal(title=request_body["title"]) + + except: + abort(make_response({ + "details": "Invalid data" + }, 400)) + + db.session.add(new_goal) + db.session.commit() + + + return make_response(jsonify({"goal":{ + "id" : new_goal.goal_id, + "title" : new_goal.title, + }}),201) + +@goals_bp.route("", methods=["GET"]) +def get_goals(): + + goals = Goal.query.all() + + goals_response = [] + + for goal in goals: + goals_response.append( + { + "id":goal.goal_id, + "title":goal.title + } + ) + + return jsonify(goals_response) + +@goals_bp.route("/", methods=["GET"]) +def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + + return {"goal":{ + "id": goal.goal_id, + "title" : goal.title + }}, 200 + +@goals_bp.route("/", methods=["PUT"]) +def update_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + + return make_response(jsonify({"goal":{ + "id" : goal.goal_id, + "title" : goal.title, + }}),200) + +@goals_bp.route("/", methods=["DELETE"]) +def remove_one_goal(goal_id): + goal = validate_model(Goal, goal_id) + + db.session.delete(goal) + db.session.commit() + + + + return make_response({ + "details": f'{Goal.__name__} {goal_id} "{goal.title}" successfully deleted' + }), 200 \ No newline at end of file From 64b7bccc61d1bd44839b8e57a2df7038641296f9 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 10:30:06 -0400 Subject: [PATCH 17/29] added title column to goal model --- app/models/goal.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..56e817cdc 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,5 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + From 9631d619ef7b4ba735c7545127a642b487d61e1e Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 10:31:23 -0400 Subject: [PATCH 18/29] added slack api to mark_complete --- app/task_routes.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/task_routes.py b/app/task_routes.py index ad044bc95..c7202a625 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -97,17 +97,20 @@ def update_one_task(task_id): }}),200) def send_slack_message(task_title): - slack_token = os.environ.get(SLACK_API_KEY) - - client = WebClient(token=slack_token) - try: - response = client.chat_postMessage( - channel="C057TBBCLQH", - text=f"Someone just completed the task {task_title}" - ) - except SlackApiError as e: - assert e.response["error"] + path = 'https://slack.com/api/chat.postMessage' + + slack_key = os.environ.get("SLACK_API_KEY") + + params = { + "channel":"general", + "text":f"Someone just completed the task {task_title}" + } + headers = { + "Authorization":slack_key + } + + requests.get(path, headers=headers, params=params) @tasks_bp.route("/mark_complete", methods=["PATCH"]) def mark_complete(task_id): From 818e0731c947997d498097791d7dc7cf0c438c76 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 10:31:41 -0400 Subject: [PATCH 19/29] completed and passed all tests --- tests/test_wave_05.py | 81 ++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..114591784 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") @@ -46,22 +46,20 @@ 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 does not exist"} -@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 +78,41 @@ 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 ---- + response = client.put("/goals/1", json={ + "title": "My Newer Goal" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "My Newer Goal" + } + } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # Act - # ---- Complete Act Here ---- + response = client.get("/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 response_body == {"message":"Goal 1 does not exist"} + -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -122,29 +127,25 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") - assert response.status_code == 404 + response_body = response.get_json() - 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":"Goal 1 does not exist"} -@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 response_body == {"message":"Goal 1 does not exist"} -@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 de9aead08f6e44bb0808d49da8f09c0811529ced Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 14:30:20 -0400 Subject: [PATCH 20/29] finished wave 6, adding nested routes --- app/goal_routes.py | 61 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index ad17a75ac..4d120f7a3 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -83,4 +83,63 @@ def remove_one_goal(goal_id): return make_response({ "details": f'{Goal.__name__} {goal_id} "{goal.title}" successfully deleted' - }), 200 \ No newline at end of file + }), 200 + +# nested routes +@goals_bp.route("//tasks", methods=["POST"]) +def create_tasks_for_goal(goal_id): + goal = validate_model(Goal, goal_id) + + request_body = request.get_json() + + tasks_list = [] + + for task in request_body["task_ids"]: + task = validate_model(Task, task) + tasks_list.append(task) + task.goal_id = goal.goal_id + + goal.tasks = tasks_list + + db.session.commit() + + return make_response(jsonify({ + "id" : goal.goal_id, + "task_ids" : request_body["task_ids"], + }),200) + +@goals_bp.route("//tasks", methods=["GET"]) +def get_tasks_for_goal(goal_id): + + goal = validate_model(Goal, goal_id) + + tasks_list = [] + + for task in goal.tasks: + tasks_list.append({ + "id" : task.task_id, + "goal_id" : task.goal_id, + "title" : task.title, + "description" : task.description, + "is_complete" : False + }) + + return { + "id": goal.goal_id, + "title" : goal.title, + "tasks" : tasks_list + }, 200 + +# @goals_bp.route("//tasks/", methods=["GET"]) +# def get_one_task_for_goal(goal_id,task_id): +# goal = validate_model(Goal, goal_id) +# task = validate_model(Task, task_id) +# return { +# "task": { +# "id": task.task_id, +# "goal_id": task.goal_id, +# "title": task.title, +# "description": task.description, +# "is_complete": False +# } +# } \ No newline at end of file From 3ec8f39043f0c4c94c68be46a4c9ec4519bac9fd Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 14:30:50 -0400 Subject: [PATCH 21/29] added tasks relationship --- app/models/goal.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/goal.py b/app/models/goal.py index 56e817cdc..d566b3f29 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,4 +4,5 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) - + tasks = db.relationship("Task", back_populates="goal",lazy=True) + From a4a9d2be741731346a58494527a588d50785647e Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 14:31:06 -0400 Subject: [PATCH 22/29] added goals relationship --- app/models/task.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/task.py b/app/models/task.py index 51e07e57a..4c26ea591 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,6 +6,8 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime,nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'),nullable=True) + goal = db.relationship("Goal", back_populates="tasks") def to_dict(self): task_as_dict = {} From 79d21581e37dd3a6e04aa6184c0b66fdb4794f22 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 14:31:33 -0400 Subject: [PATCH 23/29] updated GET endpoint to include book_id --- app/task_routes.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/task_routes.py b/app/task_routes.py index c7202a625..58c2d2528 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -1,14 +1,11 @@ from flask import Blueprint, jsonify, abort, make_response, request from app import db from app.models.task import Task +from app.models.goal import Goal from datetime import datetime import requests -from dotenv import load_dotenv import os -from slack_sdk import WebClient -from slack_sdk.errors import SlackApiError -load_dotenv() tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks") @@ -75,7 +72,16 @@ def validate_model(cls, model_id): @tasks_bp.route("/", methods=["GET"]) def get_one_task(task_id): task = validate_model(Task, task_id) - + if task.goal_id: + return { + "task": { + "id": task.task_id, + "goal_id": task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + } return {"task":task.to_dict()}, 200 @tasks_bp.route("/", methods=["PUT"]) @@ -86,7 +92,7 @@ def update_one_task(task_id): task.title = request_body["title"] task.description = request_body["description"] - + db.session.commit() return make_response(jsonify({"task":{ From dedf22ee2d4de1d6da9c7026bc64b78702fe318b Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 14:31:54 -0400 Subject: [PATCH 24/29] finished test wave 6 and passed all tests --- tests/test_wave_06.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..b1fd97637 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 does not exist"} - 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 e46607425ad685213a263e9c26163411604f9032 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Fri, 12 May 2023 14:32:24 -0400 Subject: [PATCH 25/29] updated tables --- ...created_relationship_between_tasks_and_.py | 30 +++++++++++++++++++ .../ca0052989b60_added_title_column.py | 28 +++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 migrations/versions/28bf1f697943_created_relationship_between_tasks_and_.py create mode 100644 migrations/versions/ca0052989b60_added_title_column.py diff --git a/migrations/versions/28bf1f697943_created_relationship_between_tasks_and_.py b/migrations/versions/28bf1f697943_created_relationship_between_tasks_and_.py new file mode 100644 index 000000000..11d4cd986 --- /dev/null +++ b/migrations/versions/28bf1f697943_created_relationship_between_tasks_and_.py @@ -0,0 +1,30 @@ +"""created relationship between tasks and goal + +Revision ID: 28bf1f697943 +Revises: ca0052989b60 +Create Date: 2023-05-12 10:52:32.389112 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '28bf1f697943' +down_revision = 'ca0052989b60' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/ca0052989b60_added_title_column.py b/migrations/versions/ca0052989b60_added_title_column.py new file mode 100644 index 000000000..d1fc57b74 --- /dev/null +++ b/migrations/versions/ca0052989b60_added_title_column.py @@ -0,0 +1,28 @@ +"""added title column + +Revision ID: ca0052989b60 +Revises: 17e485e0eb65 +Create Date: 2023-05-12 07:38:28.154727 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ca0052989b60' +down_revision = '17e485e0eb65' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### From b91bab447c0b7d8751f77d478b5fb73a3012e7ad Mon Sep 17 00:00:00 2001 From: maggie weir Date: Sat, 13 May 2023 12:17:36 -0400 Subject: [PATCH 26/29] refactored to add to_dict method in task class --- app/goal_routes.py | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 4d120f7a3..eade14adb 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -3,7 +3,6 @@ from app.models.task import Task from app.models.goal import Goal from .task_routes import validate_model -from datetime import datetime import requests goals_bp = Blueprint("goals",__name__,url_prefix="/goals") @@ -13,7 +12,6 @@ def create_goal(): request_body = request.get_json() - try: new_goal = Goal(title=request_body["title"]) @@ -25,7 +23,6 @@ def create_goal(): db.session.add(new_goal) db.session.commit() - return make_response(jsonify({"goal":{ "id" : new_goal.goal_id, "title" : new_goal.title, @@ -40,25 +37,21 @@ def get_goals(): for goal in goals: goals_response.append( - { - "id":goal.goal_id, - "title":goal.title - } + goal.to_dict() ) return jsonify(goals_response) @goals_bp.route("/", methods=["GET"]) def get_one_goal(goal_id): + goal = validate_model(Goal, goal_id) - return {"goal":{ - "id": goal.goal_id, - "title" : goal.title - }}, 200 + return {"goal":goal.to_dict()}, 200 @goals_bp.route("/", methods=["PUT"]) def update_one_goal(goal_id): + goal = validate_model(Goal, goal_id) request_body = request.get_json() @@ -67,20 +60,16 @@ def update_one_goal(goal_id): db.session.commit() - return make_response(jsonify({"goal":{ - "id" : goal.goal_id, - "title" : goal.title, - }}),200) + return make_response(jsonify({"goal":goal.to_dict()}),200) @goals_bp.route("/", methods=["DELETE"]) def remove_one_goal(goal_id): + goal = validate_model(Goal, goal_id) db.session.delete(goal) db.session.commit() - - return make_response({ "details": f'{Goal.__name__} {goal_id} "{goal.title}" successfully deleted' }), 200 @@ -88,6 +77,7 @@ def remove_one_goal(goal_id): # nested routes @goals_bp.route("//tasks", methods=["POST"]) def create_tasks_for_goal(goal_id): + goal = validate_model(Goal, goal_id) request_body = request.get_json() @@ -130,16 +120,3 @@ def get_tasks_for_goal(goal_id): "tasks" : tasks_list }, 200 -# @goals_bp.route("//tasks/", methods=["GET"]) -# def get_one_task_for_goal(goal_id,task_id): -# goal = validate_model(Goal, goal_id) -# task = validate_model(Task, task_id) -# return { -# "task": { -# "id": task.task_id, -# "goal_id": task.goal_id, -# "title": task.title, -# "description": task.description, -# "is_complete": False -# } -# } \ No newline at end of file From 29b0b0fc8668ceaf307958e5b18dd87ab7d560ac Mon Sep 17 00:00:00 2001 From: maggie weir Date: Sat, 13 May 2023 12:17:53 -0400 Subject: [PATCH 27/29] added to_dict method to class goal --- app/models/goal.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/goal.py b/app/models/goal.py index d566b3f29..725806cb3 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -6,3 +6,10 @@ class Goal(db.Model): title = db.Column(db.String) tasks = db.relationship("Task", back_populates="goal",lazy=True) + def to_dict(self): + goal_as_dict = {} + goal_as_dict["id"] = self.goal_id + goal_as_dict["title"] = self.title + + + return goal_as_dict \ No newline at end of file From 3418a8f6d6b5a976081529601ffdcece25baf114 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Sat, 13 May 2023 12:44:24 -0400 Subject: [PATCH 28/29] connected to render --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index b8aba69ee..01b2a30c5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,7 +16,7 @@ def create_app(test_config=None): if test_config is None: app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + "RENDER_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( From 0060bfbf709eee48d2982513666ed363e7ca3d48 Mon Sep 17 00:00:00 2001 From: maggie weir Date: Sat, 13 May 2023 12:44:38 -0400 Subject: [PATCH 29/29] connected to render --- app/task_routes.py | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/app/task_routes.py b/app/task_routes.py index 58c2d2528..2602be60e 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -6,8 +6,6 @@ import requests import os - - tasks_bp = Blueprint("tasks",__name__,url_prefix="/tasks") @tasks_bp.route("", methods=["POST"]) @@ -15,7 +13,6 @@ def create_task(): request_body = request.get_json() - try: new_task = Task(title=request_body["title"], description=request_body["description"]) @@ -28,16 +25,16 @@ def create_task(): db.session.add(new_task) db.session.commit() - return make_response(jsonify({"task":{ "id" : new_task.task_id, "title" : new_task.title, "description" : new_task.description, "is_complete" : False }}),201) - + @tasks_bp.route("", methods=["GET"]) def get_tasks(): + sort_query = request.args.get("sort") if sort_query == "asc": @@ -71,7 +68,9 @@ def validate_model(cls, model_id): @tasks_bp.route("/", methods=["GET"]) def get_one_task(task_id): + task = validate_model(Task, task_id) + if task.goal_id: return { "task": { @@ -82,6 +81,7 @@ def get_one_task(task_id): "is_complete": False } } + return {"task":task.to_dict()}, 200 @tasks_bp.route("/", methods=["PUT"]) @@ -95,12 +95,7 @@ def update_one_task(task_id): db.session.commit() - return make_response(jsonify({"task":{ - "id" : task.task_id, - "title" : task.title, - "description" : task.description, - "is_complete" : False - }}),200) + return make_response(jsonify({"task":task.to_dict()}),200) def send_slack_message(task_title): @@ -129,12 +124,7 @@ def mark_complete(task_id): db.session.commit() - return make_response(jsonify({"task":{ - "id" : task.task_id, - "title" : task.title, - "description" : task.description, - "is_complete" : bool(task.completed_at) - }}),200) + return make_response(jsonify({"task":task.to_dict()}),200) @tasks_bp.route("/mark_incomplete", methods=["PATCH"]) @@ -143,24 +133,19 @@ def mark_incomplete(task_id): task = validate_model(Task, task_id) task.completed_at = None + db.session.commit() - return make_response(jsonify({"task":{ - "id" : task.task_id, - "title" : task.title, - "description" : task.description, - "is_complete" : bool(task.completed_at) - }}),200) + return make_response(jsonify({"task":task.to_dict()}),200) @tasks_bp.route("/", methods=["DELETE"]) def remove_one_task(task_id): + task = validate_model(Task, task_id) db.session.delete(task) db.session.commit() - - return make_response({ "details": f'{Task.__name__} {task_id} "{task.title}" successfully deleted' }), 200 \ No newline at end of file