From 0c242563d0e1acce65c2112840d0a870fbeed6f0 Mon Sep 17 00:00:00 2001 From: KARLA TORRES Date: Mon, 10 May 2021 07:34:40 -0400 Subject: [PATCH 1/5] Added new routes and improts lines 1- 106 completing waves 1-3 --- app/__init__.py | 7 ++ app/models/task.py | 24 ++++++ app/routes.py | 106 ++++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/7f002951fd45_.py | 42 +++++++++++ migrations/versions/fef016c2dccd_.py | 39 ++++++++++ 9 files changed, 383 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/7f002951fd45_.py create mode 100644 migrations/versions/fef016c2dccd_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..8db7ef42b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -12,6 +12,8 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import task_bp + app.register_blueprint(task_bp) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False if test_config is None: @@ -30,5 +32,10 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import index_bp + app.register_blueprint(index_bp) + + from .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..1008d547a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,28 @@ 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) + + + def to_json(self): + completed_at = self.completed_at + if completed_at == None: + is_complete = False + else: + is_complete = True + + + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": is_complete + } + + + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..f3ebe54c7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,106 @@ -from flask import Blueprint +import os +from datetime import datetime +from flask import Blueprint, make_response, jsonify, request +from flask_sqlalchemy import SQLAlchemy +from sqlalchemy import desc, asc +from app import db +from app.models.task import Task + + + +task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +index_bp= Blueprint("index", __name__, url_prefix="/") + + +@index_bp.route("", methods=["GET"]) +def index(): #html homepage = index + return make_response({"name": "Hello index2"}, 200) + +@task_bp.route("", methods=["GET"]) +def task(): #html homepage = index + tasks = Task.query.all() + task_response = [] + + if request.args.get("sort") == "asc": + tasks = Task.query.order_by(Task.title).all() + + if request.args.get("sort") == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + + for task in tasks: + task_response.append(task.to_json()) + + return jsonify(task_response), 200 + + +@task_bp.route("/", methods=["GET"]) +def get_task(id): #html homepage = index + task = Task.query.filter_by(task_id=id).first() + if task == None: + return make_response(f"Task {id} not found", 404) + else: + return jsonify({"task":task.to_json()}), 200 + +@task_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + try: + + t = Task(title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"]) + except KeyError: + return make_response({ + "details": "Invalid data" + }, 400) + + db.session.add(t) + db.session.commit() + return { + "task": t.to_json() + }, 201 + +@task_bp.route("/", methods=["PUT"]) +def update_task(id): + task = Task.query.get(id) + if task == None: + return make_response(f"Task {id} not found", 404) + else: + update_body = request.get_json() + task.title = update_body["title"] + task.description = update_body["description"] + db.session.commit() + return make_response({"task":task.to_json()}, 200) + +@task_bp.route("/", methods=["DELETE"]) +def delete_task(id): + task = Task.query.get(id) + if task == None: + return make_response(f"Task {id} not found", 404) + else: + db.session.delete(task) + db.session.commit() + return make_response({"details": f"Task {id} \"{task.title}\" successfully deleted"}, 200) + +@task_bp.route("//mark_complete", methods=["PATCH"]) +def complete_task(id): + task = Task.query.get(id) + if task == None: + return make_response(f"Task {id} not found", 404) + else: + task.completed_at = datetime.now() + db.session.commit() + return make_response({"task":task.to_json()}, 200) + +@task_bp.route("//mark_incomplete", methods=["PATCH"]) +def incomplete_task(id): + task = Task.query.get(id) + if task == None: + return make_response(f"Task {id} not found", 404) + else: + task.completed_at = None + db.session.commit() + return make_response({"task":task.to_json()}, 200) \ 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/7f002951fd45_.py b/migrations/versions/7f002951fd45_.py new file mode 100644 index 000000000..b6a57d361 --- /dev/null +++ b/migrations/versions/7f002951fd45_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 7f002951fd45 +Revises: fef016c2dccd +Create Date: 2021-05-08 14:24:16.785302 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '7f002951fd45' +down_revision = 'fef016c2dccd' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + 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') + ) + op.drop_table('task') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('task', + sa.Column('task_id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=True), + sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=True), + sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True), + sa.PrimaryKeyConstraint('task_id', name='task_pkey') + ) + op.drop_table('tasks') + # ### end Alembic commands ### diff --git a/migrations/versions/fef016c2dccd_.py b/migrations/versions/fef016c2dccd_.py new file mode 100644 index 000000000..bd3648f24 --- /dev/null +++ b/migrations/versions/fef016c2dccd_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: fef016c2dccd +Revises: +Create Date: 2021-05-05 12:13:48.317360 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fef016c2dccd' +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, automatic_increment=True), + 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') + op.drop_table('goal') + # ### end Alembic commands ### From 7f2d43da5607d56fdd9b758c64b65e77c83019a7 Mon Sep 17 00:00:00 2001 From: KARLA TORRES Date: Mon, 10 May 2021 07:44:28 -0400 Subject: [PATCH 2/5] Added new routes and import from lines 1 - 106, completed waves 1- 3, added comments on line 10 and 107 --- app/routes.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index f3ebe54c7..087431999 100644 --- a/app/routes.py +++ b/app/routes.py @@ -7,7 +7,7 @@ from app import db from app.models.task import Task - +#Beginning of wave 1 - 3 task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @@ -103,4 +103,5 @@ def incomplete_task(id): else: task.completed_at = None db.session.commit() - return make_response({"task":task.to_json()}, 200) \ No newline at end of file + return make_response({"task":task.to_json()}, 200) +#End of Wave 1 - 3 \ No newline at end of file From cbffed193288a804d3e42aa2af94deb920fb8b74 Mon Sep 17 00:00:00 2001 From: KARLA TORRES Date: Mon, 10 May 2021 07:46:57 -0400 Subject: [PATCH 3/5] Removed comment on line 22 --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 087431999..b6c59a268 100644 --- a/app/routes.py +++ b/app/routes.py @@ -19,7 +19,7 @@ def index(): #html homepage = index return make_response({"name": "Hello index2"}, 200) @task_bp.route("", methods=["GET"]) -def task(): #html homepage = index +def task(): tasks = Task.query.all() task_response = [] From bc92965ec927cf9d214f9e8c97abd6bb388a592e Mon Sep 17 00:00:00 2001 From: KARLA TORRES Date: Thu, 13 May 2021 06:27:35 -0400 Subject: [PATCH 4/5] Completed waves 4, 5, and 6 --- app/__init__.py | 8 +- app/models/goal.py | 14 +- app/models/task.py | 34 ++-- app/routes.py | 150 +++++++++++++++--- migrations/versions/147ec7e4ecee_.py | 28 ++++ .../5afbb60042d9_adds_a_relationship.py | 41 +++++ migrations/versions/f1d0bb2163c1_.py | 30 ++++ supertest.py | 53 +++++++ tests/test_wave_06.py | 1 + 9 files changed, 322 insertions(+), 37 deletions(-) create mode 100644 migrations/versions/147ec7e4ecee_.py create mode 100644 migrations/versions/5afbb60042d9_adds_a_relationship.py create mode 100644 migrations/versions/f1d0bb2163c1_.py create mode 100644 supertest.py diff --git a/app/__init__.py b/app/__init__.py index 8db7ef42b..02a4b8ab2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,12 +30,10 @@ def create_app(test_config=None): db.init_app(app) migrate.init_app(app, db) - - # Register Blueprints here - from .routes import index_bp - app.register_blueprint(index_bp) - from .routes import task_bp + + from .routes import task_bp, goal_bp app.register_blueprint(task_bp) + app.register_blueprint(goal_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..ce6158f3f 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,4 +3,16 @@ class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + __tablename__ = "goals" + + id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) + + tasks = db.relationship('Task', backref="goal", lazy=True) + + + def to_json(self): + return { + "id": self.id, + "title": self.title + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index 1008d547a..941d7db14 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -8,23 +8,33 @@ 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) + completed_at = db.Column(db.DateTime, nullable=True) + + goal_id = db.Column(db.Integer, db.ForeignKey('goals.id'), nullable=True) def to_json(self): + 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(), + } + + + def is_complete(self): completed_at = self.completed_at if completed_at == None: is_complete = False else: is_complete = True - - - return { - "id": self.task_id, - "title": self.title, - "description": self.description, - "is_complete": is_complete - } - - - + return is_complete \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index b6c59a268..707a99abb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,34 +1,29 @@ import os +import requests from datetime import datetime from flask import Blueprint, make_response, jsonify, request from flask_sqlalchemy import SQLAlchemy from sqlalchemy import desc, asc from app import db +from app.models.goal import Goal from app.models.task import Task -#Beginning of wave 1 - 3 task_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goal_bp = Blueprint("goals", __name__, url_prefix="/goals") -index_bp= Blueprint("index", __name__, url_prefix="/") - - -@index_bp.route("", methods=["GET"]) -def index(): #html homepage = index - return make_response({"name": "Hello index2"}, 200) @task_bp.route("", methods=["GET"]) -def task(): +def task(): tasks = Task.query.all() task_response = [] if request.args.get("sort") == "asc": tasks = Task.query.order_by(Task.title).all() - - if request.args.get("sort") == "desc": + elif request.args.get("sort") == "desc": tasks = Task.query.order_by(Task.title.desc()).all() - + for task in tasks: task_response.append(task.to_json()) @@ -36,12 +31,13 @@ def task(): @task_bp.route("/", methods=["GET"]) -def get_task(id): #html homepage = index +def get_task(id): task = Task.query.filter_by(task_id=id).first() if task == None: return make_response(f"Task {id} not found", 404) else: - return jsonify({"task":task.to_json()}), 200 + return jsonify({"task": task.to_json()}), 200 + @task_bp.route("", methods=["POST"]) def create_task(): @@ -50,8 +46,8 @@ def create_task(): try: t = Task(title=request_body["title"], - description=request_body["description"], - completed_at=request_body["completed_at"]) + description=request_body["description"], + completed_at=request_body["completed_at"]) except KeyError: return make_response({ "details": "Invalid data" @@ -63,6 +59,7 @@ def create_task(): "task": t.to_json() }, 201 + @task_bp.route("/", methods=["PUT"]) def update_task(id): task = Task.query.get(id) @@ -73,7 +70,8 @@ def update_task(id): task.title = update_body["title"] task.description = update_body["description"] db.session.commit() - return make_response({"task":task.to_json()}, 200) + return make_response({"task": task.to_json()}, 200) + @task_bp.route("/", methods=["DELETE"]) def delete_task(id): @@ -85,6 +83,7 @@ def delete_task(id): db.session.commit() return make_response({"details": f"Task {id} \"{task.title}\" successfully deleted"}, 200) + @task_bp.route("//mark_complete", methods=["PATCH"]) def complete_task(id): task = Task.query.get(id) @@ -93,7 +92,17 @@ def complete_task(id): else: task.completed_at = datetime.now() db.session.commit() - return make_response({"task":task.to_json()}, 200) + + if os.environ.get("SLACK_API_TOKEN") != None: + msg = "Someone just completed the task " + task.title + slack_headers = {"Authorization": "Bearer " + + os.environ.get("SLACK_API_TOKEN")} + slack_params = {"channel": "task-notifications", "text": msg} + resp = requests.post("https://slack.com/api/chat.postMessage", + params=slack_params, headers=slack_headers) + + return make_response({"task": task.to_json()}, 200) + @task_bp.route("//mark_incomplete", methods=["PATCH"]) def incomplete_task(id): @@ -103,5 +112,108 @@ def incomplete_task(id): else: task.completed_at = None db.session.commit() - return make_response({"task":task.to_json()}, 200) -#End of Wave 1 - 3 \ No newline at end of file + return make_response({"task": task.to_json()}, 200) + +# End of Wave 1 - 4 +# Beginning of Wave 5 + + +@goal_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + try: + goal = Goal(title=request_body["title"]) + except KeyError: + return make_response({"details": "Invalid data"}, 400) + + db.session.add(goal) + db.session.commit() + return jsonify({"goal": goal.to_json()}), 201 + + +@goal_bp.route("/", methods=["PUT"]) +def update_goal(id): + goal = Goal.query.get(id) + if not goal: + return make_response('Goal not found.', 404) + request_body = request.get_json() + goal.title = request_body['title'] + db.session.commit() + return jsonify({'goal': goal.to_json()}), 200 + + +@goal_bp.route("/", methods=["GET"]) +def get_goal(id): + goal = Goal.query.filter_by(id=id).first() + if goal == None: + return make_response(f"Goal {id} not found", 404) + else: + return jsonify({"goal": goal.to_json()}), 200 + + +@goal_bp.route("", methods=["GET"]) +def goal(): + goals = Goal.query.all() + goal_response = [] + + for goal in goals: + goal_response.append(goal.to_json()) + + return jsonify(goal_response), 200 + + +@goal_bp.route("/", methods=["DELETE"]) +def delete_goal(id): + goal = Goal.query.get(id) + if goal == None: + return make_response(f"Goal {id} not found", 404) + db.session.delete(goal) + db.session.commit() + return make_response({"details": f"Goal {id} \"{goal.title}\" successfully deleted"}, 200) + +# End of Wave 5 + +# Beginning of Wave 6 + +@goal_bp.route("//tasks", methods=["GET", "POST"]) +def goal_tasks_list(id): + goal = Goal.query.get(id) + if not goal: + return make_response('Goal doesn\'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.id, + 'task_ids': [task.task_id for task in goal.tasks] + } + db.session.commit() + return jsonify(response_body), 200 + + + tasks = [] + for task in goal.tasks: + task_json = { + 'id': task.task_id, + 'goal_id': task.goal_id, + 'title': task.title, + 'description': task.description, + 'is_complete': task.is_complete(), + } + tasks.append(task_json) + + + response_body = { + 'id': goal.id, + 'title': goal.title, + 'tasks': tasks, + } + + return jsonify(response_body), 200 +#Ending of wave 6 \ No newline at end of file diff --git a/migrations/versions/147ec7e4ecee_.py b/migrations/versions/147ec7e4ecee_.py new file mode 100644 index 000000000..464ce7e02 --- /dev/null +++ b/migrations/versions/147ec7e4ecee_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 147ec7e4ecee +Revises: 7f002951fd45 +Create Date: 2021-05-11 05:12:17.668032 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '147ec7e4ecee' +down_revision = '7f002951fd45' +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 ### diff --git a/migrations/versions/5afbb60042d9_adds_a_relationship.py b/migrations/versions/5afbb60042d9_adds_a_relationship.py new file mode 100644 index 000000000..f73d84aba --- /dev/null +++ b/migrations/versions/5afbb60042d9_adds_a_relationship.py @@ -0,0 +1,41 @@ +"""adds a relationship + +Revision ID: 5afbb60042d9 +Revises: f1d0bb2163c1 +Create Date: 2021-05-12 00:48:50.375942 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5afbb60042d9' +down_revision = 'f1d0bb2163c1' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('goals', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.drop_table('goal') + op.add_column('tasks', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'tasks', 'goals', ['goal_id'], ['id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'tasks', type_='foreignkey') + op.drop_column('tasks', 'goal_id') + op.create_table('goal', + sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=True), + sa.Column('id', sa.INTEGER(), autoincrement=False, nullable=False) + ) + op.drop_table('goals') + # ### end Alembic commands ### diff --git a/migrations/versions/f1d0bb2163c1_.py b/migrations/versions/f1d0bb2163c1_.py new file mode 100644 index 000000000..e68d8fa52 --- /dev/null +++ b/migrations/versions/f1d0bb2163c1_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: f1d0bb2163c1 +Revises: 147ec7e4ecee +Create Date: 2021-05-11 05:39:25.427227 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f1d0bb2163c1' +down_revision = '147ec7e4ecee' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('id', sa.Integer(), nullable=False)) + op.drop_column('goal', 'goal_id') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('goal_id', sa.INTEGER(), autoincrement=True, nullable=False)) + op.drop_column('goal', 'id') + # ### end Alembic commands ### diff --git a/supertest.py b/supertest.py new file mode 100644 index 000000000..62450b0ac --- /dev/null +++ b/supertest.py @@ -0,0 +1,53 @@ +thetest = { + 'person_1': { + 'name': 'Zack', + 'favorite_foods': ['sushi', 'pizza', 'ice cream'], + 'friends': [ + {'Kot': { + 'age': 3, + 'color': 'grey', + 'height': 'like a foot', + 'favorite_foods': ['parmesian', 'avocados', 'cat food'], + }}, + {'Jeff': { + 'last_name': 'Bezos', + 'color': 'white', + 'height': '5 10', + }} + ] + }, +} + + +# Your goal: Answer these questions + +# What is Zack's 3rd favorite food? + +zacks_3rd_favorite_food = thetest["person_1"]['favorite_foods'][2] + +print(zacks_3rd_favorite_food) +# What is Zack's second friend's name? + +zacks_2nd_frends_name = thetest["person_1"]['friends'][1] + +# What is Zack's Kot's first favorite food? + +kots_favorite_food = thetest["person_1"]['friends'][0]['Kot']['favorite_food'][0] + +# Data Types +'strings' +1 # integer +1.0 # float +lists = [] +dictionary = {'key': 'values'} +set = {'thing 1', 'thing 2', 'thing 3'} +tuple = ('thing 1', 'thing 2') +boolean = True # or False +None # Nonetype +def func(): + print('hi') + +type(func) # Function +class MyClass: + pass +type(MyClass) # Class \ No newline at end of file diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 48ecd0523..9461c0189 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -40,6 +40,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on def test_get_tasks_for_specific_goal_no_goal(client): + # Act response = client.get("/goals/1/tasks") response_body = response.get_json() From 97c79cb42bbd1aff730511a29eaf16c413be96eb Mon Sep 17 00:00:00 2001 From: KARLA TORRES Date: Thu, 13 May 2021 06:34:30 -0400 Subject: [PATCH 5/5] Deleted file unrelated to project used as scratch --- supertest.py | 53 ---------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 supertest.py diff --git a/supertest.py b/supertest.py deleted file mode 100644 index 62450b0ac..000000000 --- a/supertest.py +++ /dev/null @@ -1,53 +0,0 @@ -thetest = { - 'person_1': { - 'name': 'Zack', - 'favorite_foods': ['sushi', 'pizza', 'ice cream'], - 'friends': [ - {'Kot': { - 'age': 3, - 'color': 'grey', - 'height': 'like a foot', - 'favorite_foods': ['parmesian', 'avocados', 'cat food'], - }}, - {'Jeff': { - 'last_name': 'Bezos', - 'color': 'white', - 'height': '5 10', - }} - ] - }, -} - - -# Your goal: Answer these questions - -# What is Zack's 3rd favorite food? - -zacks_3rd_favorite_food = thetest["person_1"]['favorite_foods'][2] - -print(zacks_3rd_favorite_food) -# What is Zack's second friend's name? - -zacks_2nd_frends_name = thetest["person_1"]['friends'][1] - -# What is Zack's Kot's first favorite food? - -kots_favorite_food = thetest["person_1"]['friends'][0]['Kot']['favorite_food'][0] - -# Data Types -'strings' -1 # integer -1.0 # float -lists = [] -dictionary = {'key': 'values'} -set = {'thing 1', 'thing 2', 'thing 3'} -tuple = ('thing 1', 'thing 2') -boolean = True # or False -None # Nonetype -def func(): - print('hi') - -type(func) # Function -class MyClass: - pass -type(MyClass) # Class \ No newline at end of file