From 53f3894d9a8ac31c6ab3c33490bb97d8dbe759dd Mon Sep 17 00:00:00 2001 From: letypl12 <86847701+letypl12@users.noreply.github.com> Date: Sun, 31 Oct 2021 20:47:22 -0700 Subject: [PATCH 1/7] lety save point for health xp --- app/__init__.py | 7 +- app/models/task.py | 16 ++++- app/routes.py | 71 +++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/8df57712ddbc_.py | 34 ++++++++++ tests/conftest.py | 5 +- tests/test_wave_01.py | 3 +- tests/test_wave_03.py | 2 +- 11 files changed, 291 insertions(+), 13 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/8df57712ddbc_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..1ac214799 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,13 +22,14 @@ def create_app(test_config=None): 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 app.models.goal import Goal db.init_app(app) migrate.init_app(app, db) # Register Blueprints here + from app.models.Task import Task + + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..868258e96 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,16 @@ -from flask import current_app from app import db - class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + __tablename__ = 'tblTasks' + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True ) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True) + + def to_dict(self): + return { + "title": self.title, + "id": self.task_id, + "description": self.description, + "is_complete": True if self.completed_at else False + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..1be4d6cc1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,71 @@ -from flask import Blueprint +from flask import Blueprint, jsonify, request, make_response +from flask.globals import session +from app import db +from app.models.Task import Task +from sqlalchemy import asc, desc + + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST","GET"], strict_slashes=False) +def create_task(): + if request.method == "POST": + + request_body = request.get_json() + if ("title" not in request_body) or ("description" not in request_body) or ("completed_at" not in request_body): + return {"details": "Invalid data"}, 400 + else: + new_task = Task(title=request_body['title'], description=request_body['description'], completed_at=request_body['completed_at']) + db.session.add(new_task) + db.session.commit() + if request_body['completed_at'] == None: + return make_response({"task":new_task.to_dict()}), 201 + else: + return make_response({"task":new_task.to_dict()}), 200 + elif request.method == "GET": + if "sort" in request.args: + title_sorter = request.args.get("sort") + if title_sorter == "asc": + tasks_list = Task.query.order_by(Task.title.asc()).all() + elif title_sorter == "desc": + tasks_list = Task.query.order_by(Task.title.desc()).all() + else: + tasks_list = Task.query.all() + response = [] + for my_task in tasks_list: + response.append(my_task.to_dict()) + return jsonify(response), 200 + +@tasks_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes=False) +def get_task(task_id): + task_id = int(task_id) + my_task = Task.query.get(task_id) + if request.method == "GET": + if my_task is None: + return "", 404 + else: + return make_response({"task":my_task.to_dict()}), 200 + + elif request.method == "PUT": + request_body = request.get_json() + try: + my_task.title = request_body["title"] + my_task.description = request_body["description"] + if "completed_at" in request_body : + my_task.completed_at = request_body["completed_at"] + db.session.commit() + return make_response({"task":my_task.to_dict()}), 200 + except AttributeError as ae: + return make_response("", 404) + + elif request.method == "DELETE": + if my_task is None: + return "", 404 + else: + db.session.delete(my_task) + db.session.commit() + myResponse = 'Task ' + str(task_id) + ' "' + my_task.title + '" successfully deleted' + return make_response({"details":myResponse}), 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/8df57712ddbc_.py b/migrations/versions/8df57712ddbc_.py new file mode 100644 index 000000000..4c90655a2 --- /dev/null +++ b/migrations/versions/8df57712ddbc_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 8df57712ddbc +Revises: +Create Date: 2021-10-28 19:38:50.230483 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8df57712ddbc' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + # ### end Alembic commands ### diff --git a/tests/conftest.py b/tests/conftest.py index d11083bf3..f053d4513 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,8 +1,7 @@ import pytest -from app import create_app -from app.models.task import Task +from app import create_app, db +from app.models.Task import Task from app.models.goal import Goal -from app import db from datetime import datetime diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index cc6459a12..932b23982 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -1,4 +1,4 @@ -from app.models.task import Task +from app.models.Task import Task def test_get_tasks_no_saved_tasks(client): @@ -28,7 +28,6 @@ def test_get_tasks_one_saved_tasks(client, one_task): } ] - def test_get_task(client, one_task): # Act response = client.get("/tasks/1") diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 92017b8c0..4a0ac1c2f 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -1,7 +1,7 @@ import unittest from unittest.mock import Mock, patch from datetime import datetime -from app.models.task import Task +from app.models.Task import Task def test_mark_complete_on_incomplete_task(client, one_task): From 675323ab741c1bc6c595303856e9989c2d386fc8 Mon Sep 17 00:00:00 2001 From: letypl12 <86847701+letypl12@users.noreply.github.com> Date: Thu, 4 Nov 2021 14:29:19 -0700 Subject: [PATCH 2/7] All tests work --- app/__init__.py | 4 + app/models/goal.py | 26 +++- app/models/task.py | 18 ++- app/routes.py | 120 +++++++++++++++++- .../{8df57712ddbc_.py => cf15913c78d7_.py} | 18 ++- tests/conftest.py | 2 +- tests/test_wave_05.py | 64 +++++----- tests/test_wave_06.py | 3 +- 8 files changed, 209 insertions(+), 46 deletions(-) rename migrations/versions/{8df57712ddbc_.py => cf15913c78d7_.py} (55%) diff --git a/app/__init__.py b/app/__init__.py index 1ac214799..b4e1c3c54 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -28,8 +28,12 @@ def create_app(test_config=None): # Register Blueprints here from app.models.Task import Task + from app.models.Goal import Goal from .routes import tasks_bp + from .routes import goals_bp + app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..15f37c96a 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,28 @@ from flask import current_app from app import db - +from app.models.Task import Task class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + __tablename__ = 'goal' + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + #these are not just IDs, like a list of numbers...they are objects of type Task + tasks = db.relationship("Task", backref="goal", lazy=True) + + def to_dict(self): + return { + "id": self.id, + "title": self.title, + } + + + def goal_tasks_to_dict(self): + mytasks = Task.query.all(self[0].tasks) + mylist = [] + for thing in mytasks: + mylist.append(thing.id) + + return { + "id": self.id, + "task_ids": mylist + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 868258e96..0e3803916 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,16 +1,24 @@ +from flask import current_app from app import db +#from app.models.Goal import Goal class Task(db.Model): - __tablename__ = 'tblTasks' - task_id = db.Column(db.Integer, primary_key=True, autoincrement=True ) + __tablename__ = 'task' + id = db.Column(db.Integer, primary_key=True, autoincrement=True ) title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.id"), nullable=True) def to_dict(self): - return { + result = { + "id": self.id, "title": self.title, - "id": self.task_id, "description": self.description, "is_complete": True if self.completed_at else False - } \ No newline at end of file + } + + if self.goal_id: + result["goal_id"]=self.goal_id + return result + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 1be4d6cc1..8613a6d62 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,15 +2,22 @@ from flask.globals import session from app import db from app.models.Task import Task +from app.models.Goal import Goal from sqlalchemy import asc, desc +from datetime import datetime +import requests +import urllib.parse +from dotenv import load_dotenv +import os +load_dotenv() tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals",__name__, url_prefix="/goals") @tasks_bp.route("", methods=["POST","GET"], strict_slashes=False) def create_task(): if request.method == "POST": - request_body = request.get_json() if ("title" not in request_body) or ("description" not in request_body) or ("completed_at" not in request_body): return {"details": "Invalid data"}, 400 @@ -21,7 +28,7 @@ def create_task(): if request_body['completed_at'] == None: return make_response({"task":new_task.to_dict()}), 201 else: - return make_response({"task":new_task.to_dict()}), 200 + return make_response({"task":new_task.to_dict()}), 201 elif request.method == "GET": if "sort" in request.args: title_sorter = request.args.get("sort") @@ -67,5 +74,114 @@ def get_task(task_id): myResponse = 'Task ' + str(task_id) + ' "' + my_task.title + '" successfully deleted' return make_response({"details":myResponse}), 200 +@tasks_bp.route("//", methods=["PATCH"], strict_slashes=False ) +def mark_complete(task_id, completed_status): + task_id = int(task_id) + my_task = Task.query.get(task_id) + if request.method == "PATCH": + if my_task is None: + return "", 404 + else: + if completed_status == "mark_complete": + my_task.completed_at = datetime.now() + send_slack_notice(my_task.title) + elif completed_status == "mark_incomplete": + my_task.completed_at = None + db.session.commit() + return make_response({"task" : my_task.to_dict()}), 200 + + +def send_slack_notice(this_task_title): + #here we need to create an http.request to the slack end point + myNotice = urllib.parse.quote_plus("Someone just completed the task " + this_task_title) + my_url = "https://slack.com/api/chat.postMessage?channel=task-notifications&text=" + myNotice + "&pretty=1" + #add a request.header "Authorization", "super secret" + my_headers = {'Authorization': os.environ.get("MY_SLACK_TOKEN")} + #send + r = requests.post(my_url, data="", headers=my_headers) + +@goals_bp.route("", methods=["GET", "POST"], strict_slashes=False) +def create_goal(): + if request.method == "POST": + request_body = request.get_json() + if "title" not in request_body: + return {"details": "Invalid data"}, 400 + else: + new_goal = Goal(title=request_body['title']) + db.session.add(new_goal) + db.session.commit() + return make_response({"goal":new_goal.to_dict()}), 201 + + if request.method == "GET": + goals_list = Goal.query.all() + response = [] + for my_goal in goals_list: + response.append(my_goal.to_dict()) + + return jsonify(response), 200 + +@goals_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes=False) +def get_goal(goal_id): + goal_id = int(goal_id) + my_goal = Goal.query.get(goal_id) + if request.method == "GET": + if my_goal is None: + return "", 404 + else: + return make_response({"goal":my_goal.to_dict()}), 200 + + elif request.method == "PUT": + request_body = request.get_json() + try: + my_goal.title = request_body["title"] + db.session.commit() + return make_response({"goal":my_goal.to_dict()}), 200 + except AttributeError as ae: + return make_response("", 404) + + elif request.method == "DELETE": + if my_goal is None: + return "", 404 + else: + db.session.delete(my_goal) + db.session.commit() + myResponse = 'Goal ' + str(goal_id) + ' "' + my_goal.title + '" successfully deleted' + return make_response({"details":myResponse}), 200 + +@goals_bp.route("//tasks", methods=["GET", "POST"], strict_slashes=False) +def create_task_ids_to_goals(goal_id): + # goal_id = int(goal_id) + my_goal = Goal.query.get(goal_id) + if my_goal is None: + return "", 404 + request_body = request.get_json() + if request_body is not None: + task_ids = request_body['task_ids'] + else: + task_ids = [] + if request.method == "POST": + #update all the tasks to point to the goal + listoftasks = [] + for taskid in task_ids: + mytask = Task.query.get(taskid) + mytask.goal_id = goal_id + listoftasks.append(taskid) + db.session.commit() + #return my_goal.goal_tasks_to_dict, 200 + #Query all the tasks with the goalID + # create your response here and not in the db.models + return make_response({"id":int(goal_id), "task_ids":listoftasks}), 200 + + if request.method == "GET": + #set up a list + listoftasks = [] + #Query all the tasks with the goalID + mytasks = Task.query.filter(Task.goal_id == goal_id) + for tasker in mytasks: + listoftasks.append(tasker.to_dict()) + #return my_goal.goal_tasks_to_dict, 200 + + # create your response here and not in the db.models + return make_response({"id":int(goal_id), "title":my_goal.title, "tasks":listoftasks}), 200 diff --git a/migrations/versions/8df57712ddbc_.py b/migrations/versions/cf15913c78d7_.py similarity index 55% rename from migrations/versions/8df57712ddbc_.py rename to migrations/versions/cf15913c78d7_.py index 4c90655a2..444c3f8b8 100644 --- a/migrations/versions/8df57712ddbc_.py +++ b/migrations/versions/cf15913c78d7_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 8df57712ddbc +Revision ID: cf15913c78d7 Revises: -Create Date: 2021-10-28 19:38:50.230483 +Create Date: 2021-11-04 09:32:40.779510 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '8df57712ddbc' +revision = 'cf15913c78d7' down_revision = None branch_labels = None depends_on = None @@ -18,12 +18,19 @@ 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=True), + sa.PrimaryKeyConstraint('id') + ) op.create_table('task', - sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('title', sa.String(), nullable=True), sa.Column('description', sa.String(), nullable=True), sa.Column('completed_at', sa.DateTime(), nullable=True), - sa.PrimaryKeyConstraint('task_id') + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], ), + sa.PrimaryKeyConstraint('id') ) # ### end Alembic commands ### @@ -31,4 +38,5 @@ def upgrade(): def downgrade(): # ### commands auto generated by Alembic - please adjust! ### op.drop_table('task') + op.drop_table('goal') # ### end Alembic commands ### diff --git a/tests/conftest.py b/tests/conftest.py index f053d4513..294bf32a1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,7 +1,7 @@ import pytest from app import create_app, db from app.models.Task import Task -from app.models.goal import Goal +from app.models.Goal import Goal from datetime import datetime diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 6ba60c6fa..a64264b66 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,4 +1,5 @@ import pytest +from app.models.Goal import Goal def test_get_goals_no_saved_goals(client): # Act @@ -41,18 +42,15 @@ 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() # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == None def test_create_goal(client): # Act @@ -71,30 +69,40 @@ 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): - pass # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title", + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title", + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" + + -@pytest.mark.skip(reason="test to be completed by student") +#@pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - pass # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title", + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == None + def test_delete_goal(client, one_goal): @@ -113,18 +121,16 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 -@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): - pass - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == None + assert Goal.query.all() == [] def test_create_goal_missing_title(client): diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 48ecd0523..fddc0d9e1 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -1,5 +1,4 @@ -from app.models.goal import Goal - +from app.models.Goal import Goal def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act From c3113357bd171bd582e270614ba28b1479ced43f Mon Sep 17 00:00:00 2001 From: letypl12 <86847701+letypl12@users.noreply.github.com> Date: Thu, 4 Nov 2021 14:39:13 -0700 Subject: [PATCH 3/7] Procfile added --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file From 242838e4a2ee7ab17450b41115f51279ad7a2653 Mon Sep 17 00:00:00 2001 From: letypl12 <86847701+letypl12@users.noreply.github.com> Date: Thu, 4 Nov 2021 15:44:06 -0700 Subject: [PATCH 4/7] Moved the model imports --- app/__init__.py | 5 +++-- app/models/task.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index b4e1c3c54..4ceeccc1e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -27,8 +27,6 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from app.models.Task import Task - from app.models.Goal import Goal from .routes import tasks_bp from .routes import goals_bp @@ -36,4 +34,7 @@ def create_app(test_config=None): app.register_blueprint(tasks_bp) app.register_blueprint(goals_bp) + from app.models.Task import Task + from app.models.Goal import Goal + return app diff --git a/app/models/task.py b/app/models/task.py index 0e3803916..9d83edefd 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,6 @@ from flask import current_app from app import db -#from app.models.Goal import Goal + class Task(db.Model): __tablename__ = 'task' From ecd0f9d056dda96085ac214e51dda03675c9830d Mon Sep 17 00:00:00 2001 From: letypl12 <86847701+letypl12@users.noreply.github.com> Date: Thu, 4 Nov 2021 16:10:40 -0700 Subject: [PATCH 5/7] Changed file models names --- app/__init__.py | 4 ++-- app/models/goal.py | 2 +- app/routes.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4ceeccc1e..a9dc6d503 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -34,7 +34,7 @@ def create_app(test_config=None): app.register_blueprint(tasks_bp) app.register_blueprint(goals_bp) - from app.models.Task import Task - from app.models.Goal import Goal + from app.models.task import Task + from app.models.goal import Goal return app diff --git a/app/models/goal.py b/app/models/goal.py index 15f37c96a..d4c72f520 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,6 @@ from flask import current_app from app import db -from app.models.Task import Task +from app.models.task import Task class Goal(db.Model): __tablename__ = 'goal' diff --git a/app/routes.py b/app/routes.py index 8613a6d62..c3c97a460 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,8 +1,8 @@ from flask import Blueprint, jsonify, request, make_response from flask.globals import session from app import db -from app.models.Task import Task -from app.models.Goal import Goal +from app.models.task import Task +from app.models.goal import Goal from sqlalchemy import asc, desc from datetime import datetime import requests From 75adb98aced1310f05fba56649efdb8a79a27e33 Mon Sep 17 00:00:00 2001 From: letypl12 <86847701+letypl12@users.noreply.github.com> Date: Thu, 4 Nov 2021 16:54:39 -0700 Subject: [PATCH 6/7] Tests recovery --- tests/conftest.py | 4 ++-- tests/test_wave_01.py | 2 +- tests/test_wave_03.py | 2 +- tests/test_wave_05.py | 2 +- tests/test_wave_06.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 294bf32a1..d3d7b0755 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,7 +1,7 @@ import pytest from app import create_app, db -from app.models.Task import Task -from app.models.Goal import Goal +from app.models.task import Task +from app.models.goal import Goal from datetime import datetime diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 932b23982..401a675d2 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -1,4 +1,4 @@ -from app.models.Task import Task +from app.models.task import Task def test_get_tasks_no_saved_tasks(client): diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 4a0ac1c2f..92017b8c0 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -1,7 +1,7 @@ import unittest from unittest.mock import Mock, patch from datetime import datetime -from app.models.Task import Task +from app.models.task import Task def test_mark_complete_on_incomplete_task(client, one_task): diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index a64264b66..e61a33c70 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,5 +1,5 @@ import pytest -from app.models.Goal import Goal +from app.models.goal import Goal def test_get_goals_no_saved_goals(client): # Act diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index fddc0d9e1..4a7f2e662 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -1,4 +1,4 @@ -from app.models.Goal import Goal +from app.models.goal import Goal def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act From 43d118990719b4685afdc99ee54bd2c3e78c1a55 Mon Sep 17 00:00:00 2001 From: letypl12 <86847701+letypl12@users.noreply.github.com> Date: Thu, 4 Nov 2021 17:15:59 -0700 Subject: [PATCH 7/7] Rename token --- app/routes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index c3c97a460..62f452e66 100644 --- a/app/routes.py +++ b/app/routes.py @@ -96,7 +96,8 @@ def send_slack_notice(this_task_title): myNotice = urllib.parse.quote_plus("Someone just completed the task " + this_task_title) my_url = "https://slack.com/api/chat.postMessage?channel=task-notifications&text=" + myNotice + "&pretty=1" #add a request.header "Authorization", "super secret" - my_headers = {'Authorization': os.environ.get("MY_SLACK_TOKEN")} + my_token = os.environ.get("MY_SLACK_TOKEN") + my_headers = {"Authorization": f"Bearer {my_token}"} #send r = requests.post(my_url, data="", headers=my_headers)