From b12f7aeb0210e929c00334e61ab8a6b9dab1cd42 Mon Sep 17 00:00:00 2001 From: San Date: Sat, 14 May 2022 04:27:56 +0800 Subject: [PATCH 1/3] update deploy fail ...lol --- Procfile | 0 app/__init__.py | 10 +- app/models/goal.py | 22 +++ app/models/task.py | 22 ++- app/routes.py | 244 ++++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++ migrations/env.py | 96 +++++++++++ migrations/script.py.mako | 24 +++ migrations/versions/09e7683b0b34_.py | 34 ++++ migrations/versions/0bf29057b7c0_.py | 32 ++++ migrations/versions/2bf7b38bd315_.py | 39 +++++ migrations/versions/6f75a3ace94f_.py | 50 ++++++ requirements.txt | 1 + tests/test_wave_01.py | 39 +++-- tests/test_wave_02.py | 4 +- tests/test_wave_03.py | 25 +-- tests/test_wave_05.py | 73 +++++--- tests/test_wave_06.py | 16 +- 19 files changed, 712 insertions(+), 65 deletions(-) create mode 100644 Procfile 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/09e7683b0b34_.py create mode 100644 migrations/versions/0bf29057b7c0_.py create mode 100644 migrations/versions/2bf7b38bd315_.py create mode 100644 migrations/versions/6f75a3ace94f_.py diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..e69de29bb diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..0afbd5164 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,12 +4,10 @@ import os from dotenv import load_dotenv - db = SQLAlchemy() migrate = Migrate() load_dotenv() - def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False @@ -31,4 +29,12 @@ def create_app(test_config=None): # Register Blueprints here + from .models.goal import Goal + from .models.task import Task + from .routes import task_bp + from .routes import goal_bp + + app.register_blueprint(task_bp) + app.register_blueprint(goal_bp) + return app diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..57f69ef26 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,5 +1,27 @@ from app import db + class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String, nullable=False) + tasks = db.relationship("Task", lazy = True, backref="goal") + + + def to_dict(self): + return dict(goal=({ + "id" : self.goal_id, + "title": self.title + })) + + def task_ids(self): + task_ids = [] + for task in self.tasks: + task_ids.append(task.task_id) + return task_ids + + def goal_to_task(self): + goal_description = self.to_dict()["goal"] + task_description = [task.dict()["task"] for task in self.tasks] + goal_description["tasks"] = task_description + return goal_description diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..60d181937 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,25 @@ from app import db - class Task(db.Model): task_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) + goal_key = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) + + def dict(self): + return (dict(task={ + "id" : self.task_id, + "title": self.title, + "description" : self.description, + "is_complete" : bool(self.completed_at), + "goal_id" : self.goal_key + })) + + def to_dict(self): + return (dict(task={ + "id" : self.task_id, + "title": self.title, + "description" : self.description, + "is_complete" : bool(self.completed_at) + })) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 3aae38d49..3e24c82e1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,243 @@ -from flask import Blueprint \ No newline at end of file +from app import db +from app.models.goal import Goal +from app.models.task import Task +from flask import Blueprint, jsonify, make_response, request, abort +from datetime import datetime +from sqlalchemy import desc, asc +import requests, os + + +#instia Goals & Task Blueprint + +task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goal_bp = Blueprint("goals", __name__, url_prefix="/goals") +SLACK_AUTH = os.environ.get("SLACK_API_AUTH") + +#-------------------------- SLACK --------------------------# + +def post_to_slack(task_identity): + + + url = "https://slack.com/api/chat.postMessage" + + headers = {"Authorization" : f"Bearer {SLACK_AUTH}"} + + data = { + "channel" : "task-notifications", + "text" : f"Someone just completed the task {task_identity.title}" + } + + response = requests.post(url, headers=headers, data=data) + response_body = response.json() + + return response_body + +#-------------------------- GOAL HELPER --------------------------# + +def validate_goal(goal_id): + try: + goal_id = int(goal_id) + except: + abort(make_response(dict(message=f"Goal {goal_id} is not valid."), 400)) + + goal = Goal.query.get(goal_id) + if not goal: + return abort(make_response(dict(message=f"Goal {goal_id} is invalid."), 404)) + else: + return goal + +#-------------------------- GOAL --------------------------# + +@goal_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":f"Invalid data"}, 400)) + + db.session.add(new_goal) + db.session.commit() + return { + "goal": { + "id": new_goal.goal_id, + "title": new_goal.title, + }},201 + +@goal_bp.route("//tasks", methods=["POST"]) +def create_goal_list(goal_id): + from app.models.task import Task + + goal = validate_goal(goal_id) + request_body = request.get_json() + + for task_id in request_body["task_ids"]: + task = Task.query.get(task_id) + goal.tasks.append(task) + + db.session.add(goal) + db.session.commit() + + return jsonify({"id": goal.goal_id, "task_ids": goal.task_ids()}), 200 + +@goal_bp.route("", methods=["GET"]) +def read_all_goals(): + goals_response = [] + + order_goals = request.args.get("sort") + + if order_goals == "asc": + goals = Goal.query.order_by(Goal.title.asc()) + elif order_goals == "desc": + goals = Goal.query.order_by(Goal.title.desc()) + else: + goals = Goal.query.all() + + for goal in goals: + goal_object = goal.to_dict() + goals_response.append(goal_object["goal"]) + + return jsonify(goals_response), 200 + + +@goal_bp.route("/", methods=["GET"]) +def get_one_goal_by_id(goal_id): + goal = validate_goal(goal_id) + return jsonify(goal.to_dict()), 200 + + +@goal_bp.route("//tasks", methods=["GET"]) +def get_goal(goal_id): + goal = validate_goal(goal_id) + return goal.goal_to_task(), 200 + +@goal_bp.route("/", methods=["PUT"]) +def replace_goal_by_id(goal_id): + goal = validate_goal(goal_id) + request_body = request.get_json() + goal.title = request_body["title"] + db.session.commit() + return jsonify(goal.to_dict()), 200 + +@goal_bp.route("/", methods=["DELETE"]) +def remove_goal(goal_id): + goal = validate_goal(goal_id) + + db.session.delete(goal) + db.session.commit() + + return make_response(dict(details=f'Goal {goal.goal_id} "{goal.title}" successfully deleted'), 200) + +#-------------------------- TASK HELPER --------------------------# + +def validate_task(task_id): + try: + task_id = int(task_id) + except: + abort(make_response(dict(message=f"Task {task_id} is not an interger."), 400)) + + task = Task.query.get(task_id) + + if not task: + return abort(make_response(dict(message=f"Task {task_id} is invalid."), 404)) + else: + return task + +#-------------------------- TASK --------------------------# + +@task_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":f"Invalid data"}, 400)) + + if "completed_at" in request_body: new_task.completed_at = request_body["completed_at"] + + db.session.add(new_task) + db.session.commit() + + return { + "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": bool(new_task.completed_at)}},201 + +@task_bp.route("", methods=["GET"]) +def get_all_tasks(): + task_query = request.args.get("sort") + if task_query == "asc": + tasks = Task.query.order_by(asc(Task.title)) + elif task_query == "desc": + tasks = Task.query.order_by(desc(Task.title)) + else: + tasks = Task.query.all() + + task_response = [] + for task in tasks: + task_response.append( + { + "id":task.task_id, + "title":task.title, + "description":task.description, + "is_complete": False + } + ) + return jsonify(task_response) + + +@task_bp.route("/", methods=["GET"]) +def get_one_task_by_id(task_identity): + task = validate_task(task_identity) + if task.goal_key: + return jsonify(task.dict()), 200 + + else: + return jsonify(task.to_dict()), 200 + +@task_bp.route("/", methods=["DELETE"]) +def delete_task_by_id(task_identity): + task = validate_task(task_identity) + + db.session.delete(task) + db.session.commit() + + return make_response(dict(details=f'Task {task.task_id} "{task.description}" successfully deleted'), 200) + +@task_bp.route("/", methods=["PUT"]) +def replace_task_by_id(task_identity): + task = validate_task(task_identity) + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return jsonify(task.to_dict()), 200 + +@task_bp.route("//mark_complete", methods=["PATCH"]) +def check_complete_by_id(task_identity): + + task = validate_task(task_identity) + task.completed_at = datetime.now() + + db.session.commit() + + post_to_slack(task) + return jsonify(task.to_dict()), 200 + +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def check_incomplete_by_id(task_identity): + + task = validate_task(task_identity) + task.completed_at = None + + db.session.commit() + + return jsonify(task.to_dict()), 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/09e7683b0b34_.py b/migrations/versions/09e7683b0b34_.py new file mode 100644 index 000000000..d94bde866 --- /dev/null +++ b/migrations/versions/09e7683b0b34_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 09e7683b0b34 +Revises: 6f75a3ace94f +Create Date: 2022-05-13 17:09:08.916180 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '09e7683b0b34' +down_revision = '6f75a3ace94f' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_key', sa.Integer(), nullable=True)) + op.drop_constraint('task_goal_id_fkey', 'task', type_='foreignkey') + op.create_foreign_key(None, 'task', 'goal', ['goal_key'], ['goal_id']) + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.INTEGER(), autoincrement=False, nullable=True)) + op.drop_constraint(None, 'task', type_='foreignkey') + op.create_foreign_key('task_goal_id_fkey', 'task', 'goal', ['goal_id'], ['goal_id']) + op.drop_column('task', 'goal_key') + # ### end Alembic commands ### diff --git a/migrations/versions/0bf29057b7c0_.py b/migrations/versions/0bf29057b7c0_.py new file mode 100644 index 000000000..f58b8b3ba --- /dev/null +++ b/migrations/versions/0bf29057b7c0_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 0bf29057b7c0 +Revises: 2bf7b38bd315 +Create Date: 2022-05-11 22:18:37.506562 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '0bf29057b7c0' +down_revision = '2bf7b38bd315' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('task', 'completed_at', + existing_type=postgresql.TIMESTAMP(), + nullable=False) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('task', 'completed_at', + existing_type=postgresql.TIMESTAMP(), + nullable=True) + # ### end Alembic commands ### diff --git a/migrations/versions/2bf7b38bd315_.py b/migrations/versions/2bf7b38bd315_.py new file mode 100644 index 000000000..d8ac18073 --- /dev/null +++ b/migrations/versions/2bf7b38bd315_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 2bf7b38bd315 +Revises: +Create Date: 2022-05-11 07:58:51.358107 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2bf7b38bd315' +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=False), + sa.Column('description', sa.String(), nullable=False), + 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 ### diff --git a/migrations/versions/6f75a3ace94f_.py b/migrations/versions/6f75a3ace94f_.py new file mode 100644 index 000000000..e104ea02a --- /dev/null +++ b/migrations/versions/6f75a3ace94f_.py @@ -0,0 +1,50 @@ +"""empty message + +Revision ID: 6f75a3ace94f +Revises: 0bf29057b7c0 +Create Date: 2022-05-13 00:19:29.917746 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '6f75a3ace94f' +down_revision = '0bf29057b7c0' +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)) + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.alter_column('task', 'completed_at', + existing_type=postgresql.TIMESTAMP(), + nullable=True) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + 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.alter_column('task', 'title', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('task', 'description', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('task', 'completed_at', + existing_type=postgresql.TIMESTAMP(), + nullable=False) + op.drop_column('task', 'goal_id') + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/requirements.txt b/requirements.txt index 30ff414fe..143ec15af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==6.3.2 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..68fa38923 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,14 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Invalid") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + + assert response_body == {"message":f"Task 1 is invalid."} - -@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 +94,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 +120,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 +132,16 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response.status_code == 404 + assert len(response_body) == 1 + assert response_body['message'] == 'Task 1 is invalid.' -@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") @@ -147,12 +151,12 @@ def test_delete_task(client, one_task): assert response.status_code == 200 assert "details" in response_body assert response_body == { - "details": 'Task 1 "Go on my daily walk 🏞" successfully deleted' + 'details': 'Task 1 "Notice something new every day" successfully deleted' } 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 +165,16 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response.status_code == 404 + assert len(response_body) == 1 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 +191,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={ diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 959176ceb..ee7406fde 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -128,13 +128,13 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** + assert response_body == { "message": "Task 1 is invalid."} - -@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,15 +143,16 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** - + + assert response_body == { "message": "Task 1 is invalid."} # Let's add this test for creating tasks, now that # the completion functionality has been implemented -@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_with_valid_completed_at(client): # Act response = client.post("/tasks", json={ @@ -181,7 +182,7 @@ def test_create_task_with_valid_completed_at(client): # Let's add this test for updating tasks, now that # the completion functionality has been implemented -@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_with_completed_at_date(client, completed_task): # Act response = client.put("/tasks/1", json={ diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..2ca465047 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ import pytest +from app.models.goal import Goal -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +47,21 @@ 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 - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == {"message":f"Goal 1 is invalid."} -@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,9 +80,9 @@ 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 ---- @@ -92,22 +92,42 @@ def test_update_goal(client, one_goal): # assertion 2 goes here # assertion 3 goes here # ---- Complete Assertions Here ---- + # Act + response = client.put("/goals/1", json={ + "title": "Updated New Goal", + }) + response_body = response.get_json() + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated New Goal" + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated New 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") + # raise Exception("Complete test") # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Task Title", + "description": "Updated Test Description", + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert len(response_body) == 1 + assert response_body['message'] == 'Goal 1 is invalid.' # ---- 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,16 +143,17 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 + assert Goal.query.get(1) == None + assert len(response_body) == 1 - raise Exception("Complete test with assertion about response body") + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** - -@pytest.mark.skip(reason="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 ---- @@ -142,9 +163,15 @@ def test_delete_goal_not_found(client): # assertion 1 goes here # assertion 2 goes here # ---- Complete Assertions Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() + # Assert + assert response.status_code == 404 + assert len(response_body) == 1 + assert Goal.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..b9fa24b07 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,16 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 + assert len(response_body) == 1 - raise Exception("Complete test with assertion about response body") + + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +76,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 +101,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 1850c2b9cbeff17392cb4969601c8da334eb9c61 Mon Sep 17 00:00:00 2001 From: San Date: Sat, 14 May 2022 05:12:57 +0800 Subject: [PATCH 2/3] update --- Procfile | 1 + migrations/versions/09e7683b0b34_.py | 34 ------------------- migrations/versions/0bf29057b7c0_.py | 32 ------------------ migrations/versions/2bf7b38bd315_.py | 39 ---------------------- migrations/versions/6f75a3ace94f_.py | 50 ---------------------------- 5 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 migrations/versions/09e7683b0b34_.py delete mode 100644 migrations/versions/0bf29057b7c0_.py delete mode 100644 migrations/versions/2bf7b38bd315_.py delete mode 100644 migrations/versions/6f75a3ace94f_.py diff --git a/Procfile b/Procfile index e69de29bb..62e430aca 100644 --- a/Procfile +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file diff --git a/migrations/versions/09e7683b0b34_.py b/migrations/versions/09e7683b0b34_.py deleted file mode 100644 index d94bde866..000000000 --- a/migrations/versions/09e7683b0b34_.py +++ /dev/null @@ -1,34 +0,0 @@ -"""empty message - -Revision ID: 09e7683b0b34 -Revises: 6f75a3ace94f -Create Date: 2022-05-13 17:09:08.916180 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '09e7683b0b34' -down_revision = '6f75a3ace94f' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('goal_key', sa.Integer(), nullable=True)) - op.drop_constraint('task_goal_id_fkey', 'task', type_='foreignkey') - op.create_foreign_key(None, 'task', 'goal', ['goal_key'], ['goal_id']) - op.drop_column('task', 'goal_id') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('goal_id', sa.INTEGER(), autoincrement=False, nullable=True)) - op.drop_constraint(None, 'task', type_='foreignkey') - op.create_foreign_key('task_goal_id_fkey', 'task', 'goal', ['goal_id'], ['goal_id']) - op.drop_column('task', 'goal_key') - # ### end Alembic commands ### diff --git a/migrations/versions/0bf29057b7c0_.py b/migrations/versions/0bf29057b7c0_.py deleted file mode 100644 index f58b8b3ba..000000000 --- a/migrations/versions/0bf29057b7c0_.py +++ /dev/null @@ -1,32 +0,0 @@ -"""empty message - -Revision ID: 0bf29057b7c0 -Revises: 2bf7b38bd315 -Create Date: 2022-05-11 22:18:37.506562 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -# revision identifiers, used by Alembic. -revision = '0bf29057b7c0' -down_revision = '2bf7b38bd315' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column('task', 'completed_at', - existing_type=postgresql.TIMESTAMP(), - nullable=False) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column('task', 'completed_at', - existing_type=postgresql.TIMESTAMP(), - nullable=True) - # ### end Alembic commands ### diff --git a/migrations/versions/2bf7b38bd315_.py b/migrations/versions/2bf7b38bd315_.py deleted file mode 100644 index d8ac18073..000000000 --- a/migrations/versions/2bf7b38bd315_.py +++ /dev/null @@ -1,39 +0,0 @@ -"""empty message - -Revision ID: 2bf7b38bd315 -Revises: -Create Date: 2022-05-11 07:58:51.358107 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '2bf7b38bd315' -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=False), - sa.Column('description', sa.String(), nullable=False), - 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 ### diff --git a/migrations/versions/6f75a3ace94f_.py b/migrations/versions/6f75a3ace94f_.py deleted file mode 100644 index e104ea02a..000000000 --- a/migrations/versions/6f75a3ace94f_.py +++ /dev/null @@ -1,50 +0,0 @@ -"""empty message - -Revision ID: 6f75a3ace94f -Revises: 0bf29057b7c0 -Create Date: 2022-05-13 00:19:29.917746 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -# revision identifiers, used by Alembic. -revision = '6f75a3ace94f' -down_revision = '0bf29057b7c0' -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)) - op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) - op.alter_column('task', 'completed_at', - existing_type=postgresql.TIMESTAMP(), - nullable=True) - op.alter_column('task', 'description', - existing_type=sa.VARCHAR(), - nullable=True) - op.alter_column('task', 'title', - existing_type=sa.VARCHAR(), - 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.alter_column('task', 'title', - existing_type=sa.VARCHAR(), - nullable=False) - op.alter_column('task', 'description', - existing_type=sa.VARCHAR(), - nullable=False) - op.alter_column('task', 'completed_at', - existing_type=postgresql.TIMESTAMP(), - nullable=False) - op.drop_column('task', 'goal_id') - op.drop_column('goal', 'title') - # ### end Alembic commands ### From 280d15c60194ed37c0257a0062dacfee4fe94acf Mon Sep 17 00:00:00 2001 From: San Date: Mon, 16 May 2022 01:05:04 +0800 Subject: [PATCH 3/3] update --- app/models/goal.py | 5 +---- app/models/task.py | 5 +++-- app/routes.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index 57f69ef26..a0ae27df1 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,13 +1,10 @@ from app import db - - class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) - title = db.Column(db.String, nullable=False) + title = db.Column(db.String) tasks = db.relationship("Task", lazy = True, backref="goal") - def to_dict(self): return dict(goal=({ "id" : self.goal_id, diff --git a/app/models/task.py b/app/models/task.py index 60d181937..061218010 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,7 +5,7 @@ class Task(db.Model): title = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) completed_at = db.Column(db.DateTime, nullable=True) - goal_key = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) + goal_value = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) def dict(self): return (dict(task={ @@ -13,7 +13,8 @@ def dict(self): "title": self.title, "description" : self.description, "is_complete" : bool(self.completed_at), - "goal_id" : self.goal_key + "goal_id" : self.goal_value + })) def to_dict(self): diff --git a/app/routes.py b/app/routes.py index 3e24c82e1..2870429d8 100644 --- a/app/routes.py +++ b/app/routes.py @@ -192,7 +192,7 @@ def get_all_tasks(): @task_bp.route("/", methods=["GET"]) def get_one_task_by_id(task_identity): task = validate_task(task_identity) - if task.goal_key: + if task.goal_value: return jsonify(task.dict()), 200 else: