From def3a08c8fb1993d597741585c73490c3141496d Mon Sep 17 00:00:00 2001 From: clear Date: Thu, 10 Jun 2021 11:47:56 -0700 Subject: [PATCH 01/12] building the task model --- app/models/task.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..1efaf519d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,24 @@ from flask import current_app +from datetime import datetime from app import db - class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + 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) + goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + + def to_json(self): + if self.completed_at: + completed = True + else: + completed = False + + return { + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": completed, + # "goal_id": self.goal_id # if the task belongs a goal add if not do not add + } \ No newline at end of file From 083c2554a527d3ce9e3f8afe7afd283f8dc2b0c8 Mon Sep 17 00:00:00 2001 From: clear Date: Thu, 10 Jun 2021 11:50:11 -0700 Subject: [PATCH 02/12] beginning of routes --- app/__init__.py | 2 ++ app/routes.py | 86 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..845c61776 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import task_bp + app.register_blueprint(task_bp) return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..a4e7743d8 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,86 @@ -from flask import Blueprint +from app import db +from flask import Blueprint, json +from sqlalchemy import asc, desc +from app.models.task import Task +from flask import request, make_response, jsonify + + +task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +# return all tasks +@task_bp.route("/", methods=["GET", "POST"], strict_slashes = False) +def handle_tasks(): + if request.method == "GET": + + # tasks by asc and desc order + sort_by_url = request.args.get("sort") # query parameters and replace the previous query + if sort_by_url == "asc": # this is a list queried by title in asc order + tasks = Task.query.order_by(Task.title.asc()).all() + elif sort_by_url == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.all() + # end of the new code + + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_json()) + return jsonify(tasks_response), 200 + +#create a task with null completed at + elif request.method == "POST": + request_body = request.get_json() + if "title" in request_body and "description" in request_body and "completed_at" in request_body: + + new_task = Task(title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"]) + + db.session.add(new_task) # "adds model to the db" + db.session.commit() # commits the action above + return { + "task": new_task.to_json() + }, 201 + + return {"details": "Invalid data"}, 400 + +# return one task +@task_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes = False) +def handle_task(task_id): + task = Task.query.get(task_id) + + if request.method == "GET": + if task is None: + return make_response(f"Task #{task_id} not found"), 404 + return { + "task": task.to_json() + }, 200 + + # Update a task + elif request.method == "PUT": + if task is None: + return make_response(f"Task #{task_id} not found"), 404 + form_data = request.get_json() + if "title" in form_data or "description" in form_data or "completed_at" in form_data: + task.title = form_data["title"] + task.description = form_data["description"] + task.completed_at = form_data["completed_at"] + + db.session.commit() + return { + "task": task.to_json() + }, 200 + + + # Delete a task + elif request.method == "DELETE": + if not task: + return "", 404 + db.session.delete(task) + db.session.commit() + return { + "details": f"Task {task_id} \"{task.title}\" successfully deleted" + }, 200 + + From 1f1a276af68b37153e3aaf9c204dfbc8ff4caa44 Mon Sep 17 00:00:00 2001 From: clear Date: Thu, 10 Jun 2021 11:51:11 -0700 Subject: [PATCH 03/12] adds migrations --- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/0b4171c0a67a_.py | 36 +++++++++++ migrations/versions/47f50ee44cd9_.py | 36 +++++++++++ migrations/versions/9941ac5caceb_.py | 34 ++++++++++ migrations/versions/ba37534e9c64_.py | 28 ++++++++ migrations/versions/cdf1e373b2ae_.py | 30 +++++++++ 9 files changed, 330 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 create mode 100644 migrations/versions/0b4171c0a67a_.py create mode 100644 migrations/versions/47f50ee44cd9_.py create mode 100644 migrations/versions/9941ac5caceb_.py create mode 100644 migrations/versions/ba37534e9c64_.py create mode 100644 migrations/versions/cdf1e373b2ae_.py 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/0b4171c0a67a_.py b/migrations/versions/0b4171c0a67a_.py new file mode 100644 index 000000000..90a8f0a31 --- /dev/null +++ b/migrations/versions/0b4171c0a67a_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: 0b4171c0a67a +Revises: cdf1e373b2ae +Create Date: 2021-06-09 14:02:26.138063 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '0b4171c0a67a' +down_revision = 'cdf1e373b2ae' +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.alter_column('task', 'completed_at', + existing_type=postgresql.TIMESTAMP(), + nullable=True) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.alter_column('task', 'completed_at', + existing_type=postgresql.TIMESTAMP(), + nullable=False) + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/47f50ee44cd9_.py b/migrations/versions/47f50ee44cd9_.py new file mode 100644 index 000000000..e442b1c1d --- /dev/null +++ b/migrations/versions/47f50ee44cd9_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: 47f50ee44cd9 +Revises: +Create Date: 2021-06-07 15:37:37.954544 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '47f50ee44cd9' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goal', + sa.Column('goal_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('goal_id') + ) + op.create_table('task', + sa.Column('task_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + op.drop_table('goal') + # ### end Alembic commands ### diff --git a/migrations/versions/9941ac5caceb_.py b/migrations/versions/9941ac5caceb_.py new file mode 100644 index 000000000..0022880ec --- /dev/null +++ b/migrations/versions/9941ac5caceb_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 9941ac5caceb +Revises: 47f50ee44cd9 +Create Date: 2021-06-07 18:13:32.794958 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9941ac5caceb' +down_revision = '47f50ee44cd9' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=False)) + op.add_column('task', sa.Column('description', sa.String(), nullable=True)) + op.add_column('task', sa.Column('is_complete', sa.String(), nullable=False)) + op.add_column('task', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'title') + op.drop_column('task', 'is_complete') + op.drop_column('task', 'description') + op.drop_column('task', 'completed_at') + # ### end Alembic commands ### diff --git a/migrations/versions/ba37534e9c64_.py b/migrations/versions/ba37534e9c64_.py new file mode 100644 index 000000000..0852884b5 --- /dev/null +++ b/migrations/versions/ba37534e9c64_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: ba37534e9c64 +Revises: 9941ac5caceb +Create Date: 2021-06-07 18:57:25.644862 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ba37534e9c64' +down_revision = '9941ac5caceb' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task', 'is_complete') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('is_complete', sa.VARCHAR(), autoincrement=False, nullable=False)) + # ### end Alembic commands ### diff --git a/migrations/versions/cdf1e373b2ae_.py b/migrations/versions/cdf1e373b2ae_.py new file mode 100644 index 000000000..82bc76e94 --- /dev/null +++ b/migrations/versions/cdf1e373b2ae_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: cdf1e373b2ae +Revises: ba37534e9c64 +Create Date: 2021-06-07 19:01:24.257316 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cdf1e373b2ae' +down_revision = 'ba37534e9c64' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('id', sa.Integer(), autoincrement=True, nullable=False)) + op.drop_column('task', 'task_id') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('task_id', sa.INTEGER(), autoincrement=True, nullable=False)) + op.drop_column('task', 'id') + # ### end Alembic commands ### From 9d2425869f2bd23ce1ae330862d6d7eb6cef6bc6 Mon Sep 17 00:00:00 2001 From: clear Date: Thu, 10 Jun 2021 15:48:58 -0700 Subject: [PATCH 04/12] wave one completed --- app/models/task.py | 29 ++++---- app/routes.py | 71 ++++++++++++++----- migrations/versions/0b4171c0a67a_.py | 36 ---------- migrations/versions/9941ac5caceb_.py | 34 --------- migrations/versions/ba37534e9c64_.py | 28 -------- migrations/versions/cdf1e373b2ae_.py | 30 -------- .../{47f50ee44cd9_.py => d5d6e5350ef2_.py} | 11 ++- 7 files changed, 75 insertions(+), 164 deletions(-) delete mode 100644 migrations/versions/0b4171c0a67a_.py delete mode 100644 migrations/versions/9941ac5caceb_.py delete mode 100644 migrations/versions/ba37534e9c64_.py delete mode 100644 migrations/versions/cdf1e373b2ae_.py rename migrations/versions/{47f50ee44cd9_.py => d5d6e5350ef2_.py} (65%) diff --git a/app/models/task.py b/app/models/task.py index 1efaf519d..ff736965a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,24 +1,23 @@ from flask import current_app -from datetime import datetime from app import db class Task(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) + 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) + completed_at = db.Column(db.DateTime, nullable=True) goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) - def to_json(self): - if self.completed_at: - completed = True - else: - completed = False + # def to_json(self): + # if self.completed_at: + # completed = True + # else: + # completed = False - return { - "id": self.id, - "title": self.title, - "description": self.description, - "is_complete": completed, - # "goal_id": self.goal_id # if the task belongs a goal add if not do not add - } \ No newline at end of file + # return { + # "id": self.id, + # "title": self.title, + # "description": self.description, + # "is_complete": completed, + # # "goal_id": self.goal_id # if the task belongs a goal add if not do not add + # } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index a4e7743d8..8925e9ae7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -24,25 +24,47 @@ def handle_tasks(): tasks_response = [] for task in tasks: - tasks_response.append(task.to_json()) - return jsonify(tasks_response), 200 + if task.completed_at == None: + completed_at = False + else: + task.completed_at = True + tasks_response.append({ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at, + }) + return make_response(jsonify(tasks_response), 200) + #create a task with null completed at elif request.method == "POST": - request_body = request.get_json() - if "title" in request_body and "description" in request_body and "completed_at" in request_body: + 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 + + if not "completed_at" in request_body or not request_body["completed_at"]: + completed_at = False + else: + completed_at = request_body["completed_at"] + + new_task = Task( + title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"] + ) - new_task = Task(title=request_body["title"], - description=request_body["description"], - completed_at=request_body["completed_at"]) + db.session.add(new_task) # "adds model to the db" + db.session.commit() # commits the action above - db.session.add(new_task) # "adds model to the db" - db.session.commit() # commits the action above - return { - "task": new_task.to_json() - }, 201 - - return {"details": "Invalid data"}, 400 + return make_response({ + "task":{ + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": completed_at + } + }), 201 # return one task @task_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes = False) @@ -52,8 +74,17 @@ def handle_task(task_id): if request.method == "GET": if task is None: return make_response(f"Task #{task_id} not found"), 404 + if not task.completed_at: + completed_at = False + else: + completed_at = task.completed_at["completed_at"] return { - "task": task.to_json() + "task":{ + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": completed_at + } }, 200 # Update a task @@ -68,9 +99,13 @@ def handle_task(task_id): db.session.commit() return { - "task": task.to_json() - }, 200 - + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + }, 200 # Delete a task elif request.method == "DELETE": diff --git a/migrations/versions/0b4171c0a67a_.py b/migrations/versions/0b4171c0a67a_.py deleted file mode 100644 index 90a8f0a31..000000000 --- a/migrations/versions/0b4171c0a67a_.py +++ /dev/null @@ -1,36 +0,0 @@ -"""empty message - -Revision ID: 0b4171c0a67a -Revises: cdf1e373b2ae -Create Date: 2021-06-09 14:02:26.138063 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -# revision identifiers, used by Alembic. -revision = '0b4171c0a67a' -down_revision = 'cdf1e373b2ae' -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.alter_column('task', 'completed_at', - existing_type=postgresql.TIMESTAMP(), - nullable=True) - op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'task', type_='foreignkey') - op.alter_column('task', 'completed_at', - existing_type=postgresql.TIMESTAMP(), - nullable=False) - op.drop_column('task', 'goal_id') - # ### end Alembic commands ### diff --git a/migrations/versions/9941ac5caceb_.py b/migrations/versions/9941ac5caceb_.py deleted file mode 100644 index 0022880ec..000000000 --- a/migrations/versions/9941ac5caceb_.py +++ /dev/null @@ -1,34 +0,0 @@ -"""empty message - -Revision ID: 9941ac5caceb -Revises: 47f50ee44cd9 -Create Date: 2021-06-07 18:13:32.794958 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '9941ac5caceb' -down_revision = '47f50ee44cd9' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=False)) - op.add_column('task', sa.Column('description', sa.String(), nullable=True)) - op.add_column('task', sa.Column('is_complete', sa.String(), nullable=False)) - op.add_column('task', sa.Column('title', sa.String(), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'title') - op.drop_column('task', 'is_complete') - op.drop_column('task', 'description') - op.drop_column('task', 'completed_at') - # ### end Alembic commands ### diff --git a/migrations/versions/ba37534e9c64_.py b/migrations/versions/ba37534e9c64_.py deleted file mode 100644 index 0852884b5..000000000 --- a/migrations/versions/ba37534e9c64_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: ba37534e9c64 -Revises: 9941ac5caceb -Create Date: 2021-06-07 18:57:25.644862 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'ba37534e9c64' -down_revision = '9941ac5caceb' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('task', 'is_complete') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('is_complete', sa.VARCHAR(), autoincrement=False, nullable=False)) - # ### end Alembic commands ### diff --git a/migrations/versions/cdf1e373b2ae_.py b/migrations/versions/cdf1e373b2ae_.py deleted file mode 100644 index 82bc76e94..000000000 --- a/migrations/versions/cdf1e373b2ae_.py +++ /dev/null @@ -1,30 +0,0 @@ -"""empty message - -Revision ID: cdf1e373b2ae -Revises: ba37534e9c64 -Create Date: 2021-06-07 19:01:24.257316 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'cdf1e373b2ae' -down_revision = 'ba37534e9c64' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('id', sa.Integer(), autoincrement=True, nullable=False)) - op.drop_column('task', 'task_id') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('task_id', sa.INTEGER(), autoincrement=True, nullable=False)) - op.drop_column('task', 'id') - # ### end Alembic commands ### diff --git a/migrations/versions/47f50ee44cd9_.py b/migrations/versions/d5d6e5350ef2_.py similarity index 65% rename from migrations/versions/47f50ee44cd9_.py rename to migrations/versions/d5d6e5350ef2_.py index e442b1c1d..9c0d89f4a 100644 --- a/migrations/versions/47f50ee44cd9_.py +++ b/migrations/versions/d5d6e5350ef2_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 47f50ee44cd9 +Revision ID: d5d6e5350ef2 Revises: -Create Date: 2021-06-07 15:37:37.954544 +Create Date: 2021-06-10 15:13:41.917871 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = '47f50ee44cd9' +revision = 'd5d6e5350ef2' down_revision = None branch_labels = None depends_on = None @@ -24,6 +24,11 @@ def upgrade(): ) 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 ### From a586ca84dab4d21b3c4c7b3ca59bcd9b350c711b Mon Sep 17 00:00:00 2001 From: clear Date: Thu, 10 Jun 2021 21:10:23 -0700 Subject: [PATCH 05/12] wave 2 completed, wave 3 done --- app/routes.py | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/app/routes.py b/app/routes.py index 8925e9ae7..f218b8067 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from flask import Blueprint, json from sqlalchemy import asc, desc +from datetime import datetime from app.models.task import Task from flask import request, make_response, jsonify @@ -118,4 +119,43 @@ def handle_task(task_id): }, 200 +# modify complete task +@task_bp.route("//mark_complete", methods=["PATCH"], strict_slashes = False) +def mark_task_complete(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response(f"Task #{task_id} not found"), 404 + else: + task.completed_at = datetime.utcnow() # updates it with a date in "completed_at" field + db.session.commit() + + response_body = { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True # this is always true bc we are always setting completed at + } + } + return jsonify(response_body), 200 + +# modify incomplete task +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def make_task_incomplete(task_id): + task = Task.query.get(task_id) + if task is None: + return make_response(f"Task #{task_id} not found"), 404 + else: + task.completed_at = None + db.session.commit() + response_body = { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + } + return jsonify(response_body), 200 From af0f34e7f43a0683f76b9842dd3542470e9c516e Mon Sep 17 00:00:00 2001 From: clear Date: Fri, 11 Jun 2021 14:49:11 -0700 Subject: [PATCH 06/12] wave 3 updated --- app/routes.py | 71 ++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/app/routes.py b/app/routes.py index f218b8067..e4716015a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,8 +1,9 @@ from app import db from flask import Blueprint, json from sqlalchemy import asc, desc -from datetime import datetime from app.models.task import Task +from datetime import datetime +from sqlalchemy.sql.functions import now from flask import request, make_response, jsonify @@ -47,7 +48,7 @@ def handle_tasks(): if not "completed_at" in request_body or not request_body["completed_at"]: completed_at = False else: - completed_at = request_body["completed_at"] + completed_at = True new_task = Task( title=request_body["title"], @@ -93,10 +94,17 @@ def handle_task(task_id): if task is None: return make_response(f"Task #{task_id} not found"), 404 form_data = request.get_json() - if "title" in form_data or "description" in form_data or "completed_at" in form_data: - task.title = form_data["title"] - task.description = form_data["description"] - task.completed_at = form_data["completed_at"] + + if "title" not in form_data or "description" not in form_data or "completed_at" not in form_data: + return {"details": "Invalid data"}, 400 + + if not "completed_at" in form_data or not form_data["completed_at"]: + is_complete = False + else: + is_complete = True + task.title = form_data["title"] + task.description = form_data["description"] + task.completed_at = form_data["completed_at"] db.session.commit() return { @@ -104,7 +112,7 @@ def handle_task(task_id): "id": task.task_id, "title": task.title, "description": task.description, - "is_complete": False + "is_complete": is_complete } }, 200 @@ -124,38 +132,37 @@ def handle_task(task_id): def mark_task_complete(task_id): task = Task.query.get(task_id) - if task is None: + if not task: # this is the task check (wash my car) return make_response(f"Task #{task_id} not found"), 404 - else: - task.completed_at = datetime.utcnow() # updates it with a date in "completed_at" field - db.session.commit() - - response_body = { - "task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": True # this is always true bc we are always setting completed at - } - } - return jsonify(response_body), 200 + task.completed_at = datetime.utcnow() + db.session.commit() -# modify incomplete task -@task_bp.route("//mark_incomplete", methods=["PATCH"]) -def make_task_incomplete(task_id): - task = Task.query.get(task_id) - - if task is None: - return make_response(f"Task #{task_id} not found"), 404 - else: - task.completed_at = None - db.session.commit() response_body = { "task": { "id": task.task_id, "title": task.title, "description": task.description, - "is_complete": False + "is_complete": True # this is always true bc we are always setting completed at } } return jsonify(response_body), 200 + +# # modify incomplete task +# @task_bp.route("//mark_incomplete", methods=["PATCH"]) +# def make_task_incomplete(task_id): +# task = Task.query.get(task_id) + +# if task is None: +# return make_response(f"Task #{task_id} not found"), 404 +# else: +# task.completed_at = None +# db.session.commit() +# response_body = { +# "task": { +# "id": task.task_id, +# "title": task.title, +# "description": task.description, +# "is_complete": task.completed_at +# } +# } +# return jsonify(response_body), 200 From 9dc49c2b989ba37b94ec666077d4ecc6dcf11f7e Mon Sep 17 00:00:00 2001 From: clear Date: Fri, 11 Jun 2021 18:53:13 -0700 Subject: [PATCH 07/12] added Slack API connection --- app/routes.py | 56 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/app/routes.py b/app/routes.py index e4716015a..b1cbbea9f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,7 +5,11 @@ from datetime import datetime from sqlalchemy.sql.functions import now from flask import request, make_response, jsonify +from dotenv import load_dotenv +import os +import requests +load_dotenv() task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -29,7 +33,8 @@ def handle_tasks(): if task.completed_at == None: completed_at = False else: - task.completed_at = True + completed_at = True + tasks_response.append({ "id": task.task_id, "title": task.title, @@ -137,6 +142,17 @@ def mark_task_complete(task_id): task.completed_at = datetime.utcnow() db.session.commit() + base_path = "https://slack.com/api/chat.postMessage" + slack_tocken = os.environ.get("SLACK_API_KEY") + query_params = { + "channel": "task-notifications", + "text": f"Someone just completed the {task.title}" + } + headers = { + "Authorization": f"Bearer {slack_tocken}" + } + requests.post(base_path, params=query_params, headers=headers) + response_body = { "task": { "id": task.task_id, @@ -147,22 +163,22 @@ def mark_task_complete(task_id): } return jsonify(response_body), 200 -# # modify incomplete task -# @task_bp.route("//mark_incomplete", methods=["PATCH"]) -# def make_task_incomplete(task_id): -# task = Task.query.get(task_id) - -# if task is None: -# return make_response(f"Task #{task_id} not found"), 404 -# else: -# task.completed_at = None -# db.session.commit() -# response_body = { -# "task": { -# "id": task.task_id, -# "title": task.title, -# "description": task.description, -# "is_complete": task.completed_at -# } -# } -# return jsonify(response_body), 200 +# modify incomplete task +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def make_task_incomplete(task_id): + task = Task.query.get(task_id) + + if task is None: + return make_response(f"Task #{task_id} not found"), 404 + else: + task.completed_at = None + db.session.commit() + response_body = { + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": task.completed_at + } + } + return jsonify(response_body), 200 From 8443b7e53066dbb5c910efcf4ccd9d402ae0655a Mon Sep 17 00:00:00 2001 From: clear Date: Mon, 14 Jun 2021 09:54:45 -0700 Subject: [PATCH 08/12] corrected 2 tests in wave 3 --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index b1cbbea9f..41ad21183 100644 --- a/app/routes.py +++ b/app/routes.py @@ -178,7 +178,7 @@ def make_task_incomplete(task_id): "id": task.task_id, "title": task.title, "description": task.description, - "is_complete": task.completed_at + "is_complete": False } } return jsonify(response_body), 200 From ffa798eb25636d93f41746dd8be8cab5283ec5eb Mon Sep 17 00:00:00 2001 From: clear Date: Mon, 14 Jun 2021 10:40:41 -0700 Subject: [PATCH 09/12] added goal migration --- migrations/versions/9c03144560f3_.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 migrations/versions/9c03144560f3_.py diff --git a/migrations/versions/9c03144560f3_.py b/migrations/versions/9c03144560f3_.py new file mode 100644 index 000000000..ff8dee40f --- /dev/null +++ b/migrations/versions/9c03144560f3_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 9c03144560f3 +Revises: d5d6e5350ef2 +Create Date: 2021-06-14 10:16:43.480262 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9c03144560f3' +down_revision = 'd5d6e5350ef2' +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 8f4eb913c9ab78d15bbcebc54077dcccd9a720e9 Mon Sep 17 00:00:00 2001 From: clear Date: Tue, 15 Jun 2021 09:32:14 -0700 Subject: [PATCH 10/12] wave 5 completed --- app/__init__.py | 2 ++ app/models/goal.py | 9 +++++- app/routes.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 845c61776..d8ecfe622 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -31,6 +31,8 @@ def create_app(test_config=None): # Register Blueprints here from .routes import task_bp + from .routes import goals_bp app.register_blueprint(task_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..abe455913 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,13 @@ from flask import current_app from app import db - class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + tasks = db.relationship("Task", backref="task", lazy=True) + + def goal_to_json(self): + return { + "id": self.goal_id, + "title": self.title + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 41ad21183..30b481ced 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from flask import Blueprint, json from sqlalchemy import asc, desc from app.models.task import Task +from app.models.goal import Goal from datetime import datetime from sqlalchemy.sql.functions import now from flask import request, make_response, jsonify @@ -12,6 +13,8 @@ load_dotenv() task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + # return all tasks @task_bp.route("/", methods=["GET", "POST"], strict_slashes = False) @@ -182,3 +185,72 @@ def make_task_incomplete(task_id): } } return jsonify(response_body), 200 + + +# goals route +@goals_bp.route("", methods = ["POST", "GET"], strict_slashes = False) +def handle_goals(): + if 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() + response_body = { + "goal": new_goal.goal_to_json() + } + return jsonify(response_body), 201 + + #get all goals + if request.method == "GET": + goals = Goal.query.all() + response_body = [] + for a_goal in goals: + response_body.append(a_goal.goal_to_json()) + return jsonify(response_body), 200 + +# get one goal +@goals_bp.route("/", methods=["GET", "PUT", "DELETE"], strict_slashes = False) +def handle_goal(goal_id): + goal = Goal.query.get(goal_id) + + if request.method == "GET": + + if goal is None: + return make_response("", 404) + + response_body = { + "goal": goal.goal_to_json() + } + return jsonify(response_body), 200 + + # Update a goal + elif request.method == "PUT": + if goal is None: + return make_response(f"Goal #{goal_id} not found"), 404 + form_data = request.get_json() + + if "title" not in form_data: + return {"details": "Invalid data"}, 400 + + goal.title = form_data["title"] + db.session.commit() + + response_body = { + "goal": goal.goal_to_json() + } + return jsonify(response_body), 200 + + # Delete a goal + elif request.method == "DELETE": + if not goal: + return "", 404 + db.session.delete(goal) + db.session.commit() + + return { + "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" + } + +x \ No newline at end of file From 4c444ff4e2b0a4d394953c69bcc2dbbe256ed06c Mon Sep 17 00:00:00 2001 From: clear Date: Tue, 15 Jun 2021 16:02:34 -0700 Subject: [PATCH 11/12] working on wave 6 --- app/models/goal.py | 7 ++++--- app/models/task.py | 30 ++++++++++++++++++------------ app/routes.py | 21 +++++++++++++++++++-- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index abe455913..f32db5a9a 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,13 +1,14 @@ 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) title = db.Column(db.String) tasks = db.relationship("Task", backref="task", lazy=True) - def goal_to_json(self): - return { + def goal_json(self): + return( { "id": self.goal_id, "title": self.title - } \ No newline at end of file + }, 200) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index ff736965a..493022530 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,6 @@ from flask import current_app from app import db +# from app.models.goal import Goal class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) @@ -7,17 +8,22 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + __tablename__ = "tasks" - # def to_json(self): - # if self.completed_at: - # completed = True - # else: - # completed = False + def to_json(self): + if self.completed_at: + completed = True + else: + completed = False - # return { - # "id": self.id, - # "title": self.title, - # "description": self.description, - # "is_complete": completed, - # # "goal_id": self.goal_id # if the task belongs a goal add if not do not add - # } \ No newline at end of file + task_dict={ + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": completed, + "goal_id": self.goal_id # if the task belongs a goal add if not do not add + } + + if self.goals_id: + task_dict["goal_id"]= self.goals_id + return task_dict \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 30b481ced..3abe1c2f4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from flask import Blueprint, json -from sqlalchemy import asc, desc +from sqlalchemy import asc, desc +from app.models import task from app.models.task import Task from app.models.goal import Goal from datetime import datetime @@ -252,5 +253,21 @@ def handle_goal(goal_id): return { "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" } +# one-to-many relationship +@goals_bp.route("//tasks", methods = ["POST", "GET"], strict_slashes = False) +def handle_task_to_goals(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return "", 404 + + if request.method == "POST": + request_body = request.get_json() + task_ids = request_body["task_ids"] + + for task_id in task_ids: + goal_id.task_id = goal_id + + db.session.commit() + + return {"id":(goal_id), "task_ids": task_ids},200 -x \ No newline at end of file From c7bdf78986d20d3a3c228d200f18d35a3ec76077 Mon Sep 17 00:00:00 2001 From: clear Date: Tue, 15 Jun 2021 16:04:22 -0700 Subject: [PATCH 12/12] worked on wave 6 --- app/models/goal.py | 7 ++++--- app/models/task.py | 30 ++++++++++++++++++------------ app/routes.py | 21 +++++++++++++++++++-- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index abe455913..f32db5a9a 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,13 +1,14 @@ 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) title = db.Column(db.String) tasks = db.relationship("Task", backref="task", lazy=True) - def goal_to_json(self): - return { + def goal_json(self): + return( { "id": self.goal_id, "title": self.title - } \ No newline at end of file + }, 200) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index ff736965a..493022530 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,5 +1,6 @@ from flask import current_app from app import db +# from app.models.goal import Goal class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True) @@ -7,17 +8,22 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True) + __tablename__ = "tasks" - # def to_json(self): - # if self.completed_at: - # completed = True - # else: - # completed = False + def to_json(self): + if self.completed_at: + completed = True + else: + completed = False - # return { - # "id": self.id, - # "title": self.title, - # "description": self.description, - # "is_complete": completed, - # # "goal_id": self.goal_id # if the task belongs a goal add if not do not add - # } \ No newline at end of file + task_dict={ + "id": self.id, + "title": self.title, + "description": self.description, + "is_complete": completed, + "goal_id": self.goal_id # if the task belongs a goal add if not do not add + } + + if self.goals_id: + task_dict["goal_id"]= self.goals_id + return task_dict \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 30b481ced..3abe1c2f4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ from app import db from flask import Blueprint, json -from sqlalchemy import asc, desc +from sqlalchemy import asc, desc +from app.models import task from app.models.task import Task from app.models.goal import Goal from datetime import datetime @@ -252,5 +253,21 @@ def handle_goal(goal_id): return { "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted" } +# one-to-many relationship +@goals_bp.route("//tasks", methods = ["POST", "GET"], strict_slashes = False) +def handle_task_to_goals(goal_id): + goal = Goal.query.get(goal_id) + if not goal: + return "", 404 + + if request.method == "POST": + request_body = request.get_json() + task_ids = request_body["task_ids"] + + for task_id in task_ids: + goal_id.task_id = goal_id + + db.session.commit() + + return {"id":(goal_id), "task_ids": task_ids},200 -x \ No newline at end of file