From 5106489c106521b15cc1c3a2c55be7fa59a98ba8 Mon Sep 17 00:00:00 2001 From: Aisha Date: Sun, 7 May 2023 13:50:56 -0500 Subject: [PATCH 01/14] wave 1 completed --- app/__init__.py | 2 + app/models/task.py | 23 +++++- app/routes.py | 113 ++++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++ migrations/env.py | 96 +++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/37cf689b0d6f_.py | 28 +++++++ migrations/versions/e0ce59f45958_.py | 39 +++++++++ tests/test_wave_01.py | 54 +++++++------ 10 files changed, 400 insertions(+), 25 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/37cf689b0d6f_.py create mode 100644 migrations/versions/e0ce59f45958_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..e253d096f 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 bp + app.register_blueprint(bp) return app diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..0ab6e375e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,26 @@ from app import db +# from collections import OrderedDict class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + 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) + is_complete = db.Column(db.Boolean, default=False) + + # @classmethod + # def from_dict(cls, data_dict): + # return cls( + # title=data_dict["title"], + # description=data_dict["description"], + # is_complete=data_dict["is_complete"] + # ) + + def to_dict(self): + return (dict( + id=self.id, + title=self.title, + description=self.description, + is_complete=self.is_complete + )) diff --git a/app/routes.py b/app/routes.py index 3aae38d49..aa8f4d295 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,112 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, make_response, jsonify, request, abort +from app.models.task import Task +from app import db + +bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +# def validate_request_body(request): finish later + + + +@bp.route("", methods=["GET"]) +def get_all_tasks(): + tasks = Task.query.all() + tasks_list = [] + for task in tasks: + tasks_list.append(task.to_dict()) + # tasks_list.append(task) + + # tasks_list.append(f"{ + # "id:" {task.id}"," + # "title:" {task.title}"," + # "description:" {task.description}", + # "completed_at:" {task.completed_at} + # }") + # tasks_list.append({ + # "id": task.id, + # "title": task.title, + # "description": task.description, + # "completed_at": task.completed_at + # }) + + return jsonify(tasks_list), 200 + + +@bp.route("", methods=["POST"]) +def create_task(): + request_body=request.get_json() + + if "title" not in request_body or not request_body["title"] or "description" not in request_body or not request_body["description"]: + abort(make_response({"details": "Invalid data"}, 400)) + else: + + is_complete = request_body.get("is_complete", False) #find a way to include this in model class + + + new_task = Task( + title=request_body["title"], + description=request_body["description"], + is_complete=is_complete + ) + + # new_task = Task.from_dict(request_body) + + db.session.add(new_task) + db.session.commit() + + return {"task": new_task.to_dict()}, 201 + + + +def validate_task(id): + try: + id = int(id) + except: + abort(make_response(f"Task number {id} not valid", 400)) + + task = Task.query.get(id) + + if not task: + abort(make_response(f"Task number {id} was not found", 404)) + + return task + + + +@bp.route("/", methods=["GET"]) +def get_one_task(id): + task = validate_task(id) + return {"task": task.to_dict()}, 200 + + +@bp.route("/", methods=["PUT"]) +def update_task(id): + task = validate_task(id) + request_body = request.get_json() + is_complete = request_body.get("is_complete", False) + + # is_complete = request_body.get("is_complete", False) + + # if request_body["is_complete"] == None: + # request_body["is_complete"] = False + + task.title = request_body["title"] + task.description = request_body["description"] + task.is_complete = is_complete + + db.session.commit() + + return {"task": task.to_dict()}, 200 + +@bp.route("/", methods=["DELETE"]) +def delete_task(id): + task = validate_task(id) + + db.session.delete(task) + db.session.commit() + + return {"details" : f'Task {id} "{task.title}" successfully deleted'}, 200 + + + + 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/37cf689b0d6f_.py b/migrations/versions/37cf689b0d6f_.py new file mode 100644 index 000000000..644be22c5 --- /dev/null +++ b/migrations/versions/37cf689b0d6f_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 37cf689b0d6f +Revises: e0ce59f45958 +Create Date: 2023-05-07 12:51:06.009927 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '37cf689b0d6f' +down_revision = 'e0ce59f45958' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### diff --git a/migrations/versions/e0ce59f45958_.py b/migrations/versions/e0ce59f45958_.py new file mode 100644 index 000000000..6bd5efff7 --- /dev/null +++ b/migrations/versions/e0ce59f45958_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: e0ce59f45958 +Revises: +Create Date: 2023-05-07 08:24:26.364902 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e0ce59f45958' +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('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('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..89b68af33 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,22 +51,26 @@ 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") response_body = response.get_json() + # response_body = response.get_data(as_text=True) this passes # Assert assert response.status_code == 404 + # assert response_body == {"Task number 1 was not found"} wont pass, find out why + assert response.get_data(as_text=True) == "Task number 1 was not found" - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") + +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +97,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 +123,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -130,14 +134,16 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 + assert response.get_data(as_text=True) == "Task number 1 was not found" + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -152,7 +158,7 @@ def test_delete_task(client, one_task): assert Task.query.get(1) == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -160,16 +166,18 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 + assert response.get_data(as_text=True) == "Task number 1 was not found" + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** 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 +194,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 eab781d02e1a1f377cceddef393edeb4f3f2b633 Mon Sep 17 00:00:00 2001 From: Aisha Date: Sun, 7 May 2023 14:17:08 -0500 Subject: [PATCH 02/14] wave 2 completed --- app/routes.py | 19 ++++++++++++++++++- tests/test_wave_02.py | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index aa8f4d295..6c9b5939f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,7 +10,24 @@ @bp.route("", methods=["GET"]) def get_all_tasks(): - tasks = Task.query.all() + # tasks = Task.query.all() + + + sorted_query = request.args.get("sort") + if sorted_query == "asc": + tasks = Task.query.order_by("title") + elif sorted_query == "desc": + tasks = Task.query.order_by(Task.title.desc()) + else: + tasks = Task.query.all + + # name_query = request.args.get("name") + # if name_query is None: + # planets = Planet.query.filter_by(name=name_query) + # else: + # planets = Planet.query.all() + + tasks_list = [] for task in tasks: tasks_list.append(task.to_dict()) 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 eb21778432e9bfd635746eb0408624cf9b012e87 Mon Sep 17 00:00:00 2001 From: Aisha Date: Sun, 7 May 2023 15:29:24 -0500 Subject: [PATCH 03/14] wave 3 completed --- app/routes.py | 36 +++++++++++++++++++++++++++++++++++- tests/test_wave_03.py | 32 ++++++++++++++++++-------------- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6c9b5939f..814276cbb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from flask import Blueprint, make_response, jsonify, request, abort from app.models.task import Task from app import db +from datetime import datetime bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -19,7 +20,7 @@ def get_all_tasks(): elif sorted_query == "desc": tasks = Task.query.order_by(Task.title.desc()) else: - tasks = Task.query.all + tasks = Task.query.all() # name_query = request.args.get("name") # if name_query is None: @@ -125,5 +126,38 @@ def delete_task(id): return {"details" : f'Task {id} "{task.title}" successfully deleted'}, 200 +@bp.route("//mark_complete", methods=["PATCH"]) +def complete_task(id): + task = validate_task(id) + # request_body = request.get_json() + + # if request_body is None: + # return {"details": "Invalid data"}, 400 + + # if "completed_at" in request_body: + if not task.completed_at: + task.completed_at = datetime.now() + task.is_complete = True + # else: + # return {"details": "Invalid data"}, 400 + + + db.session.commit() + return {"task": task.to_dict()}, 200 + + +@bp.route("//mark_incomplete", methods=["PATCH"]) +def incomplete_task(id): + task = validate_task(id) + # request_body = request.get_json() + + if task.completed_at: + task.completed_at = None + task.is_complete = False + + db.session.commit() + return {"task": task.to_dict()}, 200 + + diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..06be7211c 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +127,16 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 + assert response.get_data(as_text=True) == "Task number 1 was not found" - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") + +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +144,10 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 + assert response.get_data(as_text=True) == "Task number 1 was not found" + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** From 4989274f6e1a0e89c0c17211ef2cdc82c4ac35a3 Mon Sep 17 00:00:00 2001 From: Aisha Date: Wed, 10 May 2023 10:15:40 -0500 Subject: [PATCH 04/14] Updated model, removed is_complete --- app/models/task.py | 52 +++++++++++++++++++++++++++++++++------------- app/routes.py | 13 +++++++++--- 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 0ab6e375e..f6442ed47 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,25 +2,49 @@ # from collections import OrderedDict -class Task(db.Model): - 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) - is_complete = db.Column(db.Boolean, default=False) +# class Task(db.Model): +# 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) +# is_complete = db.Column(db.Boolean, default=False) + +# # @classmethod +# # def from_dict(cls, data_dict): +# # return cls( +# # title=data_dict["title"], +# # description=data_dict["description"], +# # is_complete=data_dict["is_complete"] +# # ) - # @classmethod - # def from_dict(cls, data_dict): - # return cls( - # title=data_dict["title"], - # description=data_dict["description"], - # is_complete=data_dict["is_complete"] - # ) +# def to_dict(self): +# return (dict( +# id=self.id, +# title=self.title, +# description=self.description, +# is_complete=self.is_complete +# )) +class Task(db.Model): + id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + completed_at = db.Column(db.DateTime, nullable=True) + def to_dict(self): - return (dict( + if not self.completed_at: + self.is_complete = False + return (dict( id=self.id, title=self.title, description=self.description, is_complete=self.is_complete )) + + @classmethod + def from_dict(cls, data_dict): + return cls( + title = data_dict["title"], + description = data_dict["description"], + is_complete = data_dict["completed_at"] + ) diff --git a/app/routes.py b/app/routes.py index 814276cbb..17ee03d72 100644 --- a/app/routes.py +++ b/app/routes.py @@ -58,13 +58,20 @@ def create_task(): abort(make_response({"details": "Invalid data"}, 400)) else: - is_complete = request_body.get("is_complete", False) #find a way to include this in model class + # is_complete = request_body.get("is_complete", False) #find a way to include this in model class + # if "completed_at" not in request_body or not request_body["completed_at"]: + # # request_body["is_complete"] = True + # is_complete = False + # else: + # # request_body["is_complete"] = False + # is_complete = True + new_task = Task( title=request_body["title"], - description=request_body["description"], - is_complete=is_complete + description=request_body["description"] + # is_complete=is_complete '''this commented out made it work ) # new_task = Task.from_dict(request_body) From 3147193eba311400e1eae180a638cc47b244608d Mon Sep 17 00:00:00 2001 From: Aisha Date: Wed, 10 May 2023 16:44:28 -0500 Subject: [PATCH 05/14] wave 4 completed --- app/routes.py | 39 +++++++++++++++++++++++++++ app/slack_post_test.py | 27 +++++++++++++++++++ migrations/versions/b39f32297bcb_.py | 40 ++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 app/slack_post_test.py create mode 100644 migrations/versions/b39f32297bcb_.py diff --git a/app/routes.py b/app/routes.py index 17ee03d72..d4a06e6e2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,12 @@ from app.models.task import Task from app import db from datetime import datetime +import requests +# from slack_sdk import WebClient +# from slack_sdk.errors import SlackApiError + +# client = WebClient(token=os.environ.get("SLACK_BOT_TOKEN")) +# logger = logging.getLogger(__name__) bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -148,6 +154,39 @@ def complete_task(id): # else: # return {"details": "Invalid data"}, 400 + PATH = "https://slack.com/api/chat.postMessage" + + Authorization = "Bearer xoxb-5242678399683-5266537240624-SzcfKHmF2xZaq407bmmGcsdL" + + headers = { + "Authorization": Authorization, + "format": "json" + } + + body = { + "channel": "task-notifications", + "text": "Hello, World!", + } + requests.post(PATH, headers=headers, json=body) + # response = requests.post(PATH, headers=headers, json=body) + + + # # return response.json() + # response_data = response.json() + # print("Response data:", response_data) + + #channel_id = "C12345" + + # try: + # # Call the chat.postMessage method using the WebClient + # result = client.chat_postMessage( + # channel=channel_id, + # text="Hello world" + # ) + # logger.info(result) + + # except SlackApiError as e: + # logger.error(f"Error posting message: {e}") db.session.commit() return {"task": task.to_dict()}, 200 diff --git a/app/slack_post_test.py b/app/slack_post_test.py new file mode 100644 index 000000000..37fe3fcad --- /dev/null +++ b/app/slack_post_test.py @@ -0,0 +1,27 @@ +import requests +import time +import json + +PATH = "https://slack.com/api/chat.postMessage" + +Authorization = "Bearer xoxb-5242678399683-5266537240624-SzcfKHmF2xZaq407bmmGcsdL" + +# seven_wonders = ["Great Wall of China","Petra", "Colosseum", "Chichen Itza", "Machu Picchu", "Taj Mahal", "Christ the Redeemer"] + +headers = { + "Authorization": Authorization, + "format": "json" + } + +body = { + "channel": "task-notifications", + "text": "Hello, World!", + } + + +requests.post(PATH, headers=headers, json=body) +# response_data = response.json() + + + +# print("Response data:", response_data) diff --git a/migrations/versions/b39f32297bcb_.py b/migrations/versions/b39f32297bcb_.py new file mode 100644 index 000000000..5438c6f74 --- /dev/null +++ b/migrations/versions/b39f32297bcb_.py @@ -0,0 +1,40 @@ +"""empty message + +Revision ID: b39f32297bcb +Revises: 37cf689b0d6f +Create Date: 2023-05-10 16:08:31.598150 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b39f32297bcb' +down_revision = '37cf689b0d6f' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=False) + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=True) + # ### end Alembic commands ### From 0c0cb3558f88c230ec75d058994b7ed5bab43861 Mon Sep 17 00:00:00 2001 From: Aisha Date: Thu, 11 May 2023 16:11:17 -0500 Subject: [PATCH 06/14] wave 6 completed --- app/__init__.py | 8 +- app/models/goal.py | 24 +++- app/models/task.py | 19 ++- app/routes/goal_routes.py | 127 ++++++++++++++++++ app/{routes.py => routes/task_routes.py} | 18 ++- .../{e0ce59f45958_.py => a12b01e09ed7_.py} | 17 +-- migrations/versions/b39f32297bcb_.py | 40 ------ .../{37cf689b0d6f_.py => cfe5d03c4a36_.py} | 16 ++- tests/test_wave_05.py | 74 +++++++--- tests/test_wave_06.py | 24 ++-- 10 files changed, 271 insertions(+), 96 deletions(-) create mode 100644 app/routes/goal_routes.py rename app/{routes.py => routes/task_routes.py} (94%) rename migrations/versions/{e0ce59f45958_.py => a12b01e09ed7_.py} (59%) delete mode 100644 migrations/versions/b39f32297bcb_.py rename migrations/versions/{37cf689b0d6f_.py => cfe5d03c4a36_.py} (50%) diff --git a/app/__init__.py b/app/__init__.py index e253d096f..8d575a7ac 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,7 +30,13 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import bp + from .routes.task_routes import bp app.register_blueprint(bp) + from .routes.goal_routes import bp + app.register_blueprint(bp) + # db.create_all() + + + return app diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..a43591d1b 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,27 @@ from app import db +# from .goal import Goal class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String, nullable=False) + tasks = db.relationship("Task", back_populates="goal", lazy=True) + + def to_dict(self): + return (dict( + id=self.id, + title=self.title + )) + + # def to_dict_with_tasks(goal, self): + # # tasks_list = [] + # # for task in goal.tasks: + # # tasks_list.append(task.to_dict()) + + # # goal.tasks = tasks_list + + # return dict( + # id=self.id, + # title=self.title + # tasks=Goal.tasks + # ) diff --git a/app/models/task.py b/app/models/task.py index f6442ed47..8774e5118 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -26,11 +26,23 @@ # )) class Task(db.Model): - id = db.Column(db.Integer, primary_key=True) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) + goal = db.relationship("Goal", back_populates="tasks") + goal_id = db.Column(db.Integer, db.ForeignKey("goal.id")) + def to_dict_with_goal(self): + if not self.completed_at: + self.is_complete = False + return (dict( + id=self.id, + title=self.title, + description=self.description, + is_complete=self.is_complete, + goal_id=self.goal_id + )) def to_dict(self): if not self.completed_at: self.is_complete = False @@ -38,9 +50,12 @@ def to_dict(self): id=self.id, title=self.title, description=self.description, - is_complete=self.is_complete + is_complete=self.is_complete, )) + + # db.create_all() + @classmethod def from_dict(cls, data_dict): return cls( diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py new file mode 100644 index 000000000..82aa34c2e --- /dev/null +++ b/app/routes/goal_routes.py @@ -0,0 +1,127 @@ +from flask import Blueprint, make_response, jsonify, request, abort +from app.models.task import Task +from app.models.goal import Goal + +from app import db + +bp = Blueprint("goals", __name__, url_prefix="/goals") + +#get goals, get +@bp.route("",methods=["GET"]) +def get_all_goals(): + goals = Goal.query.all() + goals_list = [] + for goal in goals: + goals_list.append(goal.to_dict()) + + return jsonify(goals_list), 200 + +#create a goal, post +@bp.route("", methods=["POST"]) +def create_a_goal(): + request_body = request.get_json() + if "title" not in request_body or not request_body["title"]: + abort(make_response({"details": "Invalid data"}, 400)) + new_goal = Goal( + title=request_body["title"] + ) + db.session.add(new_goal) + db.session.commit() + + return {"goal": new_goal.to_dict()}, 201 + +def validate_goal(id): + try: + id = int(id) + except: + abort(make_response({"details":f"Goal number {id} not valid"}, 400)) + + goal = Goal.query.get(id) + + if not goal: + abort(make_response({"details": f"Goal number {id} was not found"}, 404)) + # abort(make_response(jsonify(f"Goal number {id} was not found"), 404)) #returns a string + + + return goal +#get one goal, get +@bp.route("/", methods=["GET"]) +def get_one_goal(id): + goal = validate_goal(id) + + # goal = Goal.query.get(id=id) + + return {"goal": goal.to_dict()}, 200 + +#update a goal, put +@bp.route("/", methods=["PUT"]) +def update_a_goal(id): + goal = validate_goal(id) + request_body = request.get_json() + + goal.title = request_body["title"] + + db.session.commit() + + return {"goal": goal.to_dict()}, 200 + +#delte a goal, detelte +@bp.route("/", methods=["DELETE"]) +def delete_a_goal(id): + goal = validate_goal(id) + db.session.delete(goal) + db.session.commit() + return make_response({'details': f'Goal {goal.id} "{goal.title}" successfully deleted'}), 200 + +@bp.route("//tasks", methods=["GET"]) +def get_all_tasks_for_one_goal(id): + goal = validate_goal(id) + + tasks_list = [] + for task in goal.tasks: + if not task.completed_at: + task.is_complete = False + task = (dict( + id=task.id, + title=task.title, + description=task.description, + is_complete=task.is_complete, + goal_id=goal.id + )) + # task = { + # "id":task.id, + # "title":task.title, + # "description":task.description, + # "is_complete":task.is_complete, + # "goal_id":goal.id + # } + tasks_list.append(task) + + # goal.tasks = tasks_list + + # return {goal.to_dict()}, 200 + return {"id": goal.id, "title": goal.title, "tasks": tasks_list}, 200 + + +@bp.route("//tasks", methods=["POST"]) +def post_task_ids_to_goal(id): + goal = validate_goal(id) + request_body = request.get_json() + if "task_ids" not in request_body: + abort(make_response({"details": "Invalid data"}, 400)) + # new_task = Task( + # title=request_body["title"], + # description=request_body["description"] + # ) + # new_task = Task.from_dict(request_body,goal) + task_ids = request_body["task_ids"] + tasks_list = [] + for task_id in task_ids: + tasks_list.append(Task.query.get(task_id)) + goal.tasks = tasks_list + + # db.session.add(new_task) + db.session.commit() + + # return {"task": new_task.to_dict()}, 201 + return {"id": goal.id, "task_ids": task_ids}, 200 \ No newline at end of file diff --git a/app/routes.py b/app/routes/task_routes.py similarity index 94% rename from app/routes.py rename to app/routes/task_routes.py index d4a06e6e2..cd0dca41f 100644 --- a/app/routes.py +++ b/app/routes/task_routes.py @@ -89,7 +89,7 @@ def create_task(): -def validate_task(id): +def validate_goal(id): try: id = int(id) except: @@ -106,13 +106,15 @@ def validate_task(id): @bp.route("/", methods=["GET"]) def get_one_task(id): - task = validate_task(id) + task = validate_goal(id) + if task.goal_id: + return {"task": task.to_dict_with_goal()}, 200 return {"task": task.to_dict()}, 200 @bp.route("/", methods=["PUT"]) def update_task(id): - task = validate_task(id) + task = validate_goal(id) request_body = request.get_json() is_complete = request_body.get("is_complete", False) @@ -131,7 +133,7 @@ def update_task(id): @bp.route("/", methods=["DELETE"]) def delete_task(id): - task = validate_task(id) + task = validate_goal(id) db.session.delete(task) db.session.commit() @@ -141,7 +143,7 @@ def delete_task(id): @bp.route("//mark_complete", methods=["PATCH"]) def complete_task(id): - task = validate_task(id) + task = validate_goal(id) # request_body = request.get_json() # if request_body is None: @@ -158,6 +160,8 @@ def complete_task(id): Authorization = "Bearer xoxb-5242678399683-5266537240624-SzcfKHmF2xZaq407bmmGcsdL" + text = f"Someone just completed the task {task.title}" + headers = { "Authorization": Authorization, "format": "json" @@ -165,7 +169,7 @@ def complete_task(id): body = { "channel": "task-notifications", - "text": "Hello, World!", + "text": text, } requests.post(PATH, headers=headers, json=body) # response = requests.post(PATH, headers=headers, json=body) @@ -194,7 +198,7 @@ def complete_task(id): @bp.route("//mark_incomplete", methods=["PATCH"]) def incomplete_task(id): - task = validate_task(id) + task = validate_goal(id) # request_body = request.get_json() if task.completed_at: diff --git a/migrations/versions/e0ce59f45958_.py b/migrations/versions/a12b01e09ed7_.py similarity index 59% rename from migrations/versions/e0ce59f45958_.py rename to migrations/versions/a12b01e09ed7_.py index 6bd5efff7..9c8a8ce33 100644 --- a/migrations/versions/e0ce59f45958_.py +++ b/migrations/versions/a12b01e09ed7_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: e0ce59f45958 +Revision ID: a12b01e09ed7 Revises: -Create Date: 2023-05-07 08:24:26.364902 +Create Date: 2023-05-11 12:26:17.663732 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'e0ce59f45958' +revision = 'a12b01e09ed7' down_revision = None branch_labels = None depends_on = None @@ -19,13 +19,14 @@ 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') + 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(), nullable=False), - sa.Column('title', sa.String(), nullable=True), - sa.Column('description', sa.String(), nullable=True), + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), sa.Column('completed_at', sa.DateTime(), nullable=True), sa.PrimaryKeyConstraint('id') ) diff --git a/migrations/versions/b39f32297bcb_.py b/migrations/versions/b39f32297bcb_.py deleted file mode 100644 index 5438c6f74..000000000 --- a/migrations/versions/b39f32297bcb_.py +++ /dev/null @@ -1,40 +0,0 @@ -"""empty message - -Revision ID: b39f32297bcb -Revises: 37cf689b0d6f -Create Date: 2023-05-10 16:08:31.598150 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'b39f32297bcb' -down_revision = '37cf689b0d6f' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column('task', 'description', - existing_type=sa.VARCHAR(), - nullable=False) - op.alter_column('task', 'title', - existing_type=sa.VARCHAR(), - nullable=False) - op.drop_column('task', 'is_complete') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True)) - op.alter_column('task', 'title', - existing_type=sa.VARCHAR(), - nullable=True) - op.alter_column('task', 'description', - existing_type=sa.VARCHAR(), - nullable=True) - # ### end Alembic commands ### diff --git a/migrations/versions/37cf689b0d6f_.py b/migrations/versions/cfe5d03c4a36_.py similarity index 50% rename from migrations/versions/37cf689b0d6f_.py rename to migrations/versions/cfe5d03c4a36_.py index 644be22c5..6dbf39430 100644 --- a/migrations/versions/37cf689b0d6f_.py +++ b/migrations/versions/cfe5d03c4a36_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 37cf689b0d6f -Revises: e0ce59f45958 -Create Date: 2023-05-07 12:51:06.009927 +Revision ID: cfe5d03c4a36 +Revises: a12b01e09ed7 +Create Date: 2023-05-11 12:26:43.698200 """ from alembic import op @@ -10,19 +10,21 @@ # revision identifiers, used by Alembic. -revision = '37cf689b0d6f' -down_revision = 'e0ce59f45958' +revision = 'cfe5d03c4a36' +down_revision = 'a12b01e09ed7' branch_labels = None depends_on = None def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['id']) # ### end Alembic commands ### def downgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'is_complete') + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') # ### end Alembic commands ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..626559963 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,27 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # raise Exception("Complete test") # Assert # ---- Complete Test ---- # assertion 1 goes here + assert response.status_code == 404 # assertion 2 goes here + # assert response.get_data(as_text=True) == "Goal number 1 was not found" + assert response_body == { + "details" : "Goal number 1 was not found" + } # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +85,50 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + respone = client.put("/goals/1", json={ + "title": "My Updated Goal" + }) + respone_body = respone.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert respone.status_code == 200 # assertion 2 goes here + assert "goal" in respone_body # assertion 3 goes here + assert respone_body == { + "goal":{ + "id":1, + "title": "My Updated Goal" + } + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + respone = client.put("/goals/1") + respone_body = respone.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here + assert respone.status_code == 404 # assertion 2 goes here + assert respone_body == { + "details" : "Goal number 1 was not found" + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -123,28 +144,41 @@ 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() + # assert response.get_data(as_text=True) == 'Goal number 1 was not found' + assert response_body == { + "details" : "Goal number 1 was not found" + } + # assert response_body == "Goal number 1 was not found" #with jsonify + - raise Exception("Complete test with assertion about response body") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** -@pytest.mark.skip(reason="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 + assert response.status_code == 404 # assertion 2 goes here + assert response_body == { + "details" : "Goal number 1 was not found" + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..3746f5227 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,17 @@ 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") - # ***************************************************************** - # **Complete test with assertion about response body*************** - # ***************************************************************** + assert response_body == { + "details" : "Goal number 1 was not found" + } + + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** + # # **Complete test with assertion about response body*************** + # # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +78,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 +103,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 1915780d75ae692c1454e77a66892908c6b83408 Mon Sep 17 00:00:00 2001 From: Aisha Date: Thu, 11 May 2023 17:02:46 -0500 Subject: [PATCH 07/14] changes for wave 7 --- app/__init__.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 8d575a7ac..8f6354c61 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,13 +14,15 @@ def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - if test_config is None: - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") - else: - app.config["TESTING"] = True - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + # if test_config is None: + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_DATABASE_URI") + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "RENDER_DATABASE_URI") + # else: + # app.config["TESTING"] = True + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task From 448ee876bd6bea023dce281c8eb6f0678bebdaa8 Mon Sep 17 00:00:00 2001 From: Aisha Date: Thu, 11 May 2023 17:18:05 -0500 Subject: [PATCH 08/14] changes for wave 7 --- app/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 8f6354c61..f46e4a101 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -20,9 +20,10 @@ def create_app(test_config=None): app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( "RENDER_DATABASE_URI") # else: - # app.config["TESTING"] = True - # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - # "SQLALCHEMY_TEST_DATABASE_URI") + if test_config: + app.config["TESTING"] = True + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task From 9a752c9c44aa43efd6f312d5c923c8a3671f0e57 Mon Sep 17 00:00:00 2001 From: Aisha Date: Thu, 11 May 2023 17:22:15 -0500 Subject: [PATCH 09/14] changes for wave 7 --- app/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index f46e4a101..5ce2c2de4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -17,13 +17,13 @@ def create_app(test_config=None): # if test_config is None: # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( # "SQLALCHEMY_DATABASE_URI") - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( - "RENDER_DATABASE_URI") - # else: if test_config: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "RENDER_DATABASE_URI") + # else: # Import models here for Alembic setup from app.models.task import Task From f448dc25907beeee208ce8048f7d2776439031c6 Mon Sep 17 00:00:00 2001 From: Aisha Date: Thu, 11 May 2023 17:33:30 -0500 Subject: [PATCH 10/14] changes for wave 7 --- app/__init__.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 5ce2c2de4..cf6f046f3 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,16 +14,15 @@ def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - # if test_config is None: + if test_config is None: # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( # "SQLALCHEMY_DATABASE_URI") - if test_config: + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "RENDER_DATABASE_URI") + elif test_config: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( - "RENDER_DATABASE_URI") - # else: # Import models here for Alembic setup from app.models.task import Task From 3ceee95e4be82a784bd787a97748f3f1747b773d Mon Sep 17 00:00:00 2001 From: Aisha Date: Fri, 12 May 2023 09:14:26 -0500 Subject: [PATCH 11/14] refactored, all tests pass --- app/__init__.py | 19 +++-- app/models/goal.py | 13 ---- app/models/task.py | 28 ------- app/routes/goal_routes.py | 77 ++++++------------- app/routes/route_helpers.py | 17 +++++ app/routes/task_routes.py | 142 ++++++------------------------------ app/slack_post_test.py | 27 ------- tests/test_wave_01.py | 15 ++-- tests/test_wave_03.py | 10 ++- tests/test_wave_05.py | 10 +-- 10 files changed, 91 insertions(+), 267 deletions(-) create mode 100644 app/routes/route_helpers.py delete mode 100644 app/slack_post_test.py diff --git a/app/__init__.py b/app/__init__.py index cf6f046f3..256d0786a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,15 +14,16 @@ def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - if test_config is None: + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "RENDER_DATABASE_URI") + + # if test_config is None: + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_DATABASE_URI") + # else: + # app.config["TESTING"] = True # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - # "SQLALCHEMY_DATABASE_URI") - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( - "RENDER_DATABASE_URI") - elif test_config: - app.config["TESTING"] = True - app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - "SQLALCHEMY_TEST_DATABASE_URI") + # "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task @@ -39,6 +40,4 @@ def create_app(test_config=None): app.register_blueprint(bp) # db.create_all() - - return app diff --git a/app/models/goal.py b/app/models/goal.py index a43591d1b..9dc2bfcf8 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,4 @@ from app import db -# from .goal import Goal - class Goal(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) @@ -13,15 +11,4 @@ def to_dict(self): title=self.title )) - # def to_dict_with_tasks(goal, self): - # # tasks_list = [] - # # for task in goal.tasks: - # # tasks_list.append(task.to_dict()) - - # # goal.tasks = tasks_list - # return dict( - # id=self.id, - # title=self.title - # tasks=Goal.tasks - # ) diff --git a/app/models/task.py b/app/models/task.py index 8774e5118..9e3f8d0d7 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,29 +1,4 @@ from app import db -# from collections import OrderedDict - - -# class Task(db.Model): -# 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) -# is_complete = db.Column(db.Boolean, default=False) - -# # @classmethod -# # def from_dict(cls, data_dict): -# # return cls( -# # title=data_dict["title"], -# # description=data_dict["description"], -# # is_complete=data_dict["is_complete"] -# # ) - -# def to_dict(self): -# return (dict( -# id=self.id, -# title=self.title, -# description=self.description, -# is_complete=self.is_complete -# )) class Task(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) @@ -52,9 +27,6 @@ def to_dict(self): description=self.description, is_complete=self.is_complete, )) - - - # db.create_all() @classmethod def from_dict(cls, data_dict): diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 82aa34c2e..25dcb3d38 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -1,22 +1,22 @@ from flask import Blueprint, make_response, jsonify, request, abort from app.models.task import Task from app.models.goal import Goal - from app import db +from .route_helpers import validate_model bp = Blueprint("goals", __name__, url_prefix="/goals") -#get goals, get -@bp.route("",methods=["GET"]) + +@bp.route("", methods=["GET"]) def get_all_goals(): goals = Goal.query.all() goals_list = [] for goal in goals: goals_list.append(goal.to_dict()) - + return jsonify(goals_list), 200 -#create a goal, post + @bp.route("", methods=["POST"]) def create_a_goal(): request_body = request.get_json() @@ -27,36 +27,20 @@ def create_a_goal(): ) db.session.add(new_goal) db.session.commit() - + return {"goal": new_goal.to_dict()}, 201 -def validate_goal(id): - try: - id = int(id) - except: - abort(make_response({"details":f"Goal number {id} not valid"}, 400)) - - goal = Goal.query.get(id) - - if not goal: - abort(make_response({"details": f"Goal number {id} was not found"}, 404)) - # abort(make_response(jsonify(f"Goal number {id} was not found"), 404)) #returns a string - - - return goal -#get one goal, get + @bp.route("/", methods=["GET"]) def get_one_goal(id): - goal = validate_goal(id) - - # goal = Goal.query.get(id=id) + goal = validate_model(Goal, id) return {"goal": goal.to_dict()}, 200 -#update a goal, put + @bp.route("/", methods=["PUT"]) def update_a_goal(id): - goal = validate_goal(id) + goal = validate_model(Goal, id) request_body = request.get_json() goal.title = request_body["title"] @@ -65,55 +49,43 @@ def update_a_goal(id): return {"goal": goal.to_dict()}, 200 -#delte a goal, detelte + @bp.route("/", methods=["DELETE"]) def delete_a_goal(id): - goal = validate_goal(id) + goal = validate_model(Goal, id) db.session.delete(goal) db.session.commit() return make_response({'details': f'Goal {goal.id} "{goal.title}" successfully deleted'}), 200 + @bp.route("//tasks", methods=["GET"]) def get_all_tasks_for_one_goal(id): - goal = validate_goal(id) + goal = validate_model(Goal, id) tasks_list = [] for task in goal.tasks: if not task.completed_at: task.is_complete = False task = (dict( - id=task.id, - title=task.title, - description=task.description, - is_complete=task.is_complete, - goal_id=goal.id - )) - # task = { - # "id":task.id, - # "title":task.title, - # "description":task.description, - # "is_complete":task.is_complete, - # "goal_id":goal.id - # } - tasks_list.append(task) + id=task.id, + title=task.title, + description=task.description, + is_complete=task.is_complete, + goal_id=goal.id + )) - # goal.tasks = tasks_list + tasks_list.append(task) - # return {goal.to_dict()}, 200 return {"id": goal.id, "title": goal.title, "tasks": tasks_list}, 200 @bp.route("//tasks", methods=["POST"]) def post_task_ids_to_goal(id): - goal = validate_goal(id) + goal = validate_model(Goal, id) request_body = request.get_json() if "task_ids" not in request_body: abort(make_response({"details": "Invalid data"}, 400)) - # new_task = Task( - # title=request_body["title"], - # description=request_body["description"] - # ) - # new_task = Task.from_dict(request_body,goal) + task_ids = request_body["task_ids"] tasks_list = [] for task_id in task_ids: @@ -123,5 +95,4 @@ def post_task_ids_to_goal(id): # db.session.add(new_task) db.session.commit() - # return {"task": new_task.to_dict()}, 201 - return {"id": goal.id, "task_ids": task_ids}, 200 \ No newline at end of file + return {"id": goal.id, "task_ids": task_ids}, 200 diff --git a/app/routes/route_helpers.py b/app/routes/route_helpers.py new file mode 100644 index 000000000..7a5414bc5 --- /dev/null +++ b/app/routes/route_helpers.py @@ -0,0 +1,17 @@ +from flask import abort, make_response + + +def validate_model(cls, id): + try: + id = int(id) + except: + abort(make_response( + {"details": f"{cls.__name__} number {id} not valid"}, 400)) + + model = cls.query.get(id) + + if not model: + abort(make_response( + {"details": f"{cls.__name__} number {id} was not found"}, 404)) + + return model diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index cd0dca41f..dd39a167a 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -3,23 +3,13 @@ from app import db from datetime import datetime import requests -# from slack_sdk import WebClient -# from slack_sdk.errors import SlackApiError - -# client = WebClient(token=os.environ.get("SLACK_BOT_TOKEN")) -# logger = logging.getLogger(__name__) +from .route_helpers import validate_model bp = Blueprint("tasks", __name__, url_prefix="/tasks") -# def validate_request_body(request): finish later - - @bp.route("", methods=["GET"]) def get_all_tasks(): - # tasks = Task.query.all() - - sorted_query = request.args.get("sort") if sorted_query == "asc": tasks = Task.query.order_by("title") @@ -28,85 +18,34 @@ def get_all_tasks(): else: tasks = Task.query.all() - # name_query = request.args.get("name") - # if name_query is None: - # planets = Planet.query.filter_by(name=name_query) - # else: - # planets = Planet.query.all() - - tasks_list = [] for task in tasks: - tasks_list.append(task.to_dict()) - # tasks_list.append(task) - - # tasks_list.append(f"{ - # "id:" {task.id}"," - # "title:" {task.title}"," - # "description:" {task.description}", - # "completed_at:" {task.completed_at} - # }") - # tasks_list.append({ - # "id": task.id, - # "title": task.title, - # "description": task.description, - # "completed_at": task.completed_at - # }) - + tasks_list.append(task.to_dict()) + return jsonify(tasks_list), 200 @bp.route("", methods=["POST"]) def create_task(): - request_body=request.get_json() - + request_body = request.get_json() + if "title" not in request_body or not request_body["title"] or "description" not in request_body or not request_body["description"]: abort(make_response({"details": "Invalid data"}, 400)) - else: - - # is_complete = request_body.get("is_complete", False) #find a way to include this in model class - # if "completed_at" not in request_body or not request_body["completed_at"]: - # # request_body["is_complete"] = True - # is_complete = False - # else: - # # request_body["is_complete"] = False - # is_complete = True - - - - new_task = Task( - title=request_body["title"], - description=request_body["description"] - # is_complete=is_complete '''this commented out made it work - ) - # new_task = Task.from_dict(request_body) - - db.session.add(new_task) - db.session.commit() - - return {"task": new_task.to_dict()}, 201 + new_task = Task( + title=request_body["title"], + description=request_body["description"] + ) + db.session.add(new_task) + db.session.commit() - -def validate_goal(id): - try: - id = int(id) - except: - abort(make_response(f"Task number {id} not valid", 400)) - - task = Task.query.get(id) - - if not task: - abort(make_response(f"Task number {id} was not found", 404)) - - return task - + return {"task": new_task.to_dict()}, 201 @bp.route("/", methods=["GET"]) def get_one_task(id): - task = validate_goal(id) + task = validate_model(Task, id) if task.goal_id: return {"task": task.to_dict_with_goal()}, 200 return {"task": task.to_dict()}, 200 @@ -114,52 +53,39 @@ def get_one_task(id): @bp.route("/", methods=["PUT"]) def update_task(id): - task = validate_goal(id) + task = validate_model(Task, id) + request_body = request.get_json() is_complete = request_body.get("is_complete", False) - # is_complete = request_body.get("is_complete", False) - - # if request_body["is_complete"] == None: - # request_body["is_complete"] = False - task.title = request_body["title"] task.description = request_body["description"] - task.is_complete = is_complete + task.is_complete = is_complete db.session.commit() return {"task": task.to_dict()}, 200 + @bp.route("/", methods=["DELETE"]) def delete_task(id): - task = validate_goal(id) + task = validate_model(Task, id) db.session.delete(task) db.session.commit() - return {"details" : f'Task {id} "{task.title}" successfully deleted'}, 200 + return {"details": f'Task {id} "{task.title}" successfully deleted'}, 200 @bp.route("//mark_complete", methods=["PATCH"]) def complete_task(id): - task = validate_goal(id) - # request_body = request.get_json() - - # if request_body is None: - # return {"details": "Invalid data"}, 400 - - # if "completed_at" in request_body: + task = validate_model(Task, id) if not task.completed_at: task.completed_at = datetime.now() task.is_complete = True - # else: - # return {"details": "Invalid data"}, 400 PATH = "https://slack.com/api/chat.postMessage" - Authorization = "Bearer xoxb-5242678399683-5266537240624-SzcfKHmF2xZaq407bmmGcsdL" - text = f"Someone just completed the task {task.title}" headers = { @@ -172,34 +98,14 @@ def complete_task(id): "text": text, } requests.post(PATH, headers=headers, json=body) - # response = requests.post(PATH, headers=headers, json=body) - - - # # return response.json() - # response_data = response.json() - # print("Response data:", response_data) - - #channel_id = "C12345" - - # try: - # # Call the chat.postMessage method using the WebClient - # result = client.chat_postMessage( - # channel=channel_id, - # text="Hello world" - # ) - # logger.info(result) - - # except SlackApiError as e: - # logger.error(f"Error posting message: {e}") db.session.commit() - return {"task": task.to_dict()}, 200 + return {"task": task.to_dict()}, 200 @bp.route("//mark_incomplete", methods=["PATCH"]) def incomplete_task(id): - task = validate_goal(id) - # request_body = request.get_json() + task = validate_model(Task, id) if task.completed_at: task.completed_at = None @@ -207,7 +113,3 @@ def incomplete_task(id): db.session.commit() return {"task": task.to_dict()}, 200 - - - - diff --git a/app/slack_post_test.py b/app/slack_post_test.py deleted file mode 100644 index 37fe3fcad..000000000 --- a/app/slack_post_test.py +++ /dev/null @@ -1,27 +0,0 @@ -import requests -import time -import json - -PATH = "https://slack.com/api/chat.postMessage" - -Authorization = "Bearer xoxb-5242678399683-5266537240624-SzcfKHmF2xZaq407bmmGcsdL" - -# seven_wonders = ["Great Wall of China","Petra", "Colosseum", "Chichen Itza", "Machu Picchu", "Taj Mahal", "Christ the Redeemer"] - -headers = { - "Authorization": Authorization, - "format": "json" - } - -body = { - "channel": "task-notifications", - "text": "Hello, World!", - } - - -requests.post(PATH, headers=headers, json=body) -# response_data = response.json() - - - -# print("Response data:", response_data) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 89b68af33..7c1c563b7 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -56,12 +56,12 @@ def test_get_task_not_found(client): # Act response = client.get("/tasks/1") response_body = response.get_json() - # response_body = response.get_data(as_text=True) this passes # Assert assert response.status_code == 404 - # assert response_body == {"Task number 1 was not found"} wont pass, find out why - assert response.get_data(as_text=True) == "Task number 1 was not found" + assert response_body == { + "details" : "Task number 1 was not found" + } # raise Exception("Complete test with assertion about response body") @@ -134,7 +134,9 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - assert response.get_data(as_text=True) == "Task number 1 was not found" + assert response_body == { + "details" : "Task number 1 was not found" + } # raise Exception("Complete test with assertion about response body") @@ -166,8 +168,9 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - assert response.get_data(as_text=True) == "Task number 1 was not found" - + assert response_body == { + "details" : "Task number 1 was not found" + } # raise Exception("Complete test with assertion about response body") # # ***************************************************************** diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 06be7211c..9ac24ac7a 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -127,8 +127,9 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - assert response.get_data(as_text=True) == "Task number 1 was not found" - + assert response_body == { + "details" : "Task number 1 was not found" + } # raise Exception("Complete test with assertion about response body") # # ***************************************************************** @@ -144,8 +145,9 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - assert response.get_data(as_text=True) == "Task number 1 was not found" - + assert response_body == { + "details" : "Task number 1 was not found" + } # raise Exception("Complete test with assertion about response body") # # ***************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 626559963..6c1684005 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -115,14 +115,14 @@ def test_update_goal_not_found(client): # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - respone = client.put("/goals/1") - respone_body = respone.get_json() + response = client.put("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- # assertion 1 goes here - assert respone.status_code == 404 + assert response.status_code == 404 # assertion 2 goes here - assert respone_body == { + assert response_body == { "details" : "Goal number 1 was not found" } # ---- Complete Assertions Here ---- @@ -145,11 +145,9 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 response_body = response.get_json() - # assert response.get_data(as_text=True) == 'Goal number 1 was not found' assert response_body == { "details" : "Goal number 1 was not found" } - # assert response_body == "Goal number 1 was not found" #with jsonify # raise Exception("Complete test with assertion about response body") From 652d0d443564ec2820eeb25a9c074461a9199d84 Mon Sep 17 00:00:00 2001 From: Aisha Date: Fri, 12 May 2023 09:37:01 -0500 Subject: [PATCH 12/14] refactored, all tests pass --- app/__init__.py | 6 ++-- app/routes/goal_routes.py | 27 ++++-------------- app/routes/task_routes.py | 8 ++---- migrations/versions/1568cdd09a0e_.py | 42 ++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 migrations/versions/1568cdd09a0e_.py diff --git a/app/__init__.py b/app/__init__.py index 256d0786a..4f3d9575c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,9 +21,9 @@ def create_app(test_config=None): # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( # "SQLALCHEMY_DATABASE_URI") # else: - # app.config["TESTING"] = True - # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - # "SQLALCHEMY_TEST_DATABASE_URI") + # app.config["TESTING"] = True + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py index 25dcb3d38..122755638 100644 --- a/app/routes/goal_routes.py +++ b/app/routes/goal_routes.py @@ -10,9 +10,7 @@ @bp.route("", methods=["GET"]) def get_all_goals(): goals = Goal.query.all() - goals_list = [] - for goal in goals: - goals_list.append(goal.to_dict()) + goals_list = [goal.to_dict() for goal in goals] return jsonify(goals_list), 200 @@ -42,7 +40,6 @@ def get_one_goal(id): def update_a_goal(id): goal = validate_model(Goal, id) request_body = request.get_json() - goal.title = request_body["title"] db.session.commit() @@ -55,26 +52,15 @@ def delete_a_goal(id): goal = validate_model(Goal, id) db.session.delete(goal) db.session.commit() + return make_response({'details': f'Goal {goal.id} "{goal.title}" successfully deleted'}), 200 @bp.route("//tasks", methods=["GET"]) def get_all_tasks_for_one_goal(id): goal = validate_model(Goal, id) - - tasks_list = [] - for task in goal.tasks: - if not task.completed_at: - task.is_complete = False - task = (dict( - id=task.id, - title=task.title, - description=task.description, - is_complete=task.is_complete, - goal_id=goal.id - )) - - tasks_list.append(task) + tasks_list = [(dict(id=task.id, title=task.title, description=task.description, + is_complete=False if task.completed_at is None else True, goal_id=goal.id)) for task in goal.tasks] return {"id": goal.id, "title": goal.title, "tasks": tasks_list}, 200 @@ -87,12 +73,9 @@ def post_task_ids_to_goal(id): abort(make_response({"details": "Invalid data"}, 400)) task_ids = request_body["task_ids"] - tasks_list = [] - for task_id in task_ids: - tasks_list.append(Task.query.get(task_id)) + tasks_list = [Task.query.get(task_id) for task_id in task_ids] goal.tasks = tasks_list - # db.session.add(new_task) db.session.commit() return {"id": goal.id, "task_ids": task_ids}, 200 diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index dd39a167a..bddce70df 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -18,9 +18,7 @@ def get_all_tasks(): else: tasks = Task.query.all() - tasks_list = [] - for task in tasks: - tasks_list.append(task.to_dict()) + tasks_list = [task.to_dict() for task in tasks] return jsonify(tasks_list), 200 @@ -28,7 +26,6 @@ def get_all_tasks(): @bp.route("", methods=["POST"]) def create_task(): request_body = request.get_json() - if "title" not in request_body or not request_body["title"] or "description" not in request_body or not request_body["description"]: abort(make_response({"details": "Invalid data"}, 400)) @@ -54,7 +51,6 @@ def get_one_task(id): @bp.route("/", methods=["PUT"]) def update_task(id): task = validate_model(Task, id) - request_body = request.get_json() is_complete = request_body.get("is_complete", False) @@ -100,6 +96,7 @@ def complete_task(id): requests.post(PATH, headers=headers, json=body) db.session.commit() + return {"task": task.to_dict()}, 200 @@ -112,4 +109,5 @@ def incomplete_task(id): task.is_complete = False db.session.commit() + return {"task": task.to_dict()}, 200 diff --git a/migrations/versions/1568cdd09a0e_.py b/migrations/versions/1568cdd09a0e_.py new file mode 100644 index 000000000..d550bd561 --- /dev/null +++ b/migrations/versions/1568cdd09a0e_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 1568cdd09a0e +Revises: cfe5d03c4a36 +Create Date: 2023-05-12 09:17:26.058099 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1568cdd09a0e' +down_revision = 'cfe5d03c4a36' +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 1ef265e7355a9e27617cae268fae3317e769d686 Mon Sep 17 00:00:00 2001 From: Aisha Date: Wed, 17 May 2023 07:20:07 -0500 Subject: [PATCH 13/14] changed test config --- app/__init__.py | 6 ++-- app/routes/task_routes.py | 7 ++++- migrations/versions/c2508a31947a_.py | 42 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/c2508a31947a_.py diff --git a/app/__init__.py b/app/__init__.py index 4f3d9575c..256d0786a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,9 +21,9 @@ def create_app(test_config=None): # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( # "SQLALCHEMY_DATABASE_URI") # else: - # app.config["TESTING"] = True - # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - # "SQLALCHEMY_TEST_DATABASE_URI") + # app.config["TESTING"] = True + # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + # "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py index bddce70df..9032b2b43 100644 --- a/app/routes/task_routes.py +++ b/app/routes/task_routes.py @@ -4,6 +4,10 @@ from datetime import datetime import requests from .route_helpers import validate_model +import os +from dotenv import load_dotenv + +load_dotenv() bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -81,7 +85,8 @@ def complete_task(id): task.is_complete = True PATH = "https://slack.com/api/chat.postMessage" - Authorization = "Bearer xoxb-5242678399683-5266537240624-SzcfKHmF2xZaq407bmmGcsdL" + Authorization = os.environ.get( + "Authorization") text = f"Someone just completed the task {task.title}" headers = { diff --git a/migrations/versions/c2508a31947a_.py b/migrations/versions/c2508a31947a_.py new file mode 100644 index 000000000..8df7c0910 --- /dev/null +++ b/migrations/versions/c2508a31947a_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: c2508a31947a +Revises: 1568cdd09a0e +Create Date: 2023-05-12 09:39:24.083918 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c2508a31947a' +down_revision = '1568cdd09a0e' +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 693a39f18f9647f2d39433cb3d968119c1ef9f1d Mon Sep 17 00:00:00 2001 From: Aisha Date: Wed, 17 May 2023 07:23:58 -0500 Subject: [PATCH 14/14] changed test config --- app/__init__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 256d0786a..51692c37a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,16 +14,17 @@ def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( - "RENDER_DATABASE_URI") + - # if test_config is None: - # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - # "SQLALCHEMY_DATABASE_URI") - # else: - # app.config["TESTING"] = True + if test_config is None: # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( - # "SQLALCHEMY_TEST_DATABASE_URI") + # "SQLALCHEMY_DATABASE_URI") + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "RENDER_DATABASE_URI") + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI") # Import models here for Alembic setup from app.models.task import Task