From d0b89ef88ae93843cfff359070406e6ef402ceb0 Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Fri, 21 Oct 2022 11:04:24 -0700 Subject: [PATCH 01/13] initial work Co-authored-by: Paje-Bishop --- app/__init__.py | 3 ++- app/routes.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..105f7fa34 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,8 @@ from flask import Flask +from .routes import planet_bp def create_app(test_config=None): app = Flask(__name__) - + app.register_blueprint(planet_bp) return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..95e865ecf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,33 @@ from flask import Blueprint + +class Planet: + def __init__(self, id, name, description, mass): + self.id = id + self.name = name + self.description = description + self.mass = mass + + +list_of_planets = [ + Planet(1, "Mercury", "just a little guy", "small"), + Planet(2, "Venus", "what a babe", "hot"), + Planet(3, "Earth", "nice planet", "normal"), + Planet(4, "Mars", "rude", "short king"), + Planet(5, "Jupiter", "large and in charge", "mASSIVE"), + Planet(6, "Saturn", "put a ring on it", "big enough"), + Planet(7, "Uranus", "unacceptable in public", "normal i hope"), + Planet(8, "Neptune", "frigid", "cant tell"), +] + +planet_bp = Blueprint("planet", __name__, url_prefix="/planets") + + +@planet_bp.route("", methods=["GET"]) +def handle_planets(): + return "Planets", 201 + + +@planet_bp.route("/", methods=["GET"]) +def handle_planet(planet_id): + return f"Planet {planet_id}", 201 From 7f59960291214c1d6cf39283e42bdcdb03d09e40 Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Fri, 21 Oct 2022 11:13:24 -0700 Subject: [PATCH 02/13] retrieve planet info --- app/routes.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 95e865ecf..dad32aac6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -9,7 +9,8 @@ def __init__(self, id, name, description, mass): self.mass = mass -list_of_planets = [ +planets = [ + "Sol", Planet(1, "Mercury", "just a little guy", "small"), Planet(2, "Venus", "what a babe", "hot"), Planet(3, "Earth", "nice planet", "normal"), @@ -30,4 +31,5 @@ def handle_planets(): @planet_bp.route("/", methods=["GET"]) def handle_planet(planet_id): - return f"Planet {planet_id}", 201 + planet = planets[int(planet_id)] + return f"Planet {planet.id}, {planet.name}, {planet.description}, {planet.mass}", 201 From cc4a0489be4532efd510d32ac546b4c0936e7eb4 Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Mon, 24 Oct 2022 11:49:44 -0700 Subject: [PATCH 03/13] we did wave 2 Co-authored-by: Paje-Bishop --- app/routes.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/app/routes.py b/app/routes.py index dad32aac6..d4e54072d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -7,10 +7,18 @@ def __init__(self, id, name, description, mass): self.name = name self.description = description self.mass = mass + + def planet_dict(self): + return self.id, { + "id": self.id, + "name": self.name, + "description": self.description, + "mass": self.mass + } planets = [ - "Sol", + #"Sol", Planet(1, "Mercury", "just a little guy", "small"), Planet(2, "Venus", "what a babe", "hot"), Planet(3, "Earth", "nice planet", "normal"), @@ -25,11 +33,18 @@ def __init__(self, id, name, description, mass): @planet_bp.route("", methods=["GET"]) -def handle_planets(): - return "Planets", 201 +def handle_all_planets(): + all_planets = { p.id: p.planet_dict() for p in planets} + return all_planets, 200 @planet_bp.route("/", methods=["GET"]) def handle_planet(planet_id): - planet = planets[int(planet_id)] - return f"Planet {planet.id}, {planet.name}, {planet.description}, {planet.mass}", 201 + try: + planet = planets[int(planet_id)-1] + except ValueError: + return {"error": "Invalid planet id"}, 400 + except IndexError: + return {"error": "No planet by that id"}, 404 + #return f"Planet {planet.id}, {planet.name}, {planet.description}, {planet.mass}", 200 + return planet.planet_dict(), 200 From 3b79486d8b61cc193608a5523c18a82a551a8eaf Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Tue, 1 Nov 2022 10:48:03 -0700 Subject: [PATCH 04/13] add planet model Co-authored-by: Paje-Bishop --- app/__init__.py | 17 ++++++++++++++++- app/models/__init__.py | 0 app/models/planet.py | 7 +++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py diff --git a/app/__init__.py b/app/__init__.py index 105f7fa34..524f8fc66 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +1,23 @@ from flask import Flask -from .routes import planet_bp +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate + +db = SQLAlchemy() +migrate = Migrate() def create_app(test_config=None): app = Flask(__name__) + + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + + db.init_app(app) + migrate.init_app(app, db) + + from app.models.planet import Planet + + from .routes import planet_bp app.register_blueprint(planet_bp) + return app diff --git a/app/models/__init__.py b/app/models/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/planet.py b/app/models/planet.py new file mode 100644 index 000000000..6ab7bbef4 --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,7 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String) + description = db.Column(db.String) + mass = db.Column(db.String) \ No newline at end of file From 65ceea9bca8160e3e03e98a6bca7841ac46f1f50 Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Tue, 1 Nov 2022 10:48:13 -0700 Subject: [PATCH 05/13] planet model migrations --- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../versions/cebd768ade25_add_planet_model.py | 34 +++++++ 5 files changed, 200 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/cebd768ade25_add_planet_model.py diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/cebd768ade25_add_planet_model.py b/migrations/versions/cebd768ade25_add_planet_model.py new file mode 100644 index 000000000..42cbe9057 --- /dev/null +++ b/migrations/versions/cebd768ade25_add_planet_model.py @@ -0,0 +1,34 @@ +"""add planet model + +Revision ID: cebd768ade25 +Revises: +Create Date: 2022-11-01 10:44:14.114515 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cebd768ade25' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('planet', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('mass', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 110e769c95b04f168e12c8e5007db3ed0b1dedab Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Tue, 1 Nov 2022 11:28:47 -0700 Subject: [PATCH 06/13] make planet actually work --- app/__init__.py | 7 ++-- app/models/planet.py | 11 +++++- app/routes.py | 79 +++++++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 45 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 524f8fc66..907d8b833 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -9,8 +9,10 @@ def create_app(test_config=None): app = Flask(__name__) - app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config[ + "SQLALCHEMY_DATABASE_URI" + ] = "postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development" db.init_app(app) migrate.init_app(app, db) @@ -18,6 +20,7 @@ def create_app(test_config=None): from app.models.planet import Planet from .routes import planet_bp + app.register_blueprint(planet_bp) return app diff --git a/app/models/planet.py b/app/models/planet.py index 6ab7bbef4..b5e46e4d3 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -1,7 +1,16 @@ from app import db + class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String) description = db.Column(db.String) - mass = db.Column(db.String) \ No newline at end of file + mass = db.Column(db.String) + + def planet_dict(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + "mass": self.mass, + } diff --git a/app/routes.py b/app/routes.py index d4e54072d..62be896b5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,50 +1,45 @@ +from app import db +from app.models.planet import Planet from flask import Blueprint +from flask import request, make_response -class Planet: - def __init__(self, id, name, description, mass): - self.id = id - self.name = name - self.description = description - self.mass = mass - - def planet_dict(self): - return self.id, { - "id": self.id, - "name": self.name, - "description": self.description, - "mass": self.mass - } - - -planets = [ - #"Sol", - Planet(1, "Mercury", "just a little guy", "small"), - Planet(2, "Venus", "what a babe", "hot"), - Planet(3, "Earth", "nice planet", "normal"), - Planet(4, "Mars", "rude", "short king"), - Planet(5, "Jupiter", "large and in charge", "mASSIVE"), - Planet(6, "Saturn", "put a ring on it", "big enough"), - Planet(7, "Uranus", "unacceptable in public", "normal i hope"), - Planet(8, "Neptune", "frigid", "cant tell"), -] - planet_bp = Blueprint("planet", __name__, url_prefix="/planets") -@planet_bp.route("", methods=["GET"]) +@planet_bp.route("/", methods=["GET", "POST"]) def handle_all_planets(): - all_planets = { p.id: p.planet_dict() for p in planets} - return all_planets, 200 - - -@planet_bp.route("/", methods=["GET"]) + if request.method == "GET": + planets = Planet.query.all() + all_planets = {p.id: p.planet_dict() for p in planets} + return all_planets, 200 + elif request.method == "POST": + request_body = request.get_json() + new_planet = Planet( + name=request_body["name"], + description=request_body["description"], + mass=request_body["mass"], + ) + db.session.add(new_planet) + db.session.commit() + return make_response(f"Planet {new_planet.name} is now in orbit", 201) + + +@planet_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_planet(planet_id): - try: - planet = planets[int(planet_id)-1] - except ValueError: - return {"error": "Invalid planet id"}, 400 - except IndexError: - return {"error": "No planet by that id"}, 404 - #return f"Planet {planet.id}, {planet.name}, {planet.description}, {planet.mass}", 200 - return planet.planet_dict(), 200 + planet = Planet.query.get(planet_id) + if not planet: + return f"Planet #{planet_id} No planet found", 404 + elif request.method == "GET": + return planet.planet_dict() + elif request.method == "PUT": + form_data = request.get_json() + planet.name = form_data["name"] + planet.description = form_data["description"] + planet.mass = form_data["mass"] + db.session.commit() + return f"Planet #{planet_id} successfully updated" + elif request.method == "DELETE": + db.session.delete(planet) + db.session.commit() + return f"Planet #{planet_id} successfully deleted" From 569e843eb65a9d750a1548b9cdb2f41382c88fff Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Tue, 1 Nov 2022 11:40:10 -0700 Subject: [PATCH 07/13] detect invalid planet id --- app/routes.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/routes.py b/app/routes.py index 62be896b5..c6aecf7ee 100644 --- a/app/routes.py +++ b/app/routes.py @@ -27,6 +27,8 @@ def handle_all_planets(): @planet_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_planet(planet_id): + if not planet_id.isnumeric(): + return f"Planet #{planet_id} Invalid id", 400 planet = Planet.query.get(planet_id) if not planet: return f"Planet #{planet_id} No planet found", 404 From 2b49d799457392d7eff00b353ba6566e84a4746b Mon Sep 17 00:00:00 2001 From: Paje Date: Wed, 2 Nov 2022 13:06:09 -0500 Subject: [PATCH 08/13] Added query param --- app/routes.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index c6aecf7ee..e53d6d3a1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,7 +1,7 @@ from app import db from app.models.planet import Planet from flask import Blueprint -from flask import request, make_response +from flask import request, make_response, jsonify planet_bp = Blueprint("planet", __name__, url_prefix="/planets") @@ -10,9 +10,12 @@ @planet_bp.route("/", methods=["GET", "POST"]) def handle_all_planets(): if request.method == "GET": - planets = Planet.query.all() - all_planets = {p.id: p.planet_dict() for p in planets} - return all_planets, 200 + name_query = request.args.get("name") + if name_query: + planets_result = Planet.query.filter_by(name=name_query) + else: + planets_result = Planet.query.all() + return jsonify([p.planet_dict() for p in planets_result]), 200 elif request.method == "POST": request_body = request.get_json() new_planet = Planet( @@ -29,9 +32,11 @@ def handle_all_planets(): def handle_planet(planet_id): if not planet_id.isnumeric(): return f"Planet #{planet_id} Invalid id", 400 + planet = Planet.query.get(planet_id) if not planet: return f"Planet #{planet_id} No planet found", 404 + elif request.method == "GET": return planet.planet_dict() elif request.method == "PUT": @@ -45,3 +50,4 @@ def handle_planet(planet_id): db.session.delete(planet) db.session.commit() return f"Planet #{planet_id} successfully deleted" + From 62ebbf6651007a90567217307b63cae4ffcde8fe Mon Sep 17 00:00:00 2001 From: Paje Date: Thu, 3 Nov 2022 14:37:45 -0500 Subject: [PATCH 09/13] All responses json Co-authored-by: allcomputersarebad --- app/routes.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/routes.py b/app/routes.py index e53d6d3a1..3b323d736 100644 --- a/app/routes.py +++ b/app/routes.py @@ -25,17 +25,17 @@ def handle_all_planets(): ) db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.name} is now in orbit", 201) + return {"success": f"Planet {new_planet.name} is now in orbit"}, 201 @planet_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_planet(planet_id): if not planet_id.isnumeric(): - return f"Planet #{planet_id} Invalid id", 400 + return {"error": f"Planet #{planet_id} Invalid id"}, 400 planet = Planet.query.get(planet_id) if not planet: - return f"Planet #{planet_id} No planet found", 404 + return {"error": f"Planet #{planet_id} No planet found"}, 404 elif request.method == "GET": return planet.planet_dict() @@ -45,9 +45,9 @@ def handle_planet(planet_id): planet.description = form_data["description"] planet.mass = form_data["mass"] db.session.commit() - return f"Planet #{planet_id} successfully updated" + return {"success": f"Planet #{planet_id} successfully updated"}, 200 elif request.method == "DELETE": db.session.delete(planet) db.session.commit() - return f"Planet #{planet_id} successfully deleted" + return {"success": f"Planet #{planet_id} successfully deleted"}, 200 From 8adb19cfdbfc78a151f3a6102c769647dff4d743 Mon Sep 17 00:00:00 2001 From: Paje Date: Thu, 3 Nov 2022 14:38:15 -0500 Subject: [PATCH 10/13] Environment stuff --- app/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 907d8b833..9de6db63a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,17 +2,22 @@ from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate +from dotenv import load_dotenv +import os + db = SQLAlchemy() migrate = Migrate() +load_dotenv() def create_app(test_config=None): app = Flask(__name__) + app.config["TESTING"] = True and test_config app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - app.config[ - "SQLALCHEMY_DATABASE_URI" - ] = "postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development" + app.config["SQLALCHEMY_DATABASE_URI"] = \ + os.environ.get("SQLALCHEMY_DATABASE_URI") if not test_config \ + else os.environ.get("SQLALCHEMY_TEST_DATABASE_URI") db.init_app(app) migrate.init_app(app, db) From 7291c58d3d3f59acdf113b91000d22ca4c8216a6 Mon Sep 17 00:00:00 2001 From: Paje Date: Thu, 3 Nov 2022 14:38:37 -0500 Subject: [PATCH 11/13] 100% test coverage --- app/tests/__init__.py | 0 app/tests/conftest.py | 35 ++++++++++++++++ app/tests/test_routes.py | 88 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 app/tests/__init__.py create mode 100644 app/tests/conftest.py create mode 100644 app/tests/test_routes.py diff --git a/app/tests/__init__.py b/app/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/tests/conftest.py b/app/tests/conftest.py new file mode 100644 index 000000000..13daddae3 --- /dev/null +++ b/app/tests/conftest.py @@ -0,0 +1,35 @@ +import pytest +from app import create_app, db +from app.models.planet import Planet +from flask.signals import request_finished + + +@pytest.fixture +def app(): + app = create_app({"TESTING": True}) + + @request_finished.connect_via(app) + def expire_session(sender, response, **extra): + db.session.remove() + + with app.app_context(): + db.create_all() + yield app + + with app.app_context(): + db.drop_all() + + +@pytest.fixture +def client(app): + return app.test_client() + + +@pytest.fixture +def two_saved_planets(app): + # Arrange + venus_planet = Planet(name="Venus", description="Hot mama", mass="The bigger the better.") + earth_planet = Planet(name="Earth", description="There are bugs here", mass="normal") + + db.session.add_all([venus_planet, earth_planet]) + db.session.commit() diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py new file mode 100644 index 000000000..bc3fa77c6 --- /dev/null +++ b/app/tests/test_routes.py @@ -0,0 +1,88 @@ +def test_get_all_planets_with_no_records(client): + response = client.get("/planets/") + response_body = response.get_json() + assert response.status_code == 200 + assert response_body == [] + + +def test_get_all_planets(client, two_saved_planets): + response = client.get("/planets/") + response_body = response.get_json() + assert response.status_code == 200 + assert response_body == [ + { + "id": 1, + "name": "Venus", + "description": "Hot mama", + "mass": "The bigger the better.", + }, + { + "id": 2, + "name": "Earth", + "description": "There are bugs here", + "mass": "normal", + }, + ] + + +def test_get_one_planet(client, two_saved_planets): + response = client.get("/planets/1") + response_body = response.get_json() + assert response.status_code == 200 + assert response_body == { + "id": 1, + "name": "Venus", + "description": "Hot mama", + "mass": "The bigger the better.", + } + + +def test_get_one_planet_no_data_returns_404(client): + response = client.get("/planets/3") + assert response.status_code == 404 + + +def test_post_planet_returns_201(client): + response = client.post("/planets/", json={ + "name": "Earth II", + "description": "If Earth is so good why isn't there... oh", + "mass": "Better than normal" + }) + response_body = response.get_json() + assert response.status_code == 201 + assert response_body == {"success": "Planet Earth II is now in orbit"} + + +def test_invalid_planet_id_returns_400(client): + response = client.get("/planets/invalid") + assert response.status_code == 400 + + +def test_delete_planet(client, two_saved_planets): + response = client.delete("/planets/1") + response_body = response.get_json() + assert response.status_code == 200 + assert response_body == {"success": "Planet #1 successfully deleted"} + + +def test_update_planet(client, two_saved_planets): + response = client.put("/planets/1", json={ + "name": "Mercury", + "description": "Actually, Planet 1 is totally mercury. What are you doing here Venus", + "mass": "Correct" + }) + response_body = response.get_json() + assert response.status_code == 200 + assert response_body == {"success": "Planet #1 successfully updated"} + + +def test_name_query(client, two_saved_planets): + response = client.get("/planets/?name=Venus") + response_body = response.get_json() + assert response.status_code == 200 + assert response_body == [{ + "id": 1, + "name": "Venus", + "description": "Hot mama", + "mass": "The bigger the better.", + }] From dbd0a395e7aca075a4376684e8bcbb6feb157cee Mon Sep 17 00:00:00 2001 From: Paje Date: Mon, 7 Nov 2022 13:39:20 -0600 Subject: [PATCH 12/13] added Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file From 21e025acee642798acf832173ab57be2e3c45158 Mon Sep 17 00:00:00 2001 From: allcomputersarebad Date: Mon, 7 Nov 2022 11:56:10 -0800 Subject: [PATCH 13/13] updated requirements --- requirements.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fba2b3e38..661db4e37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,31 @@ alembic==1.5.4 +attrs==22.1.0 autopep8==1.5.5 +black==22.10.0 blinker==1.4 certifi==2020.12.5 chardet==4.0.0 -click==7.1.2 +click==8.1.3 +coverage==6.5.0 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 +gunicorn==20.1.0 idna==2.10 +iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +mypy-extensions==0.4.3 +packaging==21.3 +pathspec==0.10.1 +platformdirs==2.5.2 +pluggy==1.0.0 psycopg2-binary==2.9.4 +py==1.11.0 pycodestyle==2.6.0 +pyparsing==3.0.9 pytest==7.1.1 pytest-cov==2.12.1 python-dateutil==2.8.1 @@ -23,5 +35,6 @@ requests==2.25.1 six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.4 Werkzeug==1.0.1