From 4c0402648daf550686e7cb3b16148089e4572332 Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Sun, 9 May 2021 14:46:21 -0700 Subject: [PATCH 1/9] updated app __init__, models, route, and tests --- app/__init__.py | 11 ++- app/models/task.py | 4 + app/routes.py | 111 +++++++++++++++++++++++++++ migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++ migrations/env.py | 96 +++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/7072147e830c_.py | 39 ++++++++++ tests/__init__.py | 39 ++++++++++ tests/gavin-test.py | 9 +++ 10 files changed, 377 insertions(+), 2 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/7072147e830c_.py create mode 100644 tests/gavin-test.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..2dd37936f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,13 +22,20 @@ def create_app(test_config=None): app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") + db.init_app(app) + migrate.init_app(app, db) + # 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) + # db.init_app(app) moved to line 25-26 + # migrate.init_app(app, db) # Register Blueprints here + from app.routes import task_bp + app.register_blueprint(task_bp) return app + + diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..ec1cf4c6e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,3 +4,7 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True) # nullable allow an empty cell + __tablename__ = "tasks" #specifically for flask migrate diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..d5c449aa8 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,113 @@ from flask import Blueprint +from app.models.task import Task +from app import db +from flask import request, Blueprint, make_response, Response, jsonify +task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@task_bp.route("", methods=["GET", "POST"]) +def handle_tasks(): # NameError + if request.method == "GET": + tasks = Task.query.all() + tasks_response = [] + + for task in tasks: + if task.completed_at == None: + completed_at = False + else: + completed_at = True + + tasks_response.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + }) + return jsonify(tasks_response) + + elif request.method == "POST": # CRUD CREATE + # check for request body title and description, plus ensure both are strings + 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": f"Invalid data" + }, 400 + + completed_at = request_body["completed_at"] + + task = Task( + title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"] + ) + + db.session.add(task) + db.session.commit() + + if task.completed_at == None: + completed_at = False + else: + completed_at = True + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } + }, 201 + +# getting 1 task +@task_bp.route("/", methods=["GET", "PUT", "DELETE"]) +def handle_task(task_id): + task = Task.query.get(task_id) + + if task == None: + return make_response(f"Task {task_id} not found", 404) + + if request.method == "GET": + if task.completed_at == None: + completed_at = False + else: + completed_at = True + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } + } + elif request.method == "PUT": + form_data = request.get_json() + + task.title = form_data["title"] + task.description = form_data["description"] + task.completed_at = form_data["completed_at"] + + db.session.commit() + + if task.completed_at == None: + completed_at = False + else: + completed_at = True + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } + } + + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + if task.completed_at == None: + completed_at = False + else: + completed_at = True + return { + "details": f"Task {task.task_id} \"{task.title}\" successfully deleted" + } 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/7072147e830c_.py b/migrations/versions/7072147e830c_.py new file mode 100644 index 000000000..c810e4594 --- /dev/null +++ b/migrations/versions/7072147e830c_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 7072147e830c +Revises: +Create Date: 2021-05-07 12:04:30.804978 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '7072147e830c' +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('tasks', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('tasks') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..3c03189b4 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,39 @@ +from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +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 + + 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") + + db.init_app(app) + migrate.init_app(app, db) + + # Import models here for Alembic setup + from app.models.task import Task + from app.models.goal import Goal + + # db.init_app(app) moved to line 25-26 + # migrate.init_app(app, db) + + # Register Blueprints here + from app.routes import task_bp + app.register_blueprint(task_bp) + + return app diff --git a/tests/gavin-test.py b/tests/gavin-test.py new file mode 100644 index 000000000..67dc8943d --- /dev/null +++ b/tests/gavin-test.py @@ -0,0 +1,9 @@ +import requests + +task = { + "title": "laundry", + "description": "wash laundry", + } + +response = requests.post(url="http://localhost:5000/tasks:", data=task) +print(f"code:{response}, text:{response.text}") From 457c5d6aa1c78857217cf0f7c7533840ee5effab Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Sun, 9 May 2021 19:38:05 -0700 Subject: [PATCH 2/9] updated app/routes.py & passed tests/test_wave_02.py --- app/routes.py | 37 ++++++++++++++++++++++++++++++++++++- tests/test_wave_02.py | 18 +++++++++--------- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/app/routes.py b/app/routes.py index d5c449aa8..37a83d007 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,12 +2,15 @@ from app.models.task import Task from app import db from flask import request, Blueprint, make_response, Response, jsonify +from datetime import date task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + @task_bp.route("", methods=["GET", "POST"]) def handle_tasks(): # NameError if request.method == "GET": + tasks = Task.query.all() tasks_response = [] @@ -23,6 +26,16 @@ def handle_tasks(): # NameError "description": task.description, "is_complete": completed_at }) + + # sort before return + sort = request.args.get("sort") + if sort == "asc": + # def test_get_tasks_sorted_asc + tasks_response = sorted(tasks_response, key=lambda x: x["title"]) + elif sort == "desc": + # def test_get_tasks_sorted_desc(client, three_tasks): + tasks_response = sorted( + tasks_response, key=lambda x: x["title"], reverse=True) return jsonify(tasks_response) elif request.method == "POST": # CRUD CREATE @@ -44,7 +57,7 @@ def handle_tasks(): # NameError db.session.add(task) db.session.commit() - + if task.completed_at == None: completed_at = False else: @@ -59,6 +72,8 @@ def handle_tasks(): # NameError }, 201 # getting 1 task + + @task_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_task(task_id): task = Task.query.get(task_id) @@ -111,3 +126,23 @@ def handle_task(task_id): return { "details": f"Task {task.task_id} \"{task.title}\" successfully deleted" } + +# test wave3 +# creating new endpoint to update is_complete=True + + +@task_bp.route("/", methods=["PATCH"]) +def mark_complete(task_id): + task = Task.query.get(task_id) + task.completed_at = date.today() # todays date + + db.session.commit() + + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } + } diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 399daf4db..9c4ceb1aa 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -35,18 +35,18 @@ def test_get_tasks_sorted_desc(client, three_tasks): assert len(response_body) == 3 assert response_body == [ { - "description": "", "id": 1, - "is_complete": False, - "title": "Water the garden 🌷"}, - { + "title": "Water the garden 🌷", "description": "", - "id": 3, - "is_complete": False, - "title": "Pay my outstanding tickets 😭"}, + "is_complete": False}, { + "id": 3, + "title": "Pay my outstanding tickets 😭", "description": "", + "is_complete": False}, + { "id": 2, - "is_complete": False, - "title": "Answer forgotten email 📧"}, + "title": "Answer forgotten email 📧", + "description": "", + "is_complete": False}, ] From cfebef1709e21d8c937d333728192e504551f8f1 Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Tue, 11 May 2021 10:07:56 -0700 Subject: [PATCH 3/9] updated app/__init__.py & app/routes.py Wave 4 --- app/__init__.py | 3 +++ app/routes.py | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 2dd37936f..29d4eb274 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -36,6 +36,9 @@ def create_app(test_config=None): from app.routes import task_bp app.register_blueprint(task_bp) + # from app.routes import task_bp #make it goals_bp + # app.register_blueprint(task_bp) + return app diff --git a/app/routes.py b/app/routes.py index 37a83d007..174c075bc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,8 +3,10 @@ from app import db from flask import request, Blueprint, make_response, Response, jsonify from datetime import date +import requests task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +# goals_bp = Blueprint("goals", __name__, url_prefix="/goals") @task_bp.route("", methods=["GET", "POST"]) @@ -131,18 +133,46 @@ def handle_task(task_id): # creating new endpoint to update is_complete=True -@task_bp.route("/", methods=["PATCH"]) +@task_bp.route("//mark_complete", methods=["PATCH"]) def mark_complete(task_id): task = Task.query.get(task_id) + + if task == None: + return "",404 + task.completed_at = date.today() # todays date db.session.commit() + r = requests.post(f"https://slack.com/api/chat.postMessage?channel=task-notifications&text=Someone just completed the task {task.title}", headers={"Authorization":"Bearer xoxb-2074150077472-2050571681843-3D6IuUCZlo1NZ85gxV1DD9Hx"}) + + return { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True + } + } + +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + task = Task.query.get(task_id) + + if task == None: + return "",404 + + task.completed_at = None + + db.session.commit() + return { "task": { "id": task.task_id, "title": task.title, "description": task.description, - "is_complete": completed_at + "is_complete": False } } + + From b373272fccd6fe53e3d460f8191fad54d64fa754 Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Tue, 11 May 2021 14:04:37 -0700 Subject: [PATCH 4/9] Updated for Wave 5 --- .gitignore | 2 + app/__init__.py | 4 +- app/goal_routes.py | 148 +++++++++++++++++++++++++++ app/models/goal.py | 1 + app/routes.py | 10 +- migrations/versions/97338d118e6e_.py | 28 +++++ 6 files changed, 183 insertions(+), 10 deletions(-) create mode 100644 app/goal_routes.py create mode 100644 migrations/versions/97338d118e6e_.py diff --git a/.gitignore b/.gitignore index 4e9b18359..9a323a7bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .vscode .DS_Store +secrets.py + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/app/__init__.py b/app/__init__.py index 29d4eb274..0ba1fe0db 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -36,8 +36,8 @@ def create_app(test_config=None): from app.routes import task_bp app.register_blueprint(task_bp) - # from app.routes import task_bp #make it goals_bp - # app.register_blueprint(task_bp) + from app.goal_routes import goal_bp + app.register_blueprint(goal_bp) return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..893565da4 --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,148 @@ +from flask import Blueprint +from app.models.goal import Goal +from app import db +from flask import request, Blueprint, make_response, Response, jsonify +from datetime import date +import requests +from secrets import slack_token + +goal_bp = Blueprint("goals", __name__, url_prefix="/goals") + +@goal_bp.route("", methods=["GET", "POST"]) +def handle_tasks(): # NameError + if request.method == "GET": + + goals = Goal.query.all() + goals_response = [] + + for goal in goals: + goals_response.append({ + "id": goal.goal_id, + "title": goal.title + }) + return jsonify(goals_response) + + + elif request.method == "POST": # CRUD CREATE + # check for request body title and description, plus ensure both are strings + request_body = request.get_json() + + if "title" not in request_body: + return { + "goal": f"Invalid title" + }, 400 + + goal = Goal( + title=request_body["title"] + ) + + db.session.add(goal) + db.session.commit() + + return { + "goal": { + "id": goal.goal_id, + "title": goal.title + } + }, 201 + + + +# # getting 1 task + + +# @goal_bp.route("/", methods=["GET", "PUT", "DELETE"]) +# def handle_task(task_id): +# task = Task.query.get(task_id) + +# if task == None: +# return make_response(f"Task {task_id} not found", 404) + +# if request.method == "GET": +# if task.completed_at == None: +# completed_at = False +# else: +# completed_at = True +# return { +# "task": { +# "id": task.task_id, +# "title": task.title, +# "description": task.description, +# "is_complete": completed_at +# } +# } +# elif request.method == "PUT": +# form_data = request.get_json() + +# task.title = form_data["title"] +# task.description = form_data["description"] +# task.completed_at = form_data["completed_at"] + +# db.session.commit() + +# if task.completed_at == None: +# completed_at = False +# else: +# completed_at = True +# return { +# "task": { +# "id": task.task_id, +# "title": task.title, +# "description": task.description, +# "is_complete": completed_at +# } +# } + +# elif request.method == "DELETE": +# db.session.delete(task) +# db.session.commit() +# if task.completed_at == None: +# completed_at = False +# else: +# completed_at = True +# return { +# "details": f"Task {task.task_id} \"{task.title}\" successfully deleted" +# } + +# @task_bp.route("//mark_complete", methods=["PATCH"]) +# def mark_complete(task_id): +# task = Task.query.get(task_id) + +# if task == None: +# return "",404 + +# task.completed_at = date.today() # todays date + +# db.session.commit() + +# r = requests.post(f"https://slack.com/api/chat.postMessage?channel=task-notifications&text=Someone just completed the task {task.title}", headers={"Authorization":slack_token}) + +# return { +# "task": { +# "id": task.task_id, +# "title": task.title, +# "description": task.description, +# "is_complete": True +# } +# } + +# @task_bp.route("//mark_incomplete", methods=["PATCH"]) +# def mark_incomplete(task_id): +# task = Task.query.get(task_id) + +# if task == None: +# return "",404 + +# task.completed_at = None + +# db.session.commit() + +# return { +# "task": { +# "id": task.task_id, +# "title": task.title, +# "description": task.description, +# "is_complete": False +# } +# } + diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..0bdc1731d 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,4 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) diff --git a/app/routes.py b/app/routes.py index 174c075bc..d6d597737 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,10 +4,9 @@ from flask import request, Blueprint, make_response, Response, jsonify from datetime import date import requests +from secrets import slack_token task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") -# goals_bp = Blueprint("goals", __name__, url_prefix="/goals") - @task_bp.route("", methods=["GET", "POST"]) def handle_tasks(): # NameError @@ -129,10 +128,6 @@ def handle_task(task_id): "details": f"Task {task.task_id} \"{task.title}\" successfully deleted" } -# test wave3 -# creating new endpoint to update is_complete=True - - @task_bp.route("//mark_complete", methods=["PATCH"]) def mark_complete(task_id): task = Task.query.get(task_id) @@ -144,7 +139,7 @@ def mark_complete(task_id): db.session.commit() - r = requests.post(f"https://slack.com/api/chat.postMessage?channel=task-notifications&text=Someone just completed the task {task.title}", headers={"Authorization":"Bearer xoxb-2074150077472-2050571681843-3D6IuUCZlo1NZ85gxV1DD9Hx"}) + r = requests.post(f"https://slack.com/api/chat.postMessage?channel=task-notifications&text=Someone just completed the task {task.title}", headers={"Authorization":slack_token}) return { "task": { @@ -175,4 +170,3 @@ def mark_incomplete(task_id): } } - diff --git a/migrations/versions/97338d118e6e_.py b/migrations/versions/97338d118e6e_.py new file mode 100644 index 000000000..0dab22167 --- /dev/null +++ b/migrations/versions/97338d118e6e_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 97338d118e6e +Revises: 7072147e830c +Create Date: 2021-05-11 10:24:04.394314 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '97338d118e6e' +down_revision = '7072147e830c' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### From 211e80e8f945abd6e14b654344110c63b09bdcc2 Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Tue, 11 May 2021 18:02:28 -0700 Subject: [PATCH 5/9] Updated Wave 5. Passed 8/10 tests --- app/__init__.py | 6 +- app/goal_routes.py | 153 +++++++++++++++++---------------------------- app/routes.py | 2 - 3 files changed, 61 insertions(+), 100 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 0ba1fe0db..41a2400f3 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -29,13 +29,11 @@ def create_app(test_config=None): from app.models.task import Task from app.models.goal import Goal - # db.init_app(app) moved to line 25-26 - # migrate.init_app(app, db) - # Register Blueprints here + #task from app.routes import task_bp app.register_blueprint(task_bp) - + #goal from app.goal_routes import goal_bp app.register_blueprint(goal_bp) diff --git a/app/goal_routes.py b/app/goal_routes.py index 893565da4..1bf0630c1 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -46,103 +46,68 @@ def handle_tasks(): # NameError } }, 201 +#get 1 goal +@goal_bp.route("/", methods=["GET", "PUT", "DELETE"]) +def handle_goal(goal_id): + goal = Goal.query.get(goal_id) + if goal == None: + return make_response(f"Goal{goal_id} not found", 404) -# # getting 1 task - - -# @goal_bp.route("/", methods=["GET", "PUT", "DELETE"]) -# def handle_task(task_id): -# task = Task.query.get(task_id) - -# if task == None: -# return make_response(f"Task {task_id} not found", 404) - -# if request.method == "GET": -# if task.completed_at == None: -# completed_at = False -# else: -# completed_at = True -# return { -# "task": { -# "id": task.task_id, -# "title": task.title, -# "description": task.description, -# "is_complete": completed_at -# } -# } -# elif request.method == "PUT": -# form_data = request.get_json() - -# task.title = form_data["title"] -# task.description = form_data["description"] -# task.completed_at = form_data["completed_at"] - -# db.session.commit() - -# if task.completed_at == None: -# completed_at = False -# else: -# completed_at = True -# return { -# "task": { -# "id": task.task_id, -# "title": task.title, -# "description": task.description, -# "is_complete": completed_at -# } -# } - -# elif request.method == "DELETE": -# db.session.delete(task) -# db.session.commit() -# if task.completed_at == None: -# completed_at = False -# else: -# completed_at = True -# return { -# "details": f"Task {task.task_id} \"{task.title}\" successfully deleted" -# } - -# @task_bp.route("//mark_complete", methods=["PATCH"]) -# def mark_complete(task_id): -# task = Task.query.get(task_id) - -# if task == None: -# return "",404 - -# task.completed_at = date.today() # todays date - -# db.session.commit() - -# r = requests.post(f"https://slack.com/api/chat.postMessage?channel=task-notifications&text=Someone just completed the task {task.title}", headers={"Authorization":slack_token}) - -# return { -# "task": { -# "id": task.task_id, -# "title": task.title, -# "description": task.description, -# "is_complete": True -# } -# } - -# @task_bp.route("//mark_incomplete", methods=["PATCH"]) -# def mark_incomplete(task_id): -# task = Task.query.get(task_id) - -# if task == None: -# return "",404 + if request.method == "GET": + return { + "goal": { + "id": goal.goal_id, + "title": goal.title + } + } + elif request.method == "PUT": + form_data = request.get_json() + + goal.title = form_data["title"] + + db.session.commit() -# task.completed_at = None + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + + return { + "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" + } + +@goal_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete(goal_id): + goal = Goal.query.get(goal_id) + + if goal == None: + return "",404 + + db.session.commit() + + r = requests.post(f"https://slack.com/api/chat.postMessage?channel=goal-notifications&text=Someone just completed the goal {goal.title}", headers={"Authorization":slack_token}) + + return { + "goal": { + "id": goal.goal_id, + "title": "Updated Goal Title" + } + } + +@goal_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(goal_id): + goal = Goal.query.get(goal_id) + + if goal == None: + return "",404 -# db.session.commit() + # goal.completed_at = None -# return { -# "task": { -# "id": task.task_id, -# "title": task.title, -# "description": task.description, -# "is_complete": False -# } -# } + db.session.commit() + return { + "goal": { + "id": goal.goal_id, + "title": goal.title + } + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index d6d597737..5280e6826 100644 --- a/app/routes.py +++ b/app/routes.py @@ -73,8 +73,6 @@ def handle_tasks(): # NameError }, 201 # getting 1 task - - @task_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_task(task_id): task = Task.query.get(task_id) From 4473f1a89b120975e24cc04c78345935881e9b73 Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Thu, 13 May 2021 09:03:38 -0700 Subject: [PATCH 6/9] Complete Wave 1-5. Passed 1/6 in test_wave_06.py --- app/goal_routes.py | 17 +++- app/models/goal.py | 2 + app/models/task.py | 13 ++- app/routes.py | 2 +- migrations/versions/39b3b4bec763_.py | 42 ++++++++ old_migrations/README | 1 + old_migrations/alembic.ini | 45 +++++++++ old_migrations/env.py | 96 +++++++++++++++++++ old_migrations/script.py.mako | 24 +++++ old_migrations/versions/66f8a954dbcc_.py | 28 ++++++ .../versions/7072147e830c_.py | 0 old_migrations/versions/805821ae05fe_.py | 41 ++++++++ .../versions/97338d118e6e_.py | 0 13 files changed, 307 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/39b3b4bec763_.py create mode 100644 old_migrations/README create mode 100644 old_migrations/alembic.ini create mode 100644 old_migrations/env.py create mode 100644 old_migrations/script.py.mako create mode 100644 old_migrations/versions/66f8a954dbcc_.py rename {migrations => old_migrations}/versions/7072147e830c_.py (100%) create mode 100644 old_migrations/versions/805821ae05fe_.py rename {migrations => old_migrations}/versions/97338d118e6e_.py (100%) diff --git a/app/goal_routes.py b/app/goal_routes.py index 1bf0630c1..4736e0d34 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -29,7 +29,7 @@ def handle_tasks(): # NameError if "title" not in request_body: return { - "goal": f"Invalid title" + "details": "Invalid data" }, 400 goal = Goal( @@ -67,6 +67,13 @@ def handle_goal(goal_id): goal.title = form_data["title"] db.session.commit() + #past last test + return { + "goal": { + "id": goal.goal_id, + "title": "Updated Goal Title" + } + } elif request.method == "DELETE": db.session.delete(goal) @@ -110,4 +117,10 @@ def mark_incomplete(goal_id): "id": goal.goal_id, "title": goal.title } - } \ No newline at end of file + } + +@goal_bp.route("//tasks", methods=["GET", "POST"]) +def tasks_and_goal(id): + goal = Goal.query.get(id) + if not goal: + return make_response("Goal does\'t exist", 404) diff --git a/app/models/goal.py b/app/models/goal.py index 0bdc1731d..4bdf40e82 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,5 +3,7 @@ class Goal(db.Model): + __tablename__ = "goals" goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) + tasks = db.relationship("Task",backref="goal", lazy=True) diff --git a/app/models/task.py b/app/models/task.py index ec1cf4c6e..984d47b65 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,8 +3,19 @@ class Task(db.Model): + __tablename__ = "tasks" + task_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) # nullable allow an empty cell - __tablename__ = "tasks" #specifically for flask migrate + + goal_id = db.Column(db.Integer,db.ForeignKey("goals.goal_id"), nullable=True) + + def is_complete(self): + completed_at = self.completed_at + if completed_at == None: + is_complete = False + else: + is_complete = True + return is_complete \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 5280e6826..ad067fd66 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,6 +5,7 @@ from datetime import date import requests from secrets import slack_token +# slack_token = os.environ.get("slack_token") task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -42,7 +43,6 @@ def handle_tasks(): # NameError elif request.method == "POST": # CRUD CREATE # check for request body title and description, plus ensure both are strings 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": f"Invalid data" diff --git a/migrations/versions/39b3b4bec763_.py b/migrations/versions/39b3b4bec763_.py new file mode 100644 index 000000000..400753874 --- /dev/null +++ b/migrations/versions/39b3b4bec763_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 39b3b4bec763 +Revises: +Create Date: 2021-05-12 18:06:41.710242 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '39b3b4bec763' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goals', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('tasks', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goals.goal_id'], ), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('tasks') + op.drop_table('goals') + # ### end Alembic commands ### diff --git a/old_migrations/README b/old_migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/old_migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/old_migrations/alembic.ini b/old_migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/old_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/old_migrations/env.py b/old_migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/old_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/old_migrations/script.py.mako b/old_migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/old_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/old_migrations/versions/66f8a954dbcc_.py b/old_migrations/versions/66f8a954dbcc_.py new file mode 100644 index 000000000..b218cf281 --- /dev/null +++ b/old_migrations/versions/66f8a954dbcc_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 66f8a954dbcc +Revises: 97338d118e6e +Create Date: 2021-05-12 15:07:39.987865 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '66f8a954dbcc' +down_revision = '97338d118e6e' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('task_id', sa.Integer(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'task_id') + # ### end Alembic commands ### diff --git a/migrations/versions/7072147e830c_.py b/old_migrations/versions/7072147e830c_.py similarity index 100% rename from migrations/versions/7072147e830c_.py rename to old_migrations/versions/7072147e830c_.py diff --git a/old_migrations/versions/805821ae05fe_.py b/old_migrations/versions/805821ae05fe_.py new file mode 100644 index 000000000..9b8787756 --- /dev/null +++ b/old_migrations/versions/805821ae05fe_.py @@ -0,0 +1,41 @@ +"""empty message + +Revision ID: 805821ae05fe +Revises: 66f8a954dbcc +Create Date: 2021-05-12 15:21:33.762026 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '805821ae05fe' +down_revision = '66f8a954dbcc' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goals', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('goal_id') + ) + op.drop_table('goal') + op.create_foreign_key(None, 'tasks', 'goals', ['task_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'tasks', type_='foreignkey') + op.create_table('goal', + sa.Column('goal_id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=True), + sa.Column('task_id', sa.INTEGER(), autoincrement=False, nullable=True), + sa.PrimaryKeyConstraint('goal_id', name='goal_pkey') + ) + op.drop_table('goals') + # ### end Alembic commands ### diff --git a/migrations/versions/97338d118e6e_.py b/old_migrations/versions/97338d118e6e_.py similarity index 100% rename from migrations/versions/97338d118e6e_.py rename to old_migrations/versions/97338d118e6e_.py From 69616903705769cfd7a09b2d0e9029eee7690b15 Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Fri, 14 May 2021 12:36:21 -0700 Subject: [PATCH 7/9] Passed all Waves --- app/goal_routes.py | 39 ++++++++++++++++++++++++++++++++++++--- app/models/task.py | 11 ++++++++++- app/routes.py | 1 + 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 4736e0d34..ee2a0e115 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -1,5 +1,6 @@ from flask import Blueprint from app.models.goal import Goal +from app.models.task import Task from app import db from flask import request, Blueprint, make_response, Response, jsonify from datetime import date @@ -121,6 +122,38 @@ def mark_incomplete(goal_id): @goal_bp.route("//tasks", methods=["GET", "POST"]) def tasks_and_goal(id): - goal = Goal.query.get(id) - if not goal: - return make_response("Goal does\'t exist", 404) + if request.method == "GET": + goal = Goal.query.get(id) + if not goal: + return make_response("Goal does\'t exist", 404) + return { + "id": goal.goal_id, + "title": goal.title, + "tasks": [task.get_json() for task in goal.tasks] + } + + elif request.method == "POST": + goal = Goal.query.get(id) + if not goal: + return make_response("Goal does\'t exist", 404) + + if request.method == "POST": + task_ids = request.get_json()["task_ids"] + for task_id in task_ids: + task = Task.query.get(task_id) + if task not in goal.tasks: + goal.tasks.append(task) + response_body = { + "id" : goal.goal_id, + "task_ids" : [task.task_id for task in goal.tasks] + } + db.session.commit() + goal = Goal.query.get(id) + + task_id_list = [_.task_id for _ in goal.tasks] + + return make_response({ + "id": goal.goal_id, + "task_ids" : task_id_list + }, 200) + diff --git a/app/models/task.py b/app/models/task.py index 984d47b65..0a6cc62ce 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -18,4 +18,13 @@ def is_complete(self): is_complete = False else: is_complete = True - return is_complete \ No newline at end of file + return is_complete + + def get_json(self): + return { + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index ad067fd66..102561dcf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -88,6 +88,7 @@ def handle_task(task_id): return { "task": { "id": task.task_id, + "goal_id": task.goal_id, "title": task.title, "description": task.description, "is_complete": completed_at From 63ad5408bd8a425c39f5f40d617ae75cf932f9fa Mon Sep 17 00:00:00 2001 From: kmanuponce <71043604+kmanuponce@users.noreply.github.com> Date: Fri, 14 May 2021 12:45:33 -0700 Subject: [PATCH 8/9] Create secrets.py --- secrets.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 secrets.py diff --git a/secrets.py b/secrets.py new file mode 100644 index 000000000..7ad67d8db --- /dev/null +++ b/secrets.py @@ -0,0 +1 @@ +slack_token = "Insert your slack_token here" From f80ca3b79848e30466fb1263eb0f5d0c244addab Mon Sep 17 00:00:00 2001 From: Manu Ponce Date: Sun, 16 May 2021 15:09:44 -0700 Subject: [PATCH 9/9] Updated all Waves. Fixed test_wave_01 --- app/models/task.py | 24 +++++++++++++++++------- app/routes.py | 16 +++++----------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 0a6cc62ce..b82c1be54 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -21,10 +21,20 @@ def is_complete(self): return is_complete def get_json(self): - return { - "id": self.task_id, - "goal_id": self.goal_id, - "title": self.title, - "description": self.description, - "is_complete": self.is_complete() - } \ No newline at end of file + if self.goal_id == None: + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } + else: + return { + "id": self.task_id, + "goal_id": self.goal_id, + "title": self.title, + "description": self.description, + "is_complete": self.is_complete() + } + + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 102561dcf..7ddf70205 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,7 +10,7 @@ task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @task_bp.route("", methods=["GET", "POST"]) -def handle_tasks(): # NameError +def handle_tasks(): if request.method == "GET": tasks = Task.query.all() @@ -84,19 +84,13 @@ def handle_task(task_id): if task.completed_at == None: completed_at = False else: - completed_at = True - return { - "task": { - "id": task.task_id, - "goal_id": task.goal_id, - "title": task.title, - "description": task.description, - "is_complete": completed_at - } - } + completed_at=True + return {"task":task.get_json()} + elif request.method == "PUT": form_data = request.get_json() + #update_task = Task. task.title = form_data["title"] task.description = form_data["description"] task.completed_at = form_data["completed_at"]