From 32009333fdf2c76501d6f0c7b8257d3f2802af47 Mon Sep 17 00:00:00 2001 From: Nina Date: Wed, 27 Apr 2022 11:19:02 -0700 Subject: [PATCH 01/10] needed to update psycopg2-binary version in requirements.txt to successfully install all packages --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a506b4d12..aa3718365 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 -psycopg2-binary==2.8.6 +psycopg2-binary==2.9.3 pycodestyle==2.6.0 pytest==6.2.3 pytest-cov==2.12.1 From 8d1350da61af879a1a946fa931b7f453b4114e90 Mon Sep 17 00:00:00 2001 From: Nina Date: Fri, 29 Apr 2022 21:48:04 -0700 Subject: [PATCH 02/10] completed wave_01 --- app/__init__.py | 3 +++ app/routes.py | 30 +++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..1123a559e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,4 +4,7 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import bp + app.register_blueprint(bp) + return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..57b484b13 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,30 @@ -from flask import Blueprint +from flask import Blueprint, jsonify +class Planet: + def __init__(self, id, name, description, has_moon=None): + self.id = id + self.name = name + self.description = description + self.has_moon = has_moon + +planets = [ + Planet(1, "Mercury", "terrestrial", False), + Planet(2, "Venus", "terrestrial", False), + Planet(3, "Earth", "terrestrial", True), + Planet(4, "Mars", "terrestrial", True) +] + +bp = Blueprint("planets", __name__, url_prefix="/planets") + + +@bp.route("", methods=("GET",)) +def get_planets(): + list_of_planets = [] + for planet in planets: + list_of_planets.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "has_moon": planet.has_moon + }) + return jsonify(list_of_planets), 200 From 3c1ccfedf5304780cdd3202171da0fb557b54a88 Mon Sep 17 00:00:00 2001 From: Nina Date: Fri, 29 Apr 2022 21:59:08 -0700 Subject: [PATCH 03/10] completed wave_02 --- app/routes.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 57b484b13..bb6d721b1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint, jsonify +from flask import Blueprint, jsonify, abort, make_response class Planet: def __init__(self, id, name, description, has_moon=None): @@ -14,6 +14,19 @@ def __init__(self, id, name, description, has_moon=None): Planet(4, "Mars", "terrestrial", True) ] +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + + for planet in planets: + if planet.id == planet_id: + return planet + + abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + + bp = Blueprint("planets", __name__, url_prefix="/planets") @@ -28,3 +41,14 @@ def get_planets(): "has_moon": planet.has_moon }) return jsonify(list_of_planets), 200 + +@bp.route("/", methods=("GET",)) +def get_individual_planet(planet_id): + planet = validate_planet(planet_id) + + return { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "has_moon": planet.has_moon + } From 11571d0470c1e3e3610bbce41de625312dd34e36 Mon Sep 17 00:00:00 2001 From: Nina Date: Fri, 29 Apr 2022 22:09:11 -0700 Subject: [PATCH 04/10] added response code to get_individual_planet for consistency --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index bb6d721b1..28b77aef4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -51,4 +51,4 @@ def get_individual_planet(planet_id): "name": planet.name, "description": planet.description, "has_moon": planet.has_moon - } + }, 200 From 9b9f127fc318d8aff1163d970e385e7876608169 Mon Sep 17 00:00:00 2001 From: Nina Date: Thu, 12 May 2022 15:11:12 -0700 Subject: [PATCH 05/10] completed wave_03 --- app/__init__.py | 10 ++ app/models/__init__.py | 0 app/models/planet.py | 14 +++ app/routes.py | 82 ++++++++-------- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../91b40f34c954_added_planet_mmodel.py | 34 +++++++ 9 files changed, 263 insertions(+), 43 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py 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/91b40f34c954_added_planet_mmodel.py diff --git a/app/__init__.py b/app/__init__.py index 1123a559e..0add21118 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,9 +1,19 @@ 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 bp app.register_blueprint(bp) 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..f3117e95a --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,14 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + has_moon = db.Column(db.Boolean, nullable=False, default=False) + + def to_dict(self): + return dict( + id = self.id, + name = self.name, + description = self.description, + has_moon = self.has_moon,) diff --git a/app/routes.py b/app/routes.py index 28b77aef4..fbdd5fc00 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,54 +1,50 @@ -from flask import Blueprint, jsonify, abort, make_response +from flask import Blueprint, jsonify, abort, make_response, request +from .models.planet import Planet +from app import db -class Planet: - def __init__(self, id, name, description, has_moon=None): - self.id = id - self.name = name - self.description = description - self.has_moon = has_moon +# def validate_planet(planet_id): +# try: +# planet_id = int(planet_id) +# except: +# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) -planets = [ - Planet(1, "Mercury", "terrestrial", False), - Planet(2, "Venus", "terrestrial", False), - Planet(3, "Earth", "terrestrial", True), - Planet(4, "Mars", "terrestrial", True) -] +# for planet in planets: +# if planet.id == planet_id: +# return planet -def validate_planet(planet_id): - try: - planet_id = int(planet_id) - except: - abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) +# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - for planet in planets: - if planet.id == planet_id: - return planet - abort(make_response({"message":f"planet {planet_id} not found"}, 404)) +bp = Blueprint("planets", __name__, url_prefix="/planets") +@bp.route("", methods=("POST",)) +def post_planets(): + request_body = request.get_json() -bp = Blueprint("planets", __name__, url_prefix="/planets") + new_planet = Planet(name=request_body["name"], + description=request_body["description"], + has_moon=request_body["has_moon"],) + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} successfully created", 201) @bp.route("", methods=("GET",)) def get_planets(): - list_of_planets = [] - for planet in planets: - list_of_planets.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "has_moon": planet.has_moon - }) - return jsonify(list_of_planets), 200 - -@bp.route("/", methods=("GET",)) -def get_individual_planet(planet_id): - planet = validate_planet(planet_id) - - return { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "has_moon": planet.has_moon - }, 200 + planets = Planet.query.all() + + result_list = [planet.to_dict() for planet in planets] + + return jsonify(result_list), 200 + +# @bp.route("/", methods=("GET",)) +# def get_individual_planet(planet_id): +# planet = validate_planet(planet_id) + +# return { +# "id": planet.id, +# "name": planet.name, +# "description": planet.description, +# "has_moon": planet.has_moon +# }, 200 diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/91b40f34c954_added_planet_mmodel.py b/migrations/versions/91b40f34c954_added_planet_mmodel.py new file mode 100644 index 000000000..4630b932b --- /dev/null +++ b/migrations/versions/91b40f34c954_added_planet_mmodel.py @@ -0,0 +1,34 @@ +"""Added planet model + +Revision ID: 91b40f34c954 +Revises: +Create Date: 2022-05-12 09:42:22.183892 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '91b40f34c954' +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=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('has_moon', sa.Boolean(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From b3455138789f31ae04c269e20c81c8a5c81aa36b Mon Sep 17 00:00:00 2001 From: Nina Date: Thu, 12 May 2022 19:52:50 -0700 Subject: [PATCH 06/10] completed wave_04 --- app/routes.py | 56 ++++++++++++------- ....py => 91b40f34c954_added_planet_model.py} | 0 2 files changed, 37 insertions(+), 19 deletions(-) rename migrations/versions/{91b40f34c954_added_planet_mmodel.py => 91b40f34c954_added_planet_model.py} (100%) diff --git a/app/routes.py b/app/routes.py index fbdd5fc00..b0cc71c44 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,23 +2,23 @@ from .models.planet import Planet from app import db -# def validate_planet(planet_id): -# try: -# planet_id = int(planet_id) -# except: -# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) -# for planet in planets: -# if planet.id == planet_id: -# return planet + planet = Planet.query.get(planet_id) -# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + if not planet: + abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + return planet bp = Blueprint("planets", __name__, url_prefix="/planets") @bp.route("", methods=("POST",)) -def post_planets(): +def post_planet(): request_body = request.get_json() new_planet = Planet(name=request_body["name"], @@ -38,13 +38,31 @@ def get_planets(): return jsonify(result_list), 200 -# @bp.route("/", methods=("GET",)) -# def get_individual_planet(planet_id): -# planet = validate_planet(planet_id) +@bp.route("/", methods=("GET",)) +def get_individual_planet(planet_id): + planet = validate_planet(planet_id) -# return { -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "has_moon": planet.has_moon -# }, 200 + return jsonify(planet.to_dict()), 200 + +@bp.route("/", methods=("PUT",)) +def put_planet(planet_id): + planet = validate_planet(planet_id) + + request_body = request.get_json() + + planet.name = request_body["name"] + planet.description = request_body["description"] + planet.has_moon = request_body["has_moon"] + + db.session.commit() + + return make_response(f"Planet #{planet.id} successfully updated"), 200 + +@bp.route("/", methods=("DELETE",)) +def delete_planet(planet_id): + planet = validate_planet(planet_id) + + db.session.delete(planet) + db.session.commit() + + return make_response(f"Planet #{planet.id} successfully deleted"), 200 diff --git a/migrations/versions/91b40f34c954_added_planet_mmodel.py b/migrations/versions/91b40f34c954_added_planet_model.py similarity index 100% rename from migrations/versions/91b40f34c954_added_planet_mmodel.py rename to migrations/versions/91b40f34c954_added_planet_model.py From ea270a8153014328f11c68d2f8d4fe807da57375 Mon Sep 17 00:00:00 2001 From: Nina Date: Fri, 13 May 2022 08:00:40 -0700 Subject: [PATCH 07/10] completed wave_05 --- app/models/planet.py | 11 +++++++++++ app/routes.py | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index f3117e95a..7db535541 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -12,3 +12,14 @@ def to_dict(self): name = self.name, description = self.description, has_moon = self.has_moon,) + + @classmethod + def from_dict(cls, data_dict): + return cls(name=data_dict["name"], + description=data_dict["description"], + has_moon=data_dict["has_moon"],) + + def replace_details(self, data_dict): + self.name = data_dict["name"] + self.description = data_dict["description"] + self.has_moon = data_dict["has_moon"] diff --git a/app/routes.py b/app/routes.py index b0cc71c44..1afe75ee3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,28 +2,42 @@ from .models.planet import Planet from app import db +def error_message(message, status_code): + abort(make_response(jsonify(dict(details=message)), status_code)) + def validate_planet(planet_id): try: planet_id = int(planet_id) except: - abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + error_message(f"planet {planet_id} invalid", 400) planet = Planet.query.get(planet_id) if not planet: - abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + error_message(f"planet {planet_id} not found", 404) return planet +def create_planet_safely(data_dict): + try: + return Planet.from_dict(data_dict) + except KeyError as err: + error_message(f"Missing key: {err}", 400) + +def replace_planet_safely(planet, data_dict): + try: + planet.replace_details(data_dict) + except KeyError as err: + error_message(f"Missing key: {err}", 400) + + bp = Blueprint("planets", __name__, url_prefix="/planets") @bp.route("", methods=("POST",)) def post_planet(): request_body = request.get_json() - new_planet = Planet(name=request_body["name"], - description=request_body["description"], - has_moon=request_body["has_moon"],) + new_planet = create_planet_safely(request_body) db.session.add(new_planet) db.session.commit() @@ -32,7 +46,15 @@ def post_planet(): @bp.route("", methods=("GET",)) def get_planets(): - planets = Planet.query.all() + description_query = request.args.get("description") + has_moon_query = request.args.get("has_moon") + + if description_query: + planets = Planet.query.filter_by(description=description_query) + elif has_moon_query: + planets = Planet.query.filter_by(has_moon=has_moon_query) + else: + planets = Planet.query.all() result_list = [planet.to_dict() for planet in planets] @@ -50,9 +72,7 @@ def put_planet(planet_id): request_body = request.get_json() - planet.name = request_body["name"] - planet.description = request_body["description"] - planet.has_moon = request_body["has_moon"] + replace_planet_safely(planet, request_body) db.session.commit() From d41fcca5710c4db73b5b1ce5160dfa1a1840f217 Mon Sep 17 00:00:00 2001 From: Nina Date: Sat, 14 May 2022 13:48:20 -0700 Subject: [PATCH 08/10] completed wave_06 --- app/__init__.py | 12 ++++++++- app/routes.py | 26 +++++++++--------- tests/__init__.py | 0 tests/conftest.py | 39 +++++++++++++++++++++++++++ tests/test_routes.py | 63 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 14 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_routes.py diff --git a/app/__init__.py b/app/__init__.py index 0add21118..406200f52 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,15 +1,25 @@ 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_DATABASE_URI'] = os.environ.get( + "SQLALCHEMY_DATABASE_URI") + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI") db.init_app(app) migrate.init_app(app, db) diff --git a/app/routes.py b/app/routes.py index 1afe75ee3..82aca0de4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -33,17 +33,6 @@ def replace_planet_safely(planet, data_dict): bp = Blueprint("planets", __name__, url_prefix="/planets") -@bp.route("", methods=("POST",)) -def post_planet(): - request_body = request.get_json() - - new_planet = create_planet_safely(request_body) - - db.session.add(new_planet) - db.session.commit() - - return make_response(f"Planet {new_planet.name} successfully created", 201) - @bp.route("", methods=("GET",)) def get_planets(): description_query = request.args.get("description") @@ -60,6 +49,17 @@ def get_planets(): return jsonify(result_list), 200 +@bp.route("", methods=("POST",)) +def post_one_planet(): + request_body = request.get_json() + + new_planet = create_planet_safely(request_body) + + db.session.add(new_planet) + db.session.commit() + + return make_response(jsonify(f"Planet {new_planet.name} successfully created")), 201 + @bp.route("/", methods=("GET",)) def get_individual_planet(planet_id): planet = validate_planet(planet_id) @@ -76,7 +76,7 @@ def put_planet(planet_id): db.session.commit() - return make_response(f"Planet #{planet.id} successfully updated"), 200 + return make_response(jsonify(f"Planet #{planet.id} successfully updated")), 200 @bp.route("/", methods=("DELETE",)) def delete_planet(planet_id): @@ -85,4 +85,4 @@ def delete_planet(planet_id): db.session.delete(planet) db.session.commit() - return make_response(f"Planet #{planet.id} successfully deleted"), 200 + return make_response(jsonify(f"Planet {planet.id} successfully deleted")), 200 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..cbfd880be --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,39 @@ +import pytest +from app import create_app +from app import db +from flask.signals import request_finished +from app.models.planet import Planet + + +@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): + + mercury = Planet(name="Mercury", + description="terrestrial", + has_moon = False) + saturn = Planet(name="Saturn", + description="gas giants", + has_moon = True) + + db.session.add_all([mercury, saturn]) + db.session.commit() diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..567349113 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,63 @@ +def test_get_planets_with_no_records(client): + # Act + response = client.get("/planets") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == [] + +def test_get_individual_planet(client, two_saved_planets): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == { + "id": 1, + "name": "Mercury", + "description": "terrestrial", + "has_moon": False + } + +def test_get_individual_planet_with_no_data(client): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 404 + +def test_get_planets(client, two_saved_planets): + # Act + response = client.get("/planets") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == [{ + "id": 1, + "name": "Mercury", + "description": "terrestrial", + "has_moon": False + }, + { + "id": 2, + "name": "Saturn", + "description": "gas giants", + "has_moon": True + }] + +def test_post_one_planet(client): + # Act + response = client.post("/planets", json={ + "name": "Earth", + "description": "terrestrial", + "has_moon": True + }) + response_body = response.get_json() + + # Assert + assert response.status_code == 201 + assert response_body == "Planet Earth successfully created" From 68d6a4fe4c294893ac75a9b1cb589ef48a62c73e Mon Sep 17 00:00:00 2001 From: Nina Date: Thu, 19 May 2022 14:44:51 -0700 Subject: [PATCH 09/10] added import of planet model in app/__init__ --- app/__init__.py | 6 ++++-- app/routes.py | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 406200f52..ffd8974d4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,10 +21,12 @@ def create_app(test_config=None): app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( "SQLALCHEMY_TEST_DATABASE_URI") + from app.models.planet import Planet + db.init_app(app) migrate.init_app(app, db) - from .routes import bp - app.register_blueprint(bp) + from .routes import planet_bp + app.register_blueprint(planet_bp) return app diff --git a/app/routes.py b/app/routes.py index 82aca0de4..ce8174b6e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -31,9 +31,9 @@ def replace_planet_safely(planet, data_dict): error_message(f"Missing key: {err}", 400) -bp = Blueprint("planets", __name__, url_prefix="/planets") +planet_bp = Blueprint("planets", __name__, url_prefix="/planets") -@bp.route("", methods=("GET",)) +@planet_bp.route("", methods=("GET",)) def get_planets(): description_query = request.args.get("description") has_moon_query = request.args.get("has_moon") @@ -49,7 +49,7 @@ def get_planets(): return jsonify(result_list), 200 -@bp.route("", methods=("POST",)) +@planet_bp.route("", methods=("POST",)) def post_one_planet(): request_body = request.get_json() @@ -60,13 +60,13 @@ def post_one_planet(): return make_response(jsonify(f"Planet {new_planet.name} successfully created")), 201 -@bp.route("/", methods=("GET",)) +@planet_bp.route("/", methods=("GET",)) def get_individual_planet(planet_id): planet = validate_planet(planet_id) return jsonify(planet.to_dict()), 200 -@bp.route("/", methods=("PUT",)) +@planet_bp.route("/", methods=("PUT",)) def put_planet(planet_id): planet = validate_planet(planet_id) @@ -78,7 +78,7 @@ def put_planet(planet_id): return make_response(jsonify(f"Planet #{planet.id} successfully updated")), 200 -@bp.route("/", methods=("DELETE",)) +@planet_bp.route("/", methods=("DELETE",)) def delete_planet(planet_id): planet = validate_planet(planet_id) @@ -86,3 +86,5 @@ def delete_planet(planet_id): db.session.commit() return make_response(jsonify(f"Planet {planet.id} successfully deleted")), 200 + +moon_bp = Blueprint("moons", __name__, url_prefix="/moons") From e54de21b4a3094cf68a837db6d73461438ef0652 Mon Sep 17 00:00:00 2001 From: Nina Date: Thu, 19 May 2022 14:46:01 -0700 Subject: [PATCH 10/10] removed moon_bp from routes --- app/routes.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index ce8174b6e..30465bb57 100644 --- a/app/routes.py +++ b/app/routes.py @@ -86,5 +86,3 @@ def delete_planet(planet_id): db.session.commit() return make_response(jsonify(f"Planet {planet.id} successfully deleted")), 200 - -moon_bp = Blueprint("moons", __name__, url_prefix="/moons")