From 34fe04d47fc8f10b8564b67e3fbbf63e8f5d42a0 Mon Sep 17 00:00:00 2001 From: Laurel Date: Sun, 9 May 2021 18:53:12 -0700 Subject: [PATCH 01/10] wave 1 passing for now --- app/__init__.py | 2 + app/models/task.py | 26 ++++++++++- app/routes.py | 75 +++++++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++ migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++++ 7 files changed, 267 insertions(+), 2 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..30052751d 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 tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index 39c89cd16..2fd3a0b61 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -3,4 +3,28 @@ class Task(db.Model): - task_id = db.Column(db.Integer, primary_key=True) + task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + description = db.Column(db.String) + completed_at = db.Column(db.DateTime, nullable=True,)#default=False + +#have two methods here, or one +#one that checks is complete or none +#one that makes a jasonified response for if the completed is true and shows that to the user +#using the completed at self as a param + +#Task.completed_at!= None + def to_json(self): + # if self.completed_at == None: + # is_complete = False + # else: + # is_complete = True + return { + "id": self.task_id, + "title": self.title, + "description": self.description, + "is_complete": self.completed_at != None + } + + + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..4924a517f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,75 @@ -from flask import Blueprint +from flask import Blueprint, request, make_response, jsonify +from app import db +from app.models.task import Task + +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["GET", "POST"], strict_slashes= False) +def deal_tasks(): + title = None + description = None + completed_at = None + if request.method == "GET": + tasks = Task.query.order_by(Task.title).all() + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_json()) + return jsonify(tasks_response) + + 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) + db.session.commit() + return make_response({"task": new_task.to_json()}, 201) + else: + return jsonify({"details": "Invalid data"}), 400 + + +@tasks_bp.route("/", methods=["GET"], strict_slashes= False) +def get_task_by_id(task_id): + task = Task.query.get(task_id) + if task is None: + return jsonify(None), 404 + else: + return make_response({"task": task.to_json()}, 200) + +@tasks_bp.route("/", methods=["DELETE"], strict_slashes= False) +def delete_task(task_id): + print("in delete task") + task = Task.query.get(task_id) #what is .query.get returning + if task is None: + return jsonify(None), 404 + else: + db.session.delete(task) + db.session.commit() + return make_response({"details": f'Task {task.task_id} "{task.title}" successfully deleted'}, 200) + + +@tasks_bp.route("/", methods=["PUT"], strict_slashes= False) +def update_task(task_id): + task = Task.query.get(task_id) + if task is None: + return jsonify(None), 404 + + 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 jsonify({"task":task.to_json()}), 200 + + + + + + diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} From e01b19a7c9aeed6278f51aa191159ddfa0a51fff Mon Sep 17 00:00:00 2001 From: Laurel Date: Mon, 10 May 2021 01:38:35 -0700 Subject: [PATCH 02/10] most of wave 1-3. still working 2nd test in wave 2 --- app/routes.py | 65 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4924a517f..07f928182 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,21 +1,26 @@ from flask import Blueprint, request, make_response, jsonify from app import db from app.models.task import Task +from datetime import datetime +import datetime +from sqlalchemy import DateTime, desc tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @tasks_bp.route("", methods=["GET", "POST"], strict_slashes= False) def deal_tasks(): - title = None - description = None - completed_at = None if request.method == "GET": - tasks = Task.query.order_by(Task.title).all() + #wanted to do wave 2 with if statement here but can't get syntax to work + # query_string = request.query_string + # if "/tasks?sort=desc" in query_string: + # tasks = tasks = Task.query.order_by(desc(Task.title)).all() + # else: + tasks = Task.query.order_by(Task.title).all() #<- handles first wave 2 tasks_response = [] for task in tasks: tasks_response.append(task.to_json()) return jsonify(tasks_response) - + elif request.method == "POST": request_body = request.get_json() @@ -39,10 +44,20 @@ def get_task_by_id(task_id): else: return make_response({"task": task.to_json()}, 200) +# #wave 2 desc part does not work either way need to debug/ rewrite +# @tasks_bp.route("?sort=desc", methods=["GET"], strict_slashes= False) +# def sort_desc_title(): +# tasks = Task.query.order_by(desc(Task.title)).all() +# tasks_response = [] +# for task in tasks: +# tasks_response.append(task.to_json()) +# return jsonify(tasks_response) + + @tasks_bp.route("/", methods=["DELETE"], strict_slashes= False) def delete_task(task_id): print("in delete task") - task = Task.query.get(task_id) #what is .query.get returning + task = Task.query.get(task_id) if task is None: return jsonify(None), 404 else: @@ -66,6 +81,44 @@ def update_task(task_id): db.session.commit() return jsonify({"task":task.to_json()}), 200 + +#wave 3 +@tasks_bp.route("//mark_complete", methods=["Patch"]) +def mark_complete(task_id): + task= Task.query.get(task_id) + if not task: + return "", 404 + + if task.completed_at: + task.completed_at = datetime.datetime.now() + else: + task.completed_at = datetime.datetime.now() + + db.session.add(task) + db.session.commit() + + if task.completed_at: + return jsonify({ + "task": task.to_json() + }), 200 + +@tasks_bp.route("//mark_incomplete", methods=["Patch"]) +def mark_incomplete(task_id): + task= Task.query.get(task_id) + if not task: + return "", 404 + + if task.completed_at: + task.completed_at = None + return { + "task": task.to_json() + }, 200 + else: + task.completed_at = None + return { + "task": task.to_json() + }, 200 + From b1dabc628695c4350ccf09a7f107a66981c7bbd7 Mon Sep 17 00:00:00 2001 From: Laurel Date: Mon, 10 May 2021 11:47:44 -0700 Subject: [PATCH 03/10] wave 1 thru 3 tests passing --- app/routes.py | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/app/routes.py b/app/routes.py index 07f928182..cc798d17c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,12 +10,11 @@ @tasks_bp.route("", methods=["GET", "POST"], strict_slashes= False) def deal_tasks(): if request.method == "GET": - #wanted to do wave 2 with if statement here but can't get syntax to work - # query_string = request.query_string - # if "/tasks?sort=desc" in query_string: - # tasks = tasks = Task.query.order_by(desc(Task.title)).all() - # else: - tasks = Task.query.order_by(Task.title).all() #<- handles first wave 2 + sort_query = request.args.get("sort") + if sort_query == "desc": + tasks = Task.query.order_by(Task.title.desc()).all() + else: + tasks = Task.query.order_by(Task.title).all() #<- handles first wave 2 tasks_response = [] for task in tasks: tasks_response.append(task.to_json()) @@ -44,16 +43,6 @@ def get_task_by_id(task_id): else: return make_response({"task": task.to_json()}, 200) -# #wave 2 desc part does not work either way need to debug/ rewrite -# @tasks_bp.route("?sort=desc", methods=["GET"], strict_slashes= False) -# def sort_desc_title(): -# tasks = Task.query.order_by(desc(Task.title)).all() -# tasks_response = [] -# for task in tasks: -# tasks_response.append(task.to_json()) -# return jsonify(tasks_response) - - @tasks_bp.route("/", methods=["DELETE"], strict_slashes= False) def delete_task(task_id): print("in delete task") From 2e4f41b66faaa886e3595f37bd49d5340aa39ae2 Mon Sep 17 00:00:00 2001 From: Laurel Date: Tue, 11 May 2021 14:36:48 -0700 Subject: [PATCH 04/10] wave 5 changes --- app/__init__.py | 2 ++ app/models/goal.py | 16 +++++++++++- app/routes.py | 63 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 79 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 30052751d..287c991c2 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 tasks_bp + from .routes import goals_bp app.register_blueprint(tasks_bp) + app.register_blueprint(goals_bp) return app diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..f9b4e6142 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,6 +1,20 @@ from flask import current_app from app import db +# Our task list API should be able to work with an entity called Goal. + +# ****Goals are entities that describe a task a user wants to complete.**** + +# They contain a title to name the goal. + +# Our goal for this wave is to be able to create, read, update, and delete different goals. class Goal(db.Model): - goal_id = db.Column(db.Integer, primary_key=True) + goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) + title = db.Column(db.String) + + def now_json(self): + return{ + "id": self.goal_id, + "title": self.title, + } diff --git a/app/routes.py b/app/routes.py index cc798d17c..4fe3dd350 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,11 +1,72 @@ from flask import Blueprint, request, make_response, jsonify from app import db from app.models.task import Task +from app.models.goal import Goal from datetime import datetime import datetime from sqlalchemy import DateTime, desc tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +#post request +@goals_bp.route("", methods=["POST"], strict_slashes= False) +def create_goals(): + request_body = request.get_json() + new_goal = Goal(title = request_body["title"]) + if "title" in request_body: + db.session.add(new_goal) + db.session.commit() + return jsonify({"goal": new_goal.now_json()}), 201 + else: + return jsonify({"details": "Invalid data"}), 400 + + +#get request +@goals_bp.route("", methods=["GET"], strict_slashes= False) +def get_goals(): + goals = Goal.query.order_by(Goal.title).all() + goals_response = [] + for goal in goals: + goals_response.append(goal.now_json()) + return jsonify(goals_response), 200 + +#get request by id +@goals_bp.route("/", methods=["GET"], strict_slashes= False) +def get_goal_by_id(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return jsonify(None), 404 + else: + return make_response({"goal": goal.now_json()}, 200) + +#put request +@goals_bp.route("/", methods=["PUT"], strict_slashes= False) +def update_goal(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return jsonify(None), 404 + + form_data = request.get_json() + + goal.title = form_data["title"] + + db.session.commit() + + return jsonify({"goal":goal.now_json()}), 200 + +#delete request +@goals_bp.route("/", methods=["DELETE"], strict_slashes= False) +def abandon_goals(goal_id): + goal = Goal.query.get(goal_id) + if goal is None: + return jsonify(None), 404 + else: + db.session.delete(goal) + db.session.commit() + return jsonify({"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}), 200 + + @tasks_bp.route("", methods=["GET", "POST"], strict_slashes= False) def deal_tasks(): @@ -45,7 +106,7 @@ def get_task_by_id(task_id): @tasks_bp.route("/", methods=["DELETE"], strict_slashes= False) def delete_task(task_id): - print("in delete task") + print("in delete task") #what is this left over from, testing maybe? get rid of this you silly task = Task.query.get(task_id) if task is None: return jsonify(None), 404 From 8243543268b133b441f5f20c419d75b8dffaa201 Mon Sep 17 00:00:00 2001 From: Laurel Date: Tue, 11 May 2021 19:50:06 -0700 Subject: [PATCH 05/10] almost wave 6, bot not added yet --- app/models/goal.py | 5 +++-- app/models/task.py | 2 +- app/routes.py | 50 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index f9b4e6142..e95b1b117 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -12,9 +12,10 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) - + tasks = db.relationship("Task", backref='goal', lazy=True) #originally had task and not tasks + def now_json(self): return{ - "id": self.goal_id, + "goal_id": self.goal_id, "title": self.title, } diff --git a/app/models/task.py b/app/models/task.py index 2fd3a0b61..f24173b10 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,7 +7,7 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True,)#default=False - + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) #have two methods here, or one #one that checks is complete or none #one that makes a jasonified response for if the completed is true and shows that to the user diff --git a/app/routes.py b/app/routes.py index 4fe3dd350..35f9e3359 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,11 +5,49 @@ from datetime import datetime import datetime from sqlalchemy import DateTime, desc +import os tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") -#post request +#wave6 +@goals_bp.route("//tasks", methods=["POST"], strict_slashes= False) +def task_goal(goal_id): + request_body = request.get_json() + goal = Goal.query.get(goal_id) + + if goal is None: + return make_response("", 404) + + for task_id in request_body["task_ids"]: + task = Task.query.get(task_id) + task.goal_id = goal.goal_id + + db.session.commit() + return make_response({"id": goal.goal_id, "task_ids": request_body["task_ids"]}, 200) + +@goals_bp.route("//tasks", methods=["GET"], strict_slashes= False) +def get_goal_task(goal_id): + goal = Goal.query.get(goal_id) + if goal == None: + return make_response("", 404) + + tasks = Task.query.filter_by(goal_id = goal_id) + task_list = [] + + + for task in tasks: + #call to_json stored in a local variable here + #insert the goal id key + task_list.append(task) + + return make_response({"id": int(goal_id), "title": goal.title, "tasks": task_list }, 200) + + + + + +#wave 5 @goals_bp.route("", methods=["POST"], strict_slashes= False) def create_goals(): request_body = request.get_json() @@ -21,8 +59,6 @@ def create_goals(): else: return jsonify({"details": "Invalid data"}), 400 - -#get request @goals_bp.route("", methods=["GET"], strict_slashes= False) def get_goals(): goals = Goal.query.order_by(Goal.title).all() @@ -31,7 +67,6 @@ def get_goals(): goals_response.append(goal.now_json()) return jsonify(goals_response), 200 -#get request by id @goals_bp.route("/", methods=["GET"], strict_slashes= False) def get_goal_by_id(goal_id): goal = Goal.query.get(goal_id) @@ -40,7 +75,6 @@ def get_goal_by_id(goal_id): else: return make_response({"goal": goal.now_json()}, 200) -#put request @goals_bp.route("/", methods=["PUT"], strict_slashes= False) def update_goal(goal_id): goal = Goal.query.get(goal_id) @@ -55,7 +89,6 @@ def update_goal(goal_id): return jsonify({"goal":goal.now_json()}), 200 -#delete request @goals_bp.route("/", methods=["DELETE"], strict_slashes= False) def abandon_goals(goal_id): goal = Goal.query.get(goal_id) @@ -65,13 +98,12 @@ def abandon_goals(goal_id): db.session.delete(goal) db.session.commit() return jsonify({"details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"}), 200 - - +#end wave 5 @tasks_bp.route("", methods=["GET", "POST"], strict_slashes= False) def deal_tasks(): if request.method == "GET": - sort_query = request.args.get("sort") + sort_query = request.args.get("sort")#<- handles second wave 2 if sort_query == "desc": tasks = Task.query.order_by(Task.title.desc()).all() else: From 3b675933c0f81aad5146ef9779a5884b0e78257b Mon Sep 17 00:00:00 2001 From: Laurel Date: Wed, 12 May 2021 17:59:00 -0700 Subject: [PATCH 06/10] jk this is wave 5 --- app/models/goal.py | 4 ++-- app/routes.py | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/models/goal.py b/app/models/goal.py index e95b1b117..4d5c77ef9 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -13,9 +13,9 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) tasks = db.relationship("Task", backref='goal', lazy=True) #originally had task and not tasks - + def now_json(self): return{ - "goal_id": self.goal_id, + "id": self.goal_id, "title": self.title, } diff --git a/app/routes.py b/app/routes.py index 35f9e3359..9759e98bf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -35,7 +35,6 @@ def get_goal_task(goal_id): tasks = Task.query.filter_by(goal_id = goal_id) task_list = [] - for task in tasks: #call to_json stored in a local variable here #insert the goal id key @@ -43,16 +42,13 @@ def get_goal_task(goal_id): return make_response({"id": int(goal_id), "title": goal.title, "tasks": task_list }, 200) - - - - #wave 5 @goals_bp.route("", methods=["POST"], strict_slashes= False) def create_goals(): request_body = request.get_json() - new_goal = Goal(title = request_body["title"]) + if "title" in request_body: + new_goal = Goal(title = request_body["title"]) db.session.add(new_goal) db.session.commit() return jsonify({"goal": new_goal.now_json()}), 201 From 4ea51e2f86398aaad1a436f5f7d37721fb586a7a Mon Sep 17 00:00:00 2001 From: Laurel Date: Wed, 12 May 2021 18:19:29 -0700 Subject: [PATCH 07/10] one thing to fix --- app/routes.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 9759e98bf..0b1e99f90 100644 --- a/app/routes.py +++ b/app/routes.py @@ -36,12 +36,19 @@ def get_goal_task(goal_id): task_list = [] for task in tasks: - #call to_json stored in a local variable here - #insert the goal id key - task_list.append(task) + task_list.append(helper_fun(task)) return make_response({"id": int(goal_id), "title": goal.title, "tasks": task_list }, 200) +def helper_fun(task_goal): + return { + "id": task_goal.task_id, + "goal_id": task_goal.goal_id, + "title": task_goal.title, + "description": task_goal.description, + "is_complete": task_goal.completed_at != None + } + #wave 5 @goals_bp.route("", methods=["POST"], strict_slashes= False) def create_goals(): @@ -123,12 +130,15 @@ def deal_tasks(): else: return jsonify({"details": "Invalid data"}), 400 - +#also handles wave 6 last test @tasks_bp.route("/", methods=["GET"], strict_slashes= False) def get_task_by_id(task_id): task = Task.query.get(task_id) + goal_attached = task.goal_id if task is None: return jsonify(None), 404 + elif goal_attached: + return make_response({"task": helper_fun(task)}, 200) else: return make_response({"task": task.to_json()}, 200) From 0f718ad7cd1650954ed952f627664b04ca420d35 Mon Sep 17 00:00:00 2001 From: Laurel Date: Wed, 12 May 2021 18:24:36 -0700 Subject: [PATCH 08/10] waves passing --- app/routes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0b1e99f90..4b4f1de20 100644 --- a/app/routes.py +++ b/app/routes.py @@ -134,10 +134,9 @@ def deal_tasks(): @tasks_bp.route("/", methods=["GET"], strict_slashes= False) def get_task_by_id(task_id): task = Task.query.get(task_id) - goal_attached = task.goal_id if task is None: return jsonify(None), 404 - elif goal_attached: + elif task.goal_id: return make_response({"task": helper_fun(task)}, 200) else: return make_response({"task": task.to_json()}, 200) From 98db479f2f4646db9d65cd04e77c841e81aab5a5 Mon Sep 17 00:00:00 2001 From: Laurel Date: Wed, 12 May 2021 21:31:21 -0700 Subject: [PATCH 09/10] tests passing, db migrations error --- app/models/task.py | 12 +---- app/routes.py | 10 ++++ migrations_old/README | 1 + migrations_old/alembic.ini | 45 ++++++++++++++++ migrations_old/env.py | 96 +++++++++++++++++++++++++++++++++++ migrations_old/script.py.mako | 24 +++++++++ 6 files changed, 178 insertions(+), 10 deletions(-) create mode 100644 migrations_old/README create mode 100644 migrations_old/alembic.ini create mode 100644 migrations_old/env.py create mode 100644 migrations_old/script.py.mako diff --git a/app/models/task.py b/app/models/task.py index f24173b10..53287dc78 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,19 +6,11 @@ class Task(db.Model): task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) title = db.Column(db.String) description = db.Column(db.String) - completed_at = db.Column(db.DateTime, nullable=True,)#default=False + completed_at = db.Column(db.DateTime, nullable=True,) goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) -#have two methods here, or one -#one that checks is complete or none -#one that makes a jasonified response for if the completed is true and shows that to the user -#using the completed at self as a param -#Task.completed_at!= None def to_json(self): - # if self.completed_at == None: - # is_complete = False - # else: - # is_complete = True + return { "id": self.task_id, "title": self.title, diff --git a/app/routes.py b/app/routes.py index 4b4f1de20..fec5fa9cd 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,11 +5,19 @@ from datetime import datetime import datetime from sqlalchemy import DateTime, desc +import requests import os tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") goals_bp = Blueprint("goals", __name__, url_prefix="/goals") +#wave4 +def hi_slack_api(task): + key = os.environ.get("API_KEY") + url = "https://slack.com/api/chat.postMessage" + slack_str = f"Someone just completed the task {task.title}" + requests.post(url, data={"token": key, "channel": "task-list-api", "test": slack_str}) + #wave6 @goals_bp.route("//tasks", methods=["POST"], strict_slashes= False) def task_goal(goal_id): @@ -183,6 +191,8 @@ def mark_complete(task_id): db.session.add(task) db.session.commit() + + hi_slack_api(task) #wave 4 if task.completed_at: return jsonify({ diff --git a/migrations_old/README b/migrations_old/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations_old/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations_old/alembic.ini b/migrations_old/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations_old/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_old/env.py b/migrations_old/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations_old/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_old/script.py.mako b/migrations_old/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations_old/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 c173853952bdb5db0a34724dfdda69e181df63e2 Mon Sep 17 00:00:00 2001 From: Laurel Date: Wed, 12 May 2021 22:09:40 -0700 Subject: [PATCH 10/10] wave 4 cleaner maybe working --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index fec5fa9cd..5dc242d0d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,7 +16,7 @@ def hi_slack_api(task): key = os.environ.get("API_KEY") url = "https://slack.com/api/chat.postMessage" slack_str = f"Someone just completed the task {task.title}" - requests.post(url, data={"token": key, "channel": "task-list-api", "test": slack_str}) + requests.post(url, headers={"Authorization": key}, params={"channel": "task-list-api", "text": slack_str}) #wave6 @goals_bp.route("//tasks", methods=["POST"], strict_slashes= False)