From 268633bda9e988eb4f0c50835855fa58067787f7 Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Wed, 9 Jun 2021 21:56:32 -0700 Subject: [PATCH 1/9] Passes w1 & w2 --- app/__init__.py | 6 +- app/models/task.py | 3 + app/routes.py | 124 +++++++++++++++++++++++++++ migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++ migrations/env.py | 96 +++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/298e780de863_.py | 34 ++++++++ migrations/versions/62d9c2bae940_.py | 34 ++++++++ migrations/versions/d6ea67b8c9e4_.py | 28 ++++++ 10 files changed, 394 insertions(+), 1 deletion(-) 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/298e780de863_.py create mode 100644 migrations/versions/62d9c2bae940_.py create mode 100644 migrations/versions/d6ea67b8c9e4_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..edf639261 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -24,11 +24,15 @@ def create_app(test_config=None): # Import models here for Alembic setup from app.models.task import Task - from app.models.goal import Goal + # from app.models.goal import Goal db.init_app(app) migrate.init_app(app, db) # Register Blueprints here + 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/task.py b/app/models/task.py index 39c89cd16..665ee0800 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -4,3 +4,6 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..3559a9022 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,126 @@ +from app import db +import datetime from flask import Blueprint +from flask import request +from flask import jsonify +from .models.task import Task +# from .models.goal import Goal +from flask import make_response +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST", "GET"]) +def handle_tasks(): + if request.method == "GET": + tasks = Task.query.all() + tasks_response = [] + for task in tasks: + tasks_response.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + }) + sort_by_title = request.args.get("sort") + if sort_by_title: + if sort_by_title == "asc": + tasks_response = sorted(tasks_response, key = lambda i: i['title']) + if sort_by_title == "desc": + tasks_response = sorted(tasks_response, key = lambda i: i['title'],reverse=True) + return jsonify(tasks_response), 200 + + elif 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 + 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() + + return { + "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": True if new_task.completed_at else False + } + }, 201 + +@tasks_bp.route("/", methods=["GET", "DELETE", "PUT"]) +def handle_task(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + if request.method == "GET": + return { + "task":{ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + } + } + elif request.method == "DELETE": + message = {"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"} + db.session.delete(task) + db.session.commit() + return make_response(message) + 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() + + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + } + }) + +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def handle_task_completion(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + task.completed_at = datetime.datetime() + db.session.commit() + + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True + } + }) + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def handle_task_incompletion(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response("", 404) + + task.completed_at = None + + db.session.commit() + + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + }) \ No newline at end of file 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/298e780de863_.py b/migrations/versions/298e780de863_.py new file mode 100644 index 000000000..a1ad59750 --- /dev/null +++ b/migrations/versions/298e780de863_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 298e780de863 +Revises: +Create Date: 2021-06-09 18:48:40.542457 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '298e780de863' +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(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.String(), 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/migrations/versions/62d9c2bae940_.py b/migrations/versions/62d9c2bae940_.py new file mode 100644 index 000000000..ba091b179 --- /dev/null +++ b/migrations/versions/62d9c2bae940_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 62d9c2bae940 +Revises: d6ea67b8c9e4 +Create Date: 2021-06-09 19:57:13.100590 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '62d9c2bae940' +down_revision = 'd6ea67b8c9e4' +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(), 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/migrations/versions/d6ea67b8c9e4_.py b/migrations/versions/d6ea67b8c9e4_.py new file mode 100644 index 000000000..933fb2177 --- /dev/null +++ b/migrations/versions/d6ea67b8c9e4_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: d6ea67b8c9e4 +Revises: 298e780de863 +Create Date: 2021-06-09 19:22:08.858233 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd6ea67b8c9e4' +down_revision = '298e780de863' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### From 9c7f46d274ac09c2ff7728d292dcddff79a3d301 Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Thu, 10 Jun 2021 10:09:17 -0700 Subject: [PATCH 2/9] Wave03 passes --- app/routes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3559a9022..1e0061f46 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,5 +1,5 @@ from app import db -import datetime +from datetime import datetime from flask import Blueprint from flask import request from flask import jsonify @@ -89,12 +89,12 @@ def handle_task(task_id): }) @tasks_bp.route("//mark_complete", methods=["PATCH"]) -def handle_task_completion(task_id): +def handle_task_complete(task_id): task = Task.query.get(task_id) if task is None: return make_response("", 404) - task.completed_at = datetime.datetime() + task.completed_at = datetime.utcnow() db.session.commit() return make_response({ @@ -107,7 +107,7 @@ def handle_task_completion(task_id): }) @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) -def handle_task_incompletion(task_id): +def handle_task_incomplete(task_id): task = Task.query.get(task_id) if task is None: return make_response("", 404) From 1a900f82d3e119318230f6c1bb1d442fa2b8c6a0 Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Mon, 14 Jun 2021 22:54:15 -0700 Subject: [PATCH 3/9] Wave 6 passes --- app/__init__.py | 6 +- app/models/goal.py | 2 + app/models/task.py | 4 +- app/routes.py | 126 ++++++++++++++++++++++++++- migrations/versions/25240101bad7_.py | 32 +++++++ migrations/versions/d152779302aa_.py | 30 +++++++ 6 files changed, 192 insertions(+), 8 deletions(-) create mode 100644 migrations/versions/25240101bad7_.py create mode 100644 migrations/versions/d152779302aa_.py diff --git a/app/__init__.py b/app/__init__.py index edf639261..287c991c2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -24,15 +24,15 @@ def create_app(test_config=None): # Import models here for Alembic setup from app.models.task import Task - # from app.models.goal import Goal + from app.models.goal import Goal db.init_app(app) migrate.init_app(app, db) # Register Blueprints here from .routes import tasks_bp - # from .routes import goals_bp + from .routes import goals_bp app.register_blueprint(tasks_bp) - # app.register_blueprint(goals_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..2335366c9 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,5 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + tasks = db.relationship('Task', backref='goal', lazy=True) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 665ee0800..31f0c5dcc 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,4 +6,6 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) description = db.Column(db.String) - completed_at = db.Column(db.DateTime) \ No newline at end of file + completed_at = db.Column(db.DateTime) + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), + nullable=True) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 1e0061f46..a14d0a414 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,10 +4,15 @@ from flask import request from flask import jsonify from .models.task import Task -# from .models.goal import Goal +from .models.goal import Goal from flask import make_response +import requests +import os +from dotenv import load_dotenv +load_dotenv() tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") @tasks_bp.route("", methods=["POST", "GET"]) def handle_tasks(): @@ -57,13 +62,16 @@ def handle_task(task_id): return make_response("", 404) if request.method == "GET": - return { - "task":{ + result = { "id": task.task_id, "title": task.title, "description": task.description, "is_complete": True if task.completed_at else False } + if task.goal_id: + result["goal_id"] = task.goal_id + return { + "task": result } elif request.method == "DELETE": message = {"details": f"Task {task.task_id} \"{task.title}\" successfully deleted"} @@ -97,6 +105,11 @@ def handle_task_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() + response = requests.post('https://slack.com/api/chat.postMessage', params={'channel':'task-notifications', 'text': f'Someone just completed the task {task.title}'}, headers={'Authorization': os.environ.get("SLACKBOT_API_KEY")}) + + json_response = response.json() + print(json_response) + return make_response({ "task": { "id": task.task_id, @@ -123,4 +136,109 @@ def handle_task_incomplete(task_id): "description": task.description, "is_complete": False } - }) \ No newline at end of file + }) + +@goals_bp.route("", methods=["POST", "GET"]) +def handle_goals(): + if request.method == "GET": + goals = Goal.query.all() + goals_response = [] + for goal in goals: + goals_response.append({ + "id": goal.goal_id, + "title": goal.title + }) + sort_by_title = request.args.get("sort") + if sort_by_title: + if sort_by_title == "asc": + goals_response = sorted(goals_response, key = lambda i: i['title']) + if sort_by_title == "desc": + goals_response = sorted(goals_response, key = lambda i: i['title'],reverse=True) + return jsonify(goals_response), 200 + + elif request.method == "POST": + request_body = request.get_json() + if 'title' not in request_body: + return {"details": "Invalid data"}, 400 + new_goal = Goal(title=request_body["title"]) + + db.session.add(new_goal) + db.session.commit() + + return { + "goal": { + "id": new_goal.goal_id, + "title": new_goal.title + } + }, 201 + +@goals_bp.route("/", methods=["GET", "DELETE", "PUT"]) +def handle_goal(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return make_response("", 404) + + if request.method == "GET": + return { + "goal":{ + "id": goal.goal_id, + "title": goal.title + } + } + elif request.method == "DELETE": + message = {"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"} + db.session.delete(goal) + db.session.commit() + return make_response(message) + elif request.method == "PUT": + form_data = request.get_json() + + goal.title = form_data["title"] + + db.session.commit() + + return make_response({ + "goal": { + "id": goal.goal_id, + "title": goal.title + } + }) + +@goals_bp.route("//tasks", methods=["POST", "GET"]) +def handle_goal_tasks(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return make_response("", 404) + + if request.method == "GET": + tasks = Task.query.filter(Task.goal_id == goal_id) + results = [] + for task in tasks: + results.append({ + "id": task.task_id, + "goal_id": task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": True if task.completed_at else False + }) + + return make_response( + { + "id": goal.goal_id, + "title": goal.title, + "tasks": results + }, 200) + elif request.method == "POST": + form_data = request.get_json() + task_ids = form_data['task_ids'] + + for id in task_ids: + task = Task.query.get(id) + task.goal_id = goal_id + db.session.commit() + + return make_response( + { + "id": goal.goal_id, + "task_ids": task_ids + }, 200) diff --git a/migrations/versions/25240101bad7_.py b/migrations/versions/25240101bad7_.py new file mode 100644 index 000000000..9580bd50f --- /dev/null +++ b/migrations/versions/25240101bad7_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 25240101bad7 +Revises: 62d9c2bae940 +Create Date: 2021-06-14 19:31:21.771407 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '25240101bad7' +down_revision = '62d9c2bae940' +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.Column('title', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('goal_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/migrations/versions/d152779302aa_.py b/migrations/versions/d152779302aa_.py new file mode 100644 index 000000000..a56aeb14a --- /dev/null +++ b/migrations/versions/d152779302aa_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: d152779302aa +Revises: 25240101bad7 +Create Date: 2021-06-14 20:38:42.123201 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd152779302aa' +down_revision = '25240101bad7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### From 60bc6d4f4d4021c893e016e0406b07635c2ef1ee Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Mon, 14 Jun 2021 23:01:37 -0700 Subject: [PATCH 4/9] Adds Procfile --- 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 5d8ab02160e16d789615f9987148cbc6b7995f4c Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Tue, 15 Jun 2021 00:04:24 -0700 Subject: [PATCH 5/9] delete existing migrations and init again --- migrations/versions/25240101bad7_.py | 32 -------------------------- migrations/versions/298e780de863_.py | 34 ---------------------------- migrations/versions/62d9c2bae940_.py | 34 ---------------------------- migrations/versions/d152779302aa_.py | 30 ------------------------ migrations/versions/d6ea67b8c9e4_.py | 28 ----------------------- 5 files changed, 158 deletions(-) delete mode 100644 migrations/versions/25240101bad7_.py delete mode 100644 migrations/versions/298e780de863_.py delete mode 100644 migrations/versions/62d9c2bae940_.py delete mode 100644 migrations/versions/d152779302aa_.py delete mode 100644 migrations/versions/d6ea67b8c9e4_.py diff --git a/migrations/versions/25240101bad7_.py b/migrations/versions/25240101bad7_.py deleted file mode 100644 index 9580bd50f..000000000 --- a/migrations/versions/25240101bad7_.py +++ /dev/null @@ -1,32 +0,0 @@ -"""empty message - -Revision ID: 25240101bad7 -Revises: 62d9c2bae940 -Create Date: 2021-06-14 19:31:21.771407 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '25240101bad7' -down_revision = '62d9c2bae940' -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.Column('title', sa.String(), nullable=True), - sa.PrimaryKeyConstraint('goal_id') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('goal') - # ### end Alembic commands ### diff --git a/migrations/versions/298e780de863_.py b/migrations/versions/298e780de863_.py deleted file mode 100644 index a1ad59750..000000000 --- a/migrations/versions/298e780de863_.py +++ /dev/null @@ -1,34 +0,0 @@ -"""empty message - -Revision ID: 298e780de863 -Revises: -Create Date: 2021-06-09 18:48:40.542457 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '298e780de863' -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(), nullable=False), - sa.Column('title', sa.String(), nullable=True), - sa.Column('description', sa.String(), nullable=True), - sa.Column('completed_at', sa.String(), 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/migrations/versions/62d9c2bae940_.py b/migrations/versions/62d9c2bae940_.py deleted file mode 100644 index ba091b179..000000000 --- a/migrations/versions/62d9c2bae940_.py +++ /dev/null @@ -1,34 +0,0 @@ -"""empty message - -Revision ID: 62d9c2bae940 -Revises: d6ea67b8c9e4 -Create Date: 2021-06-09 19:57:13.100590 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '62d9c2bae940' -down_revision = 'd6ea67b8c9e4' -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(), 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/migrations/versions/d152779302aa_.py b/migrations/versions/d152779302aa_.py deleted file mode 100644 index a56aeb14a..000000000 --- a/migrations/versions/d152779302aa_.py +++ /dev/null @@ -1,30 +0,0 @@ -"""empty message - -Revision ID: d152779302aa -Revises: 25240101bad7 -Create Date: 2021-06-14 20:38:42.123201 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'd152779302aa' -down_revision = '25240101bad7' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) - op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'task', type_='foreignkey') - op.drop_column('task', 'goal_id') - # ### end Alembic commands ### diff --git a/migrations/versions/d6ea67b8c9e4_.py b/migrations/versions/d6ea67b8c9e4_.py deleted file mode 100644 index 933fb2177..000000000 --- a/migrations/versions/d6ea67b8c9e4_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: d6ea67b8c9e4 -Revises: 298e780de863 -Create Date: 2021-06-09 19:22:08.858233 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'd6ea67b8c9e4' -down_revision = '298e780de863' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'is_complete') - # ### end Alembic commands ### From b7ab4850086cda93f284ce99f24d7dceb96ce1f7 Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Tue, 15 Jun 2021 00:16:27 -0700 Subject: [PATCH 6/9] clear migrations again --- migrations/README | 1 - migrations/alembic.ini | 45 ------------------ migrations/env.py | 96 --------------------------------------- migrations/script.py.mako | 24 ---------- 4 files changed, 166 deletions(-) delete mode 100644 migrations/README delete mode 100644 migrations/alembic.ini delete mode 100644 migrations/env.py delete mode 100644 migrations/script.py.mako diff --git a/migrations/README b/migrations/README deleted file mode 100644 index 98e4f9c44..000000000 --- a/migrations/README +++ /dev/null @@ -1 +0,0 @@ -Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini deleted file mode 100644 index f8ed4801f..000000000 --- a/migrations/alembic.ini +++ /dev/null @@ -1,45 +0,0 @@ -# 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 deleted file mode 100644 index 8b3fb3353..000000000 --- a/migrations/env.py +++ /dev/null @@ -1,96 +0,0 @@ -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 deleted file mode 100644 index 2c0156303..000000000 --- a/migrations/script.py.mako +++ /dev/null @@ -1,24 +0,0 @@ -"""${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"} From af79efe30bc0a3256224bb154d78e6ad85564335 Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Tue, 15 Jun 2021 00:18:14 -0700 Subject: [PATCH 7/9] add migrations --- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++ migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++++ 4 files changed, 166 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako 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"} From 0deabfafcce10ea9287611dbb4be745ccd01fa2b Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Tue, 15 Jun 2021 00:27:58 -0700 Subject: [PATCH 8/9] Add migrations --- migrations/versions/8ae976ea6162_.py | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 migrations/versions/8ae976ea6162_.py diff --git a/migrations/versions/8ae976ea6162_.py b/migrations/versions/8ae976ea6162_.py new file mode 100644 index 000000000..d9e83a270 --- /dev/null +++ b/migrations/versions/8ae976ea6162_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 8ae976ea6162 +Revises: +Create Date: 2021-06-15 00:27:27.886840 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8ae976ea6162' +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.Column('title', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('completed_at', sa.DateTime(), nullable=True), + sa.Column('goal_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### From 09c85cf7d8a2e25f332de96ce0421fd1cb56b881 Mon Sep 17 00:00:00 2001 From: Karolina Benitez Date: Tue, 15 Jun 2021 14:53:47 -0700 Subject: [PATCH 9/9] Refactor db commit --- app/routes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index a14d0a414..43569a970 100644 --- a/app/routes.py +++ b/app/routes.py @@ -235,7 +235,8 @@ def handle_goal_tasks(goal_id): for id in task_ids: task = Task.query.get(id) task.goal_id = goal_id - db.session.commit() + + db.session.commit() return make_response( {