From 5689c20abb129c0ed2d20caceed8ee53eb5c4fba Mon Sep 17 00:00:00 2001 From: Vange Spracklin Date: Fri, 15 Oct 2021 11:13:01 -0700 Subject: [PATCH 1/9] reads all planets --- app/__init__.py | 3 +++ app/routes.py | 28 +++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..ab9eee40e 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 planets_bp + app.register_blueprint(planets_bp) + return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..9f8506dd8 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,28 @@ -from flask import Blueprint +from flask import Blueprint, jsonify +class Planet: + def __init__(self, id, name, description, sign): + self.id = id + self.name = name + self.description = description + self.sign = sign + +venus = Planet(1, "Venus", "Planet of beauty", "Libra") +mercury = Planet(2, "Mercury", "Planet of very compute", "Virgo") +jupiter = Planet(3, "Jupiter", "Planet of luck", "Saggitarius") + +planets = [venus, mercury, jupiter] + +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + +@planets_bp.route("", methods = ["GET"]) +def get_planets(): + planets_response = [] + for planet in planets: + planets_response.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "sign": planet.sign + }) + return jsonify(planets_response) From 4e4597382c4ce22d3617693c4678666ba459b74c Mon Sep 17 00:00:00 2001 From: Arianna Cabebe Date: Mon, 18 Oct 2021 13:45:03 -0700 Subject: [PATCH 2/9] added get single planet by name --- app/routes.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/routes.py b/app/routes.py index 9f8506dd8..8c5d14ab4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -26,3 +26,15 @@ def get_planets(): "sign": planet.sign }) return jsonify(planets_response) + +@planets_bp.route("/", methods = ["GET"]) +def get_planet(planet_name): + for planet in planets: + if planet.name.lower() == planet_name.lower(): + planet_response = { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "sign": planet.sign + } + return planet_response From 3744ed84c0de203938b9e063c9fcb77348258d43 Mon Sep 17 00:00:00 2001 From: Vange Spracklin Date: Fri, 22 Oct 2021 11:15:31 -0700 Subject: [PATCH 3/9] adds Planet model --- app/__init__.py | 12 +++ app/models/planet.py | 8 ++ app/routes.py | 71 +++++++------- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../3f95ba4c789d_added_planet_model.py | 34 +++++++ 8 files changed, 257 insertions(+), 34 deletions(-) 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/3f95ba4c789d_added_planet_model.py diff --git a/app/__init__.py b/app/__init__.py index ab9eee40e..6e1ebc4c7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,9 +1,21 @@ 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 app.models.planet import Planet + from .routes import planets_bp app.register_blueprint(planets_bp) diff --git a/app/models/planet.py b/app/models/planet.py new file mode 100644 index 000000000..4fb6e7954 --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,8 @@ +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) + sign = db.Column(db.String) + diff --git a/app/routes.py b/app/routes.py index 8c5d14ab4..f9915e5f5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,40 +1,43 @@ from flask import Blueprint, jsonify -class Planet: - def __init__(self, id, name, description, sign): - self.id = id - self.name = name - self.description = description - self.sign = sign +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -venus = Planet(1, "Venus", "Planet of beauty", "Libra") -mercury = Planet(2, "Mercury", "Planet of very compute", "Virgo") -jupiter = Planet(3, "Jupiter", "Planet of luck", "Saggitarius") - -planets = [venus, mercury, jupiter] +# class Planet: +# def __init__(self, id, name, description, sign): +# self.id = id +# self.name = name +# self.description = description +# self.sign = sign -planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -@planets_bp.route("", methods = ["GET"]) -def get_planets(): - planets_response = [] - for planet in planets: - planets_response.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "sign": planet.sign - }) - return jsonify(planets_response) -@planets_bp.route("/", methods = ["GET"]) -def get_planet(planet_name): - for planet in planets: - if planet.name.lower() == planet_name.lower(): - planet_response = { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "sign": planet.sign - } - return planet_response +# YE OLDE STUFF +# venus = Planet(1, "Venus", "Planet of beauty", "Libra") +# mercury = Planet(2, "Mercury", "Planet of very compute", "Virgo") +# jupiter = Planet(3, "Jupiter", "Planet of luck", "Saggitarius") + +# planets = [venus, mercury, jupiter] + +# @planets_bp.route("", methods = ["GET"]) +# def get_planets(): +# planets_response = [] +# for planet in planets: +# planets_response.append({ +# "id": planet.id, +# "name": planet.name, +# "description": planet.description, +# "sign": planet.sign +# }) +# return jsonify(planets_response) + +# @planets_bp.route("/", methods = ["GET"]) +# def get_planet(planet_name): +# for planet in planets: +# if planet.name.lower() == planet_name.lower(): +# planet_response = { +# "id": planet.id, +# "name": planet.name, +# "description": planet.description, +# "sign": planet.sign +# } +# return planet_response 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/3f95ba4c789d_added_planet_model.py b/migrations/versions/3f95ba4c789d_added_planet_model.py new file mode 100644 index 000000000..9230ff892 --- /dev/null +++ b/migrations/versions/3f95ba4c789d_added_planet_model.py @@ -0,0 +1,34 @@ +"""added Planet model + +Revision ID: 3f95ba4c789d +Revises: +Create Date: 2021-10-22 11:09:58.752109 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3f95ba4c789d' +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('sign', 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 28019064e07a9c51b5c12d7573e63e22c5a6dc69 Mon Sep 17 00:00:00 2001 From: Arianna Cabebe Date: Mon, 25 Oct 2021 14:33:33 -0700 Subject: [PATCH 4/9] adds POST endpoint --- app/__init__.py | 1 + app/routes.py | 57 +++++++++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 6e1ebc4c7..b69c30360 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -10,6 +10,7 @@ def create_app(test_config=None): app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = "postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development" + app.config['SQLALCHEMY_ECHO'] = True db.init_app(app) migrate.init_app(app, db) diff --git a/app/routes.py b/app/routes.py index f9915e5f5..0ff7492dc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,34 +1,41 @@ -from flask import Blueprint, jsonify +from flask import Blueprint, jsonify, request +from app.models.planet import Planet +from app import db planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -# class Planet: -# def __init__(self, id, name, description, sign): -# self.id = id -# self.name = name -# self.description = description -# self.sign = sign +@planets_bp.route("", methods = ["GET", "POST"]) +def get_planets(): + if request.method == "GET": + planets = Planet.query.all() + planets_response = [] + for planet in planets: + planets_response.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "sign": planet.sign + }) + if not planets_response: + return jsonify("There are no planets yet! :O", 200) + return jsonify(planets_response) + elif request.method == "POST": + request_body = request.get_json() + if "name" not in request_body or "description" not in request_body or "sign" not in request_body: + return jsonify("Invalid request", 400) + + new_planet = Planet( + name = request_body["name"], + description = request_body["description"], + sign = request_body["sign"] + ) + + db.session.add(new_planet) + db.session.commit() + return f"Planet {new_planet.name} created.", 201 -# YE OLDE STUFF -# venus = Planet(1, "Venus", "Planet of beauty", "Libra") -# mercury = Planet(2, "Mercury", "Planet of very compute", "Virgo") -# jupiter = Planet(3, "Jupiter", "Planet of luck", "Saggitarius") - -# planets = [venus, mercury, jupiter] - -# @planets_bp.route("", methods = ["GET"]) -# def get_planets(): -# planets_response = [] -# for planet in planets: -# planets_response.append({ -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "sign": planet.sign -# }) -# return jsonify(planets_response) # @planets_bp.route("/", methods = ["GET"]) # def get_planet(planet_name): From 725818197341ed4ee8f7f60c0a36e20d6bf9d792 Mon Sep 17 00:00:00 2001 From: Arianna Cabebe Date: Mon, 25 Oct 2021 14:46:20 -0700 Subject: [PATCH 5/9] adds GET one planet endpoint --- app/routes.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0ff7492dc..1d24c32ac 100644 --- a/app/routes.py +++ b/app/routes.py @@ -37,14 +37,23 @@ def get_planets(): return f"Planet {new_planet.name} created.", 201 -# @planets_bp.route("/", methods = ["GET"]) -# def get_planet(planet_name): -# for planet in planets: -# if planet.name.lower() == planet_name.lower(): -# planet_response = { -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "sign": planet.sign -# } -# return planet_response +@planets_bp.route("/", methods = ["GET"]) +def get_planet(planet_id): + planet = Planet.query.get(planet_id) + if planet is None: + return jsonify(f"Planet with ID {planet_id} not found.", 404) + # if request.method == "GET": + return { + "name": planet.name, + "description": planet.description, + "sign": planet.sign + } + # for planet in planets: + # if planet.name.lower() == planet_name.lower(): + # planet_response = { + # "id": planet.id, + # "name": planet.name, + # "description": planet.description, + # "sign": planet.sign + # } + # return planet_response From bd6052d7b5e90579100908a5aa8f143fb5430edf Mon Sep 17 00:00:00 2001 From: Vange Spracklin Date: Tue, 26 Oct 2021 11:15:05 -0700 Subject: [PATCH 6/9] adds UPDATe and DELETE endpoints and 404 guard clause --- app/routes.py | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/app/routes.py b/app/routes.py index 1d24c32ac..e34941b45 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,7 +4,6 @@ planets_bp = Blueprint("planets", __name__, url_prefix="/planets") - @planets_bp.route("", methods = ["GET", "POST"]) def get_planets(): if request.method == "GET": @@ -37,17 +36,35 @@ def get_planets(): return f"Planet {new_planet.name} created.", 201 -@planets_bp.route("/", methods = ["GET"]) +@planets_bp.route("/", methods = ["GET", "PUT", "DELETE"]) def get_planet(planet_id): planet = Planet.query.get(planet_id) if planet is None: - return jsonify(f"Planet with ID {planet_id} not found.", 404) - # if request.method == "GET": - return { - "name": planet.name, - "description": planet.description, - "sign": planet.sign - } + return jsonify(f"Planet with ID {planet_id} not found."), 404 + + if request.method == "GET": + return { + "name": planet.name, + "description": planet.description, + "sign": planet.sign + } + + elif request.method == "PUT": + request_body = request.get_json() + planet.name = request_body["name"] + planet.description = request_body["description"] + planet.sign = request_body["sign"] + + db.session.commit() + + return jsonify(f"Planet nummber {planet.id} successfully updated!") + + elif request.method == "DELETE": + db.session.delete(planet) + db.session.commit() + + return jsonify(f"Planet {planet.name} successfully deleted! bye bitch") + # for planet in planets: # if planet.name.lower() == planet_name.lower(): # planet_response = { From 33e0a8c33153d3e27306e2686e15368cebb16e37 Mon Sep 17 00:00:00 2001 From: Arianna Cabebe Date: Thu, 28 Oct 2021 12:48:01 -0700 Subject: [PATCH 7/9] Started adding fixtures, first test does not pass --- app/__init__.py | 13 +++++++++++-- tests/__init__.py | 0 tests/conftest.py | 18 ++++++++++++++++++ tests/test_routes.py | 6 ++++++ 4 files changed, 35 insertions(+), 2 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 b69c30360..f53fc4f5d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,15 +1,24 @@ 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') + app.config['SQLALCHEMY_ECHO'] = True db.init_app(app) 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..5bcc92e3b --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,18 @@ +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() \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..8fa59483f --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,6 @@ +def test_get_all_planets_returns_200(client): + response = client.get('/planets') + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == [] \ No newline at end of file From a05532761e87ee85b909fa92dc05d57750627679 Mon Sep 17 00:00:00 2001 From: Arianna Cabebe Date: Thu, 28 Oct 2021 13:10:48 -0700 Subject: [PATCH 8/9] created test folder, configured conftest.py. Test passing --- tests/test_routes.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index 8fa59483f..e58a3da55 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,6 +1,9 @@ +import pytest + def test_get_all_planets_returns_200(client): response = client.get('/planets') response_body = response.get_json() assert response.status_code == 200 - assert response_body == [] \ No newline at end of file + # assert response_body == [] + assert response_body == ['There are no planets yet! :O', 200] \ No newline at end of file From 725d30c375b4d198db2ba7da4352b95bba6d6f1e Mon Sep 17 00:00:00 2001 From: Arianna Cabebe Date: Thu, 28 Oct 2021 15:18:25 -0700 Subject: [PATCH 9/9] added all tests. all tests passing --- requirements.txt | 7 +++++ tests/conftest.py | 19 +++++++++++-- tests/test_routes.py | 63 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 83 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index fd90fffa8..dcbd7413b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ alembic==1.5.4 +attrs==21.2.0 autopep8==1.5.5 certifi==2020.12.5 chardet==4.0.0 @@ -7,12 +8,18 @@ Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 idna==2.10 +iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +packaging==21.0 +pluggy==1.0.0 psycopg2-binary==2.8.6 +py==1.10.0 pycodestyle==2.6.0 +pyparsing==3.0.3 +pytest==6.2.5 python-dateutil==2.8.1 python-dotenv==0.15.0 python-editor==1.0.4 diff --git a/tests/conftest.py b/tests/conftest.py index 5bcc92e3b..1b915e401 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,7 @@ import pytest from app import create_app from app import db +from app.models.planet import Planet @pytest.fixture def app(): @@ -12,7 +13,21 @@ def app(): with app.app_context(): db.drop_all() - @pytest.fixture def client(app): - return app.test_client() \ No newline at end of file + return app.test_client() + +@pytest.fixture +def add_planet(): + pluto = Planet(name="pluto", description="way out there", sign="Scorpio") + db.session.add(pluto) + db.session.commit() + +@pytest.fixture +def add_three_planets(): + pluto = Planet(name="pluto", description="way out there", sign="Scorpio") + mercury = Planet(name="mercury", description="messenger closest to sign", sign="Virgo") + saturn = Planet(name="saturn", description="forever hula hooping", sign="Capricorn") + + db.session.add_all([pluto, mercury, saturn]) + db.session.commit() \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py index e58a3da55..ce4d8c5b9 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,9 +1,64 @@ -import pytest +from app.models.planet import Planet +import json -def test_get_all_planets_returns_200(client): +def test_get_all_planets_database_empty(client): response = client.get('/planets') response_body = response.get_json() assert response.status_code == 200 - # assert response_body == [] - assert response_body == ['There are no planets yet! :O', 200] \ No newline at end of file + assert response_body == ['There are no planets yet! :O', 200] + + +def test_get_one_planet(client, add_planet): + response = client.get('/planets/1') + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == { + "description": "way out there", + "name": "pluto", + "sign": "Scorpio"} + +def test_get_one_planet_no_data_no_fixture_returns_404(client): + response = client.get('/planets/1') + response_body = response.get_json() + + assert response.status_code == 404 + assert response_body == "Planet with ID 1 not found." + +def test_get_all_planets_returns_200(client, add_three_planets): + response = client.get('/planets') + response_body = response.get_json() + + assert response.status_code == 200 + assert len(response_body) == 3 + assert response_body == [ + { + "name": "pluto", + "id": 1, + "description": "way out there", + "sign": "Scorpio" + }, + { + "name": "mercury", + "id": 2, + "description": "messenger closest to sign", + "sign": "Virgo" + }, + { + "name": "saturn", + "id": 3, + "description": "forever hula hooping", + "sign": "Capricorn" + } + ] + +def test_create_planet_return_201(client, add_planet): + planet_data = { + "name":"bluto", + "description":"who knows", + "sign":"Taurus" + } + response = client.post('/planets', data=json.dumps(planet_data), content_type='application/json') + + assert response.status_code == 201