From 1ffd9588fa8d96fee22f504fdc4b654aba57ba0e Mon Sep 17 00:00:00 2001 From: Alma Date: Mon, 1 Nov 2021 21:32:58 -0700 Subject: [PATCH 1/5] wave_1 --- app/__init__.py | 48 +++++++++- app/models/task.py | 45 ++++++++- app/routes.py | 72 +++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ migrations/versions/19a27241158f_.py | 39 ++++++++ .../versions/b2e3cc34f436_adds_task_model.py | 34 +++++++ 9 files changed, 398 insertions(+), 6 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/19a27241158f_.py create mode 100644 migrations/versions/b2e3cc34f436_adds_task_model.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..f87ec3f9c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,20 +1,57 @@ +# from flask import Flask +# from flask_sqlalchemy import SQLAlchemy +# from flask_migrate import Migrate + +# db = SQLAlchemy() +# migrate = Migrate() + + +# DATABASE_CONNECTION_STRING='postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_development' + +# def create_app(test_config=None): +# app= Flask(__name__) +# #db config +# app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False +# app.config["SQLALCHEMY_DATABASE_URI"] = DATABASE_CONNECTION_STRING + +# db.init_app(app) +# migrate.init_app(app, db) +# from app.models.task import Task +# from app.models.goal import Goal +# #register the blueprint +# from .routes import task_list_bp +# app.register_blueprint(task_list_bp) + + +# return app + + + + +#####################below is attempt one from flask import Flask +# Step 1: +# Import and initialize SQLAlchemy from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate import os from dotenv import load_dotenv - +# Initialize SQLAlchemy db = SQLAlchemy() migrate = Migrate() +DATABASE_CONNECTION_STRING='postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_development' load_dotenv() def create_app(test_config=None): app = Flask(__name__) app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = DATABASE_CONNECTION_STRING - if test_config is None: + # Step 2: + #Configure SQLAlchemy + if not test_config: app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_DATABASE_URI") else: @@ -22,13 +59,16 @@ def create_app(test_config=None): app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") - # Import models here for Alembic setup + # Import models from app.models.task import Task from app.models.goal import Goal - + # Step 3: + # Hook up Flask & SQLALchemy db.init_app(app) 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..f865e992e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,49 @@ +# from flask import current_app +# from app import db + + +# class Task(db.Model): +# task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) +# title=db.Column(db.String(200)) +# description=db.Column(db.String(200)) +# comleted_at=db.Column(db.DateTime, nullable=True)#default=None + +# def to_dict(self): +# return{ +# "id":self.task_id, +# "title": self.title, +# "description": self.description, +# "is_complete": True if self.completed_at else False +# } +###########below is my first attempt from flask import current_app from app import db 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(50)) + description=db.Column(db.String(200)) + completed_at=db.Column(db.DateTime, nullable=True)#default=None + # expected_to_be_fun=db.Column(db.String) + + def to_dict(self): + if self.completed_at == None: + return { + "id":self.task_id, + "title": self.title, + "description": self.description, + "is_complete": False + #IF NOT COMPLETE AT IS NULL OR POPULATED + } + + else: + return{ + "id":self.task_id, + "title": self.title, + "description": self.description, + "is_complete": True + } + + # return task_dict + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..130a3ad26 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,72 @@ -from flask import Blueprint +from app import db +from app.models.task import Task +from flask import Blueprint, jsonify, make_response, request +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") + +@tasks_bp.route("", methods=["POST", "GET"]) +def handle_tasks(): + + if request.method == "POST": + request_body = request.get_json() + + if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body: + return make_response({"details":"Invalid data"}, 400) + + new_task = Task( + title=request_body["title"], + description=request_body["description"], + completed_at=request_body["completed_at"] + ) + + db.session.add(new_task) + db.session.commit() + + + + return jsonify({"task": new_task.to_dict()}), 201 + + elif request.method == "GET": + tasks=Task.query.all() + tasks_response = [] + for task in tasks: + tasks_response.append(task.to_dict()) + return jsonify(tasks_response), 200 + + +@tasks_bp.route("/", methods= ["GET", "PUT", "DELETE"]) +def handle_task(task_id): + # task_id = int(task_id) + task = Task.query.get(task_id) + + + if task is None: + return make_response(f"Task {task_id} not found"), 404 + # return make_response( + # f"Task {task_id} not found" + # ), 404############## + if request.method == "GET": + + return jsonify({"task": task.to_dict()}), 200 + + elif request.method == "PUT": + request_body = request.get_json() + if "title" not in request_body or "description" not in request_body: + return make_response("invalid request"), 400 + + task.title=request_body["title"] + task.description=request_body["description"] + # task.is_complete=request_body["is complete"] + # task.completed_at=request_body["completed_at"] + + db.session.commit() + # return (task_id,jsonify({"details": task.title}), 200) + return jsonify({"task": task.to_dict()}),200 + # return make_response(f"Task {task.title} successfully updated"), 200 + + elif request.method == "DELETE": + db.session.delete(task) + db.session.commit() + # return make_response(f"Task {task_id} successfully deleted"), 200 + # return (jsonify({"details": task.title}f"successfully deleted"), 200) + return ({'details': f'Task {task_id} "{task.title}" successfully deleted'}), 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/19a27241158f_.py b/migrations/versions/19a27241158f_.py new file mode 100644 index 000000000..422757d10 --- /dev/null +++ b/migrations/versions/19a27241158f_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: 19a27241158f +Revises: b2e3cc34f436 +Create Date: 2021-11-01 16:17:39.649597 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '19a27241158f' +down_revision = 'b2e3cc34f436' +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(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=50), nullable=True), + sa.Column('description', sa.String(length=200), 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 ### diff --git a/migrations/versions/b2e3cc34f436_adds_task_model.py b/migrations/versions/b2e3cc34f436_adds_task_model.py new file mode 100644 index 000000000..1431a8c3f --- /dev/null +++ b/migrations/versions/b2e3cc34f436_adds_task_model.py @@ -0,0 +1,34 @@ +"""adds Task model + +Revision ID: b2e3cc34f436 +Revises: +Create Date: 2021-10-29 19:22:39.191627 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b2e3cc34f436' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('task', + sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('title', sa.String(length=200), nullable=True), + sa.Column('description', sa.String(length=200), nullable=True), + sa.Column('comleted_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('task_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('task') + # ### end Alembic commands ### From e727d5e6642bb7ed0e180e93eddee250046fc5b6 Mon Sep 17 00:00:00 2001 From: Alma Date: Tue, 2 Nov 2021 11:55:01 -0700 Subject: [PATCH 2/5] wave2 and wave3 --- app/routes.py | 41 +++++++++++++++++++++++++++++++++-------- tests/test_wave_02.py | 2 +- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/routes.py b/app/routes.py index 130a3ad26..51d0ec6fb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,7 +1,7 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, make_response, request - +from datetime import datetime tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") @tasks_bp.route("", methods=["POST", "GET"]) @@ -23,16 +23,28 @@ def handle_tasks(): db.session.commit() - + # return (f"Task list {new_task.title} created", 201)##### return jsonify({"task": new_task.to_dict()}), 201 elif request.method == "GET": - tasks=Task.query.all() - tasks_response = [] - for task in tasks: - tasks_response.append(task.to_dict()) - return jsonify(tasks_response), 200 + # tasks=Task.query.all() + # tasks_response = [] + # for task in tasks: + # tasks_response.append(task.to_dict()) + # return jsonify(tasks_response), 200 + + task_response= [] + if request.args.get('sort') == 'asc': + tasks = Task.query.order_by(Task.title.asc()).all() + elif request.args.get('sort') == 'desc': + tasks = Task.query.order_by(Task.title.desc()).all() + + else: + tasks = Task.query.all() + for task in tasks: + task_response.append(task.to_dict()) + return jsonify(task_response), 200 @tasks_bp.route("/", methods= ["GET", "PUT", "DELETE"]) def handle_task(task_id): @@ -69,4 +81,17 @@ def handle_task(task_id): db.session.commit() # return make_response(f"Task {task_id} successfully deleted"), 200 # return (jsonify({"details": task.title}f"successfully deleted"), 200) - return ({'details': f'Task {task_id} "{task.title}" successfully deleted'}), 200 \ No newline at end of file + return ({'details': f'Task {task_id} "{task.title}" successfully deleted'}), 200 + + +@tasks_bp.route("//", methods=["PATCH"]) +def mark_complete(id, completion_status): + task = Task.query.get(id) + if task is None: + return make_response("", 404) + if completion_status == "mark_complete": + task.completed_at = datetime.date + if completion_status == "mark_incomplete": + task.completed_at = None + + return jsonify({"task":task.to_dict()}) \ No newline at end of file diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 399daf4db..3644c8067 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -8,7 +8,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): assert len(response_body) == 3 assert response_body == [ { - "id": 2, + "id": 2, "title": "Answer forgotten email 📧", "description": "", "is_complete": False}, From 7b23cc9a77447b5e8018d76ab8f2f4267787a42a Mon Sep 17 00:00:00 2001 From: Alma Date: Wed, 3 Nov 2021 16:08:57 -0700 Subject: [PATCH 3/5] wave 4 --- app/__init__.py | 31 -------------- app/models/goal.py | 8 ++++ app/models/task.py | 20 ---------- app/routes.py | 60 ++++++++++++++-------------- migrations/versions/b2a498649583_.py | 28 +++++++++++++ 5 files changed, 66 insertions(+), 81 deletions(-) create mode 100644 migrations/versions/b2a498649583_.py diff --git a/app/__init__.py b/app/__init__.py index f87ec3f9c..3817ea628 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,34 +1,3 @@ -# from flask import Flask -# from flask_sqlalchemy import SQLAlchemy -# from flask_migrate import Migrate - -# db = SQLAlchemy() -# migrate = Migrate() - - -# DATABASE_CONNECTION_STRING='postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_development' - -# def create_app(test_config=None): -# app= Flask(__name__) -# #db config -# app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False -# app.config["SQLALCHEMY_DATABASE_URI"] = DATABASE_CONNECTION_STRING - -# db.init_app(app) -# migrate.init_app(app, db) -# from app.models.task import Task -# from app.models.goal import Goal -# #register the blueprint -# from .routes import task_list_bp -# app.register_blueprint(task_list_bp) - - -# return app - - - - -#####################below is attempt one from flask import Flask # Step 1: # Import and initialize SQLAlchemy diff --git a/app/models/goal.py b/app/models/goal.py index 8cad278f8..8b1bae2ce 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,3 +4,11 @@ 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) +#Task.query.get(goal_id) = a list of tasks with that matching goal_id + def to_dict(self): + return{ + "id": self.goal_id, + "title": self.title + } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index f865e992e..db43d1422 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,21 +1,4 @@ -# from flask import current_app -# from app import db - -# class Task(db.Model): -# task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) -# title=db.Column(db.String(200)) -# description=db.Column(db.String(200)) -# comleted_at=db.Column(db.DateTime, nullable=True)#default=None - -# def to_dict(self): -# return{ -# "id":self.task_id, -# "title": self.title, -# "description": self.description, -# "is_complete": True if self.completed_at else False -# } -###########below is my first attempt from flask import current_app from app import db @@ -25,7 +8,6 @@ class Task(db.Model): title=db.Column(db.String(50)) description=db.Column(db.String(200)) completed_at=db.Column(db.DateTime, nullable=True)#default=None - # expected_to_be_fun=db.Column(db.String) def to_dict(self): if self.completed_at == None: @@ -34,7 +16,6 @@ def to_dict(self): "title": self.title, "description": self.description, "is_complete": False - #IF NOT COMPLETE AT IS NULL OR POPULATED } else: @@ -45,5 +26,4 @@ def to_dict(self): "is_complete": True } - # return task_dict diff --git a/app/routes.py b/app/routes.py index 51d0ec6fb..44d9b4bea 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,8 +1,16 @@ from app import db from app.models.task import Task from flask import Blueprint, jsonify, make_response, request -from datetime import datetime +from datetime import date +from pathlib import Path +import os +from dotenv import load_dotenv +import requests + tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +env_path = Path('.')/ '.env' +load_dotenv() + @tasks_bp.route("", methods=["POST", "GET"]) def handle_tasks(): @@ -22,23 +30,14 @@ def handle_tasks(): db.session.add(new_task) db.session.commit() - - # return (f"Task list {new_task.title} created", 201)##### return jsonify({"task": new_task.to_dict()}), 201 elif request.method == "GET": - # tasks=Task.query.all() - # tasks_response = [] - # for task in tasks: - # tasks_response.append(task.to_dict()) - # return jsonify(tasks_response), 200 - task_response= [] if request.args.get('sort') == 'asc': tasks = Task.query.order_by(Task.title.asc()).all() elif request.args.get('sort') == 'desc': tasks = Task.query.order_by(Task.title.desc()).all() - else: tasks = Task.query.all() @@ -48,17 +47,13 @@ def handle_tasks(): @tasks_bp.route("/", methods= ["GET", "PUT", "DELETE"]) def handle_task(task_id): - # task_id = int(task_id) task = Task.query.get(task_id) if task is None: return make_response(f"Task {task_id} not found"), 404 - # return make_response( - # f"Task {task_id} not found" - # ), 404############## - if request.method == "GET": + if request.method == "GET": return jsonify({"task": task.to_dict()}), 200 elif request.method == "PUT": @@ -68,30 +63,35 @@ def handle_task(task_id): task.title=request_body["title"] task.description=request_body["description"] - # task.is_complete=request_body["is complete"] - # task.completed_at=request_body["completed_at"] + db.session.commit() - # return (task_id,jsonify({"details": task.title}), 200) + return jsonify({"task": task.to_dict()}),200 - # return make_response(f"Task {task.title} successfully updated"), 200 + elif request.method == "DELETE": db.session.delete(task) db.session.commit() - # return make_response(f"Task {task_id} successfully deleted"), 200 - # return (jsonify({"details": task.title}f"successfully deleted"), 200) + return ({'details': f'Task {task_id} "{task.title}" successfully deleted'}), 200 -@tasks_bp.route("//", methods=["PATCH"]) -def mark_complete(id, completion_status): - task = Task.query.get(id) +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def mark_complete(task_id): + task = Task.query.get(task_id) + today = date.today() if task is None: return make_response("", 404) - if completion_status == "mark_complete": - task.completed_at = datetime.date - if completion_status == "mark_incomplete": - task.completed_at = None - - return jsonify({"task":task.to_dict()}) \ No newline at end of file + else: + task.completed_at = today + db.session.commit() + PATH = 'https://slack.com/api/chat.postMessage' + params = {"token": os.environ.get("SLACK_TOKEN"), + "channel":"task-notifications", + "text":f"Someone just completed the task {task.title}" + } + requests.post(PATH,data=params) + + + return jsonify({"task":task.to_dict()}),200 \ No newline at end of file diff --git a/migrations/versions/b2a498649583_.py b/migrations/versions/b2a498649583_.py new file mode 100644 index 000000000..9f81a5111 --- /dev/null +++ b/migrations/versions/b2a498649583_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: b2a498649583 +Revises: 19a27241158f +Create Date: 2021-11-03 15:45:20.345711 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b2a498649583' +down_revision = '19a27241158f' +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 9c94438d1b1eec6b63b00d0c53c419eb92c2ad8b Mon Sep 17 00:00:00 2001 From: Alma Date: Wed, 17 Nov 2021 21:38:02 -0800 Subject: [PATCH 4/5] wave5 and 6 --- Procfile | 1 + app/__init__.py | 3 + app/models/goal.py | 15 ++++- app/models/task.py | 12 ++-- app/routes.py | 97 +++++++++++++++++++++++++++- migrations/versions/45b72850ac6c_.py | 30 +++++++++ tests/test_wave_03.py | 2 +- tests/test_wave_05.py | 62 +++++++++--------- 8 files changed, 185 insertions(+), 37 deletions(-) create mode 100644 Procfile create mode 100644 migrations/versions/45b72850ac6c_.py diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file diff --git a/app/__init__.py b/app/__init__.py index 3817ea628..b16665a6b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -40,4 +40,7 @@ def create_app(test_config=None): from .routes import tasks_bp app.register_blueprint(tasks_bp) + from .routes import goals_bp + app.register_blueprint(goals_bp) + return app diff --git a/app/models/goal.py b/app/models/goal.py index 8b1bae2ce..22a69a30c 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -1,14 +1,27 @@ from flask import current_app from app import db +from sqlalchemy.orm import backref + +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) + tasks = db.relationship("Task", backref='goal', lazy=True) #Task.query.get(goal_id) = a list of tasks with that matching goal_id def to_dict(self): return{ "id": self.goal_id, "title": self.title + } + + def to_dict_with_tasks(self, goal_id): + tasks = Task.query.filter_by(fk_goal_id=f"{goal_id}") + task_list = [] + for task in tasks: + task_list.append(task.to_dict()) + return{ + "id":self.goal_id, + "title":self.title, } \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index db43d1422..8811805bb 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,6 +1,8 @@ - from flask import current_app from app import db +from sqlalchemy.orm import backref + + class Task(db.Model): @@ -8,14 +10,16 @@ class Task(db.Model): title=db.Column(db.String(50)) description=db.Column(db.String(200)) completed_at=db.Column(db.DateTime, nullable=True)#default=None + goal_id=db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) def to_dict(self): - if self.completed_at == None: + if self.goal_id: return { "id":self.task_id, "title": self.title, "description": self.description, - "is_complete": False + "is_complete": True if self.completed_at else False, + "goal_id": self.goal_id } else: @@ -23,7 +27,7 @@ def to_dict(self): "id":self.task_id, "title": self.title, "description": self.description, - "is_complete": True + "is_complete": True if self.completed_at else False } diff --git a/app/routes.py b/app/routes.py index 44d9b4bea..274b38a9b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,13 +1,16 @@ from app import db from app.models.task import Task -from flask import Blueprint, jsonify, make_response, request +from flask import Blueprint, jsonify, make_response, request, abort from datetime import date from pathlib import Path import os from dotenv import load_dotenv import requests +from app.models.goal import Goal + tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") env_path = Path('.')/ '.env' load_dotenv() @@ -92,6 +95,96 @@ def mark_complete(task_id): "text":f"Someone just completed the task {task.title}" } requests.post(PATH,data=params) + return jsonify({"task":task.to_dict()}), 200 + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def mark_incomplete(task_id): + task = Task.query.get(task_id) + today = date.today() + if task is None: + return make_response("", 404) + else: + task.completed_at = None + db.session.commit() + return jsonify({"task":task.to_dict()}), 200 +#####currently working on function below +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body=request.get_json() + if "title" not in request_body: + return jsonify({"details": "Invalid data"}), 400 + new_goal=Goal( + title = request_body["title"] + ) + db.session.add(new_goal) + db.session.commit() + + + return jsonify({"goal": {"id": new_goal.goal_id, "title": new_goal.title}}), 201 + + +@goals_bp.route("", methods=["GET"]) +def get_goals(): + request_body=request.get_json() + + goals = Goal.query.all() + goal_response=[] + for goal in goals: + goal_response.append(goal.to_dict()) + if not goal: + return make_response("", 404) + + return jsonify(goal_response), 200 + + +#####working on the function below +#get one saved goal +@goals_bp.route("/", methods=["GET", "PUT", "DELETE"]) +def handle_goal(goal_id): + goal_id=int(goal_id) + goal = Goal.query.get(goal_id) + if not goal: + return make_response("", 404) + if request.method == "GET": + return jsonify({"goal": goal.to_dict()}), 200 + + elif request.method == "PUT": + input_data = request.get_json() + + goal.title=input_data["title"] + db.session.commit() + + return jsonify({"goal": goal.to_dict()}),200 + + elif request.method == "DELETE": + db.session.delete(goal) + db.session.commit() + + return ({'details': f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}), 200 + +@goals_bp.route("//tasks", methods=["GET", "POST"]) +def handles_both(goal_id): + goal = Goal.query.get(goal_id) + goals_response=[] + if goal is None: + abort(404) + if request.method == "GET": + answer = { + "id": goal.goal_id, + "title": goal.title, + "tasks": [task.to_dict() for task in goal.tasks] + } + return jsonify(answer), 200 + elif request.method == "POST": + request_body=request.get_json() + + task_ids = request_body["task_ids"] + for task_id in task_ids: + + task = Task.query.get(task_id) + goal.tasks.append(task) + + db.session.commit() + return jsonify({"id":goal.goal_id, "task_ids": [task.task_id for task in goal.tasks]}), 200 - return jsonify({"task":task.to_dict()}),200 \ No newline at end of file diff --git a/migrations/versions/45b72850ac6c_.py b/migrations/versions/45b72850ac6c_.py new file mode 100644 index 000000000..6c425e00c --- /dev/null +++ b/migrations/versions/45b72850ac6c_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 45b72850ac6c +Revises: b2a498649583 +Create Date: 2021-11-17 19:44:55.246095 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '45b72850ac6c' +down_revision = 'b2a498649583' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 92017b8c0..f8fe97ba5 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -95,7 +95,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -def test_mark_incomplete_on_incomplete_task(client, one_task): + # Act response = client.patch("/tasks/1/mark_incomplete") response_body = response.get_json() diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 6ba60c6fa..a089c7266 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,4 +1,5 @@ import pytest +from app.models.goal import Goal def test_get_goals_no_saved_goals(client): # Act @@ -41,18 +42,17 @@ def test_get_goal(client, one_goal): } } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): - pass + # Act response = client.get("/goals/1") response_body = response.get_json() # Assert - # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Test ---- + assert response.status_code == 404 + assert response_body == None + def test_create_goal(client): # Act @@ -71,30 +71,36 @@ def test_create_goal(client): } } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - pass # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } + goal = Goal.query.get(1) -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - pass # Act - # ---- Complete Act Here ---- + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == None def test_delete_goal(client, one_goal): @@ -113,18 +119,16 @@ def test_delete_goal(client, one_goal): response = client.get("/goals/1") assert response.status_code == 404 -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - pass - # Act - # ---- Complete Act Here ---- + response = client.delete("/goals/1") + response_body = response.get_json() # Assert - # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # ---- Complete Assertions Here ---- + assert response.status_code == 404 + assert response_body == None + assert Goal.query.all() == [] def test_create_goal_missing_title(client): From f2fe642be98ac701bbcec8bc873032e4a48bbe4f Mon Sep 17 00:00:00 2001 From: Alma Date: Thu, 18 Nov 2021 16:19:24 -0800 Subject: [PATCH 5/5] last changes --- app/models/task.py | 8 ++--- app/routes.py | 4 +-- .../{19a27241158f_.py => 307dd50f9c9b_.py} | 19 ++++++----- migrations/versions/45b72850ac6c_.py | 30 ---------------- migrations/versions/b2a498649583_.py | 28 --------------- .../versions/b2e3cc34f436_adds_task_model.py | 34 ------------------- 6 files changed, 15 insertions(+), 108 deletions(-) rename migrations/versions/{19a27241158f_.py => 307dd50f9c9b_.py} (65%) delete mode 100644 migrations/versions/45b72850ac6c_.py delete mode 100644 migrations/versions/b2a498649583_.py delete mode 100644 migrations/versions/b2e3cc34f436_adds_task_model.py diff --git a/app/models/task.py b/app/models/task.py index 8811805bb..10135584d 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -1,15 +1,13 @@ from flask import current_app from app import db -from sqlalchemy.orm import backref - - class Task(db.Model): + __tablename__= "tasks" task_id = db.Column(db.Integer, primary_key=True, autoincrement=True) - title=db.Column(db.String(50)) + title=db.Column(db.String(200)) description=db.Column(db.String(200)) - completed_at=db.Column(db.DateTime, nullable=True)#default=None + completed_at=db.Column(db.DateTime, nullable=True) goal_id=db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) def to_dict(self): diff --git a/app/routes.py b/app/routes.py index 274b38a9b..7edd56e5a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -108,7 +108,7 @@ def mark_incomplete(task_id): db.session.commit() return jsonify({"task":task.to_dict()}), 200 -#####currently working on function below + @goals_bp.route("", methods=["POST"]) def create_goal(): request_body=request.get_json() @@ -138,8 +138,6 @@ def get_goals(): return jsonify(goal_response), 200 -#####working on the function below -#get one saved goal @goals_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_goal(goal_id): goal_id=int(goal_id) diff --git a/migrations/versions/19a27241158f_.py b/migrations/versions/307dd50f9c9b_.py similarity index 65% rename from migrations/versions/19a27241158f_.py rename to migrations/versions/307dd50f9c9b_.py index 422757d10..b82d8cda2 100644 --- a/migrations/versions/19a27241158f_.py +++ b/migrations/versions/307dd50f9c9b_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 19a27241158f -Revises: b2e3cc34f436 -Create Date: 2021-11-01 16:17:39.649597 +Revision ID: 307dd50f9c9b +Revises: +Create Date: 2021-11-17 21:57:57.563923 """ from alembic import op @@ -10,8 +10,8 @@ # revision identifiers, used by Alembic. -revision = '19a27241158f' -down_revision = 'b2e3cc34f436' +revision = '307dd50f9c9b' +down_revision = None branch_labels = None depends_on = None @@ -20,13 +20,16 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.create_table('goal', sa.Column('goal_id', sa.Integer(), nullable=False), + sa.Column('title', sa.String(), nullable=True), sa.PrimaryKeyConstraint('goal_id') ) - op.create_table('task', + op.create_table('tasks', sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), - sa.Column('title', sa.String(length=50), nullable=True), + sa.Column('title', sa.String(length=200), nullable=True), sa.Column('description', sa.String(length=200), 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 ### @@ -34,6 +37,6 @@ def upgrade(): def downgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('task') + op.drop_table('tasks') op.drop_table('goal') # ### end Alembic commands ### diff --git a/migrations/versions/45b72850ac6c_.py b/migrations/versions/45b72850ac6c_.py deleted file mode 100644 index 6c425e00c..000000000 --- a/migrations/versions/45b72850ac6c_.py +++ /dev/null @@ -1,30 +0,0 @@ -"""empty message - -Revision ID: 45b72850ac6c -Revises: b2a498649583 -Create Date: 2021-11-17 19:44:55.246095 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '45b72850ac6c' -down_revision = 'b2a498649583' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) - op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'task', type_='foreignkey') - op.drop_column('task', 'goal_id') - # ### end Alembic commands ### diff --git a/migrations/versions/b2a498649583_.py b/migrations/versions/b2a498649583_.py deleted file mode 100644 index 9f81a5111..000000000 --- a/migrations/versions/b2a498649583_.py +++ /dev/null @@ -1,28 +0,0 @@ -"""empty message - -Revision ID: b2a498649583 -Revises: 19a27241158f -Create Date: 2021-11-03 15:45:20.345711 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'b2a498649583' -down_revision = '19a27241158f' -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/b2e3cc34f436_adds_task_model.py b/migrations/versions/b2e3cc34f436_adds_task_model.py deleted file mode 100644 index 1431a8c3f..000000000 --- a/migrations/versions/b2e3cc34f436_adds_task_model.py +++ /dev/null @@ -1,34 +0,0 @@ -"""adds Task model - -Revision ID: b2e3cc34f436 -Revises: -Create Date: 2021-10-29 19:22:39.191627 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'b2e3cc34f436' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('task', - sa.Column('task_id', sa.Integer(), autoincrement=True, nullable=False), - sa.Column('title', sa.String(length=200), nullable=True), - sa.Column('description', sa.String(length=200), nullable=True), - sa.Column('comleted_at', sa.DateTime(), nullable=True), - sa.PrimaryKeyConstraint('task_id') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('task') - # ### end Alembic commands ###