From 50d8a74c07e51ac4983598b58f4c012d07618c6f Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 10:01:49 -0700 Subject: [PATCH 01/17] Created models directory & __init__.py --- app/models/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/models/__init__.py diff --git a/app/models/__init__.py b/app/models/__init__.py new file mode 100644 index 000000000..e69de29bb From 6058ab313366bfb165294035d835756e47629801 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 10:09:27 -0700 Subject: [PATCH 02/17] Registered planets_bp --- app/__init__.py | 4 ++++ app/routes.py | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..87538dcc8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,4 +4,8 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import planets_bp + + app.register_blueprint(planets_bp) + return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..0b2d856b1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,4 @@ from flask import Blueprint +planets_bp = Blueprint("planets", __name__) + From cb1bf57e45ba6248cd351f0ce47a84199408251d Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 10:32:07 -0700 Subject: [PATCH 03/17] Created Planet class & instances --- app/routes.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 0b2d856b1..ab06e336a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,28 @@ from flask import Blueprint -planets_bp = Blueprint("planets", __name__) +class Planet: + def __init__(self, id, name, description): + self.id = id + self.name = name + self.description = description + + +planets = [ + Planet(1, "Mercury", "Coffee"), + Planet(1, "Venus", "Girl"), + Planet(1, "Earth", "Us"), + Planet(1, "Mars", "Elon"), + Planet(1, "Jupiter", "Big"), + Planet(1, "Saturn", "Rings"), + Planet(1, "Uranus", "Lol"), + Planet(1, "Neptune", "Cold"), + Planet(1, "Pluto", "Who?"), +] + +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + + +@planets_bp.ropute("/planets", methods=["GET"]) +def handle_planets(): + response_body = "Success" From c7956bfdd57d1eb5b0c909b250deda65e3d432a8 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 10:40:23 -0700 Subject: [PATCH 04/17] "Added handle_planets function" --- app/routes.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index ab06e336a..7a3460d61 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint +from flask import Blueprint, jsonify class Planet: @@ -7,6 +7,13 @@ def __init__(self, id, name, description): self.name = name self.description = description + def to_json(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + } + planets = [ Planet(1, "Mercury", "Coffee"), @@ -23,6 +30,7 @@ def __init__(self, id, name, description): planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -@planets_bp.ropute("/planets", methods=["GET"]) +@planets_bp.route("", methods=["GET"]) def handle_planets(): - response_body = "Success" + planets_response = [planet.to_json() for planet in planets] + return jsonify(planets_response) From 55a557d8d332a48903bc5cd5537fec5830f76b7b Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 11:56:35 -0700 Subject: [PATCH 05/17] Added handle_planet function, fixed planet ids --- app/routes.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app/routes.py b/app/routes.py index 7a3460d61..1b172a607 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,14 +17,14 @@ def to_json(self): planets = [ Planet(1, "Mercury", "Coffee"), - Planet(1, "Venus", "Girl"), - Planet(1, "Earth", "Us"), - Planet(1, "Mars", "Elon"), - Planet(1, "Jupiter", "Big"), - Planet(1, "Saturn", "Rings"), - Planet(1, "Uranus", "Lol"), - Planet(1, "Neptune", "Cold"), - Planet(1, "Pluto", "Who?"), + Planet(2, "Venus", "Girl"), + Planet(3, "Earth", "Us"), + Planet(4, "Mars", "Elon"), + Planet(5, "Jupiter", "Big"), + Planet(6, "Saturn", "Rings"), + Planet(7, "Uranus", "Lol"), + Planet(8, "Neptune", "Cold"), + Planet(9, "Pluto", "Who?"), ] planets_bp = Blueprint("planets", __name__, url_prefix="/planets") @@ -34,3 +34,11 @@ def to_json(self): def handle_planets(): planets_response = [planet.to_json() for planet in planets] return jsonify(planets_response) + + +@planets_bp.route("/", methods=["GET"]) +def handle_planet(planet_id): + planet_id = int(planet_id) + for planet in planets: + if planet.id == planet_id: + return planet.to_json() From 8a94853563b3ece51b9eb333f82a02d66d15a5a1 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 12:23:17 -0700 Subject: [PATCH 06/17] Connected database --- app/__init__.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index 87538dcc8..51d398665 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,9 +1,22 @@ from flask import Flask +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 .routes import planets_bp app.register_blueprint(planets_bp) From 0c6ad5f0bffdfffb4d76850a4fd71bddc2b09946 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 12:32:43 -0700 Subject: [PATCH 07/17] Added model planet --- app/__init__.py | 2 ++ app/models/planet.py | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/models/planet.py diff --git a/app/__init__.py b/app/__init__.py index 51d398665..eb34abbe4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,4 +21,6 @@ def create_app(test_config=None): app.register_blueprint(planets_bp) + from app.models.planet import Planet + return app diff --git a/app/models/planet.py b/app/models/planet.py new file mode 100644 index 000000000..895837fbc --- /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) From c03711dc94f1abe4745eb9b3cce03c11aa07309f Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 12:33:10 -0700 Subject: [PATCH 08/17] test --- app/routes.py | 40 -------- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../be23e6252c40_adds_planet_model.py | 33 +++++++ 6 files changed, 199 insertions(+), 40 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/be23e6252c40_adds_planet_model.py diff --git a/app/routes.py b/app/routes.py index 1b172a607..97b4077e5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,44 +1,4 @@ from flask import Blueprint, jsonify -class Planet: - def __init__(self, id, name, description): - self.id = id - self.name = name - self.description = description - - def to_json(self): - return { - "id": self.id, - "name": self.name, - "description": self.description, - } - - -planets = [ - Planet(1, "Mercury", "Coffee"), - Planet(2, "Venus", "Girl"), - Planet(3, "Earth", "Us"), - Planet(4, "Mars", "Elon"), - Planet(5, "Jupiter", "Big"), - Planet(6, "Saturn", "Rings"), - Planet(7, "Uranus", "Lol"), - Planet(8, "Neptune", "Cold"), - Planet(9, "Pluto", "Who?"), -] - planets_bp = Blueprint("planets", __name__, url_prefix="/planets") - - -@planets_bp.route("", methods=["GET"]) -def handle_planets(): - planets_response = [planet.to_json() for planet in planets] - return jsonify(planets_response) - - -@planets_bp.route("/", methods=["GET"]) -def handle_planet(planet_id): - planet_id = int(planet_id) - for planet in planets: - if planet.id == planet_id: - return planet.to_json() 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/be23e6252c40_adds_planet_model.py b/migrations/versions/be23e6252c40_adds_planet_model.py new file mode 100644 index 000000000..4885d12f4 --- /dev/null +++ b/migrations/versions/be23e6252c40_adds_planet_model.py @@ -0,0 +1,33 @@ +"""adds Planet model + +Revision ID: be23e6252c40 +Revises: +Create Date: 2021-10-28 12:29:57.133835 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'be23e6252c40' +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.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 8ebb419ccf7ebbea457c91ad78db8a1645c4e2ab Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 12:45:23 -0700 Subject: [PATCH 09/17] handle_plants POST --- app/models/planet.py | 7 +++++++ app/routes.py | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 895837fbc..d47fba969 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -5,3 +5,10 @@ class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String) description = db.Column(db.String) + + def to_json(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + } diff --git a/app/routes.py b/app/routes.py index 97b4077e5..6744d8b8a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,18 @@ -from flask import Blueprint, jsonify - +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, make_response, request planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + + +@planets_bp.route("", methods=["POST"]) +def handle_planets(): + request_body = request.get_json() + new_planet = Planet( + name=request_body["name"], description=request_body["description"] + ) + + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} successfully created", 201) From 72a78525992f99a7716a97fce50d97146d20d2d3 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 12:55:32 -0700 Subject: [PATCH 10/17] Refactored handle_planets to include GET & POST --- app/routes.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6744d8b8a..a9f0edb83 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,14 +5,21 @@ planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -@planets_bp.route("", methods=["POST"]) +@planets_bp.route("", methods=["GET", "POST"]) def handle_planets(): - request_body = request.get_json() - new_planet = Planet( - name=request_body["name"], description=request_body["description"] - ) + if request.method == "GET": + planets = Planet.query.all() + planets_response = [planet.to_json() for planet in planets] - db.session.add(new_planet) - db.session.commit() + return jsonify(planets_response) - return make_response(f"Planet {new_planet.name} successfully created", 201) + elif request.method == "POST": + request_body = request.get_json() + new_planet = Planet( + name=request_body["name"], description=request_body["description"] + ) + + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} successfully created", 201) From c2e4e1bd0156eb0f0b6830aca286f010ccaa966a Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 12:57:46 -0700 Subject: [PATCH 11/17] Refactored handle_planet function --- app/routes.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/routes.py b/app/routes.py index a9f0edb83..71f000ff1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -23,3 +23,10 @@ def handle_planets(): db.session.commit() return make_response(f"Planet {new_planet.name} successfully created", 201) + + +@planets_bp.route("/", methods=["GET"]) +def handle_planet(planet_id): + planet = Planet.query.get(planet_id) + + return planet.to_json() From a772c797406d5e18bdf3071592ac5f2079140ffb Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 13:14:18 -0700 Subject: [PATCH 12/17] Added PUT to handle_planet function --- app/routes.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 71f000ff1..ce4544bc7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -25,8 +25,18 @@ def handle_planets(): return make_response(f"Planet {new_planet.name} successfully created", 201) -@planets_bp.route("/", methods=["GET"]) +@planets_bp.route("/", methods=["GET", "PUT"]) def handle_planet(planet_id): planet = Planet.query.get(planet_id) + if request.method == "GET": + return planet.to_json() + + elif request.method == "PUT": + form_data = request.get_json() + + planet.name = form_data["name"] + planet.description = form_data["description"] + + db.session.commit() - return planet.to_json() + return make_response(f"Book #{planet.id} successfully updated") From 8adadca64bf213b0d58b08c55834eb59a95ffb59 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 13:16:25 -0700 Subject: [PATCH 13/17] Added DELETE to handle_planet function --- app/routes.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index ce4544bc7..4fdbfb73d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -25,9 +25,9 @@ def handle_planets(): return make_response(f"Planet {new_planet.name} successfully created", 201) -@planets_bp.route("/", methods=["GET", "PUT"]) +@planets_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_planet(planet_id): - planet = Planet.query.get(planet_id) + planet = Planet.query.get_or_404(planet_id) if request.method == "GET": return planet.to_json() @@ -40,3 +40,8 @@ def handle_planet(planet_id): db.session.commit() return make_response(f"Book #{planet.id} successfully updated") + + elif request.method == "DELETE": + db.session.delete(planet) + db.session.commit() + return make_response(f"Planet #{planet.id} successfully deleted") From d8103baba9be0fceb54ab73a051dba25befd897a Mon Sep 17 00:00:00 2001 From: mac-madison Date: Thu, 28 Oct 2021 13:24:56 -0700 Subject: [PATCH 14/17] Added query params to handle_planets function --- app/routes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 4fdbfb73d..ddfd7e52e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,7 +8,11 @@ @planets_bp.route("", methods=["GET", "POST"]) def handle_planets(): if request.method == "GET": - planets = Planet.query.all() + name_query = request.args.get("name") + if name_query: + planets = Planet.query.filter_by(name=name_query) + else: + planets = Planet.query.all() planets_response = [planet.to_json() for planet in planets] return jsonify(planets_response) From f2596e22c61e4ee91c6a5a4e086a0c2dffc8245d Mon Sep 17 00:00:00 2001 From: mac-madison Date: Sat, 30 Oct 2021 10:40:14 -0700 Subject: [PATCH 15/17] refactored create_app --- app/__init__.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index eb34abbe4..608bcac74 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,18 +1,28 @@ from flask import Flask 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["SQLALCHEMY_TRACK_MODIFICATIONS"] = False - app.config[ - "SQLALCHEMY_DATABASE_URI" - ] = "postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development" + if not test_config: + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_DATABASE_URI" + ) + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI" + ) db.init_app(app) migrate.init_app(app, db) From 48bb3fc665a61c3317fc66094e4f5e593d82e249 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Sat, 30 Oct 2021 11:16:30 -0700 Subject: [PATCH 16/17] test_get_all_planets_with_no_records passes --- tests/__init__.py | 0 tests/conftest.py | 30 ++++++++++++++++++++++++++++++ tests/test_routes.py | 16 ++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_routes.py diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 000000000..09118ba2d --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,30 @@ +from app.models.planet import Planet +import pytest +from app import create_app +from app import db + + +@pytest.fixture +def app(): + app = create_app({"TESTING": True}) + + 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): + neptune = Planet(name="Neptune", description="no surface") + mars = Planet(name="Mars", description="elon") + + db.session.add_all([neptune, mars]) + db.session.commit() diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..b8c68e2a2 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,16 @@ +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_one_book(client, two_saved_planets): + response = client.get("/books/1") + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == {"id": 1, "title": "Ocean Book", "description": "watr 4evr"} +""" From 4009b9bab29fd4552d022a431afa20c070ad7c89 Mon Sep 17 00:00:00 2001 From: mac-madison Date: Sat, 30 Oct 2021 11:33:57 -0700 Subject: [PATCH 17/17] all tests pass --- tests/test_routes.py | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index b8c68e2a2..b141f7ed4 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -6,11 +6,38 @@ def test_get_all_planets_with_no_records(client): assert response_body == [] -""" -def test_get_one_book(client, two_saved_planets): - response = client.get("/books/1") +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, "title": "Ocean Book", "description": "watr 4evr"} -""" + assert response_body == {"id": 1, "name": "Neptune", "description": "no surface"} + +def test_get_one_planet_with_empty_db_returns_404(client): + response = client.get("/planets/1") + assert response.status_code == 404 + +def test_get_all_planets_returns_list_of_planets(client, two_saved_planets): + response = client.get("/planets") + assert response.status_code == 200 + assert response.get_json() == [ + { + "name": "Neptune", + "description": "no surface", + "id": 1 + }, + { + "name": "Mars", + "description": "elon", + "id": 2 + } + ] + +def test_create_planet_returns_201(client): + request_body = { + "name": "Earth", + "description": "Us" + } + response = client.post("/planets", json=request_body) + + assert response.status_code == 201 \ No newline at end of file