From f9b18da5681026891387d130fe1bdb2bce4257cd Mon Sep 17 00:00:00 2001 From: halimAremu Date: Mon, 24 Apr 2023 10:09:22 -0500 Subject: [PATCH 1/9] defined handle all palnets route --- app/__init__.py | 2 ++ app/routes.py | 29 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..6596942bd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,5 +3,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..49f0fbdbc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,29 @@ -from flask import Blueprint +from flask import Blueprint, jsonify +class Planet: + def __init__(self, id, name, description, diameter): + self.id = id + self.name = name + self.description = description + self.diameter = diameter + +planets = [Planet(1, 'Venus', 'The hottest planet',12104 ), + Planet(2,'Mercury', 'Has no natural satellite', 4879), + Planet(3,'Earth', 'The only planet where life is found', 12742 ) + + ] + +planets_bp= Blueprint('planets', __name__,url_prefix='/planets') + +@planets_bp.route("", methods=['GET']) + +def handle_planets(): + planet_records= [] + for planet in planets: + planet_records.append( + {"id": planet.id, + "name": planet.name, + "description": planet.description, + "diameter": planet.diameter} + ) + return jsonify(planet_records) \ No newline at end of file From e06b036efd5f612a108bd1bd153b57dc42aaf460 Mon Sep 17 00:00:00 2001 From: halimAremu Date: Mon, 24 Apr 2023 10:25:33 -0500 Subject: [PATCH 2/9] completed wave 2 --- app/routes.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 49f0fbdbc..5aecab2cd 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, diameter): @@ -26,4 +26,26 @@ def handle_planets(): "description": planet.description, "diameter": planet.diameter} ) - return jsonify(planet_records) \ No newline at end of file + return jsonify(planet_records) + +def validate_planet(id): + try: + id = int(id) + except: + abort(make_response({"message": f" planet {id} invalid"}, 400)) + + for planet in planets: + if planet.id == id: + return planet + abort(make_response({"message":f"planet {id} not found"}, 404)) + + +@planets_bp.route("/", methods= ['GET']) +def handle_book(planet_id): + planet = validate_planet(planet_id) + return { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "diameter": planet.diameter + } \ No newline at end of file From 74a8a0036aaa1830ee431f8f123c2a8ebf3cb151 Mon Sep 17 00:00:00 2001 From: halimAremu Date: Wed, 26 Apr 2023 17:04:04 -0500 Subject: [PATCH 3/9] finished wave 3 --- app/__init__.py | 9 ++ app/models/__init__.py | 0 app/models/planet.py | 7 ++ app/routes.py | 74 ++++++++------ migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../ba182818ae97_changed_name_to_solar.py | 42 ++++++++ .../e9b8e201f964_created_solar_model.py | 34 +++++++ 10 files changed, 301 insertions(+), 31 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/ba182818ae97_changed_name_to_solar.py create mode 100644 migrations/versions/e9b8e201f964_created_solar_model.py diff --git a/app/__init__.py b/app/__init__.py index 6596942bd..ae99ff414 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +1,17 @@ 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' + from app.models.planet import Planet + db.init_app(app) + migrate.init_app(app, db) from .routes import planets_bp app.register_blueprint(planets_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..1b2af6dfc --- /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.Text) + form = db.Column(db.String) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 5aecab2cd..cdbd9e35c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,51 +1,63 @@ -from flask import Blueprint, jsonify, abort, make_response +from flask import Blueprint, jsonify, abort, make_response, request +from app.models.planet import Planet +from app import db -class Planet: - def __init__(self, id, name, description, diameter): - self.id = id - self.name = name - self.description = description - self.diameter = diameter +# class Planet: +# def __init__(self, id, name, description, diameter): +# self.id = id +# self.name = name +# self.description = description +# self.diameter = diameter -planets = [Planet(1, 'Venus', 'The hottest planet',12104 ), - Planet(2,'Mercury', 'Has no natural satellite', 4879), - Planet(3,'Earth', 'The only planet where life is found', 12742 ) +# planets = [Planet(1, 'Venus', 'The hottest planet',12104 ), +# Planet(2,'Mercury', 'Has no natural satellite', 4879), +# Planet(3,'Earth', 'The only planet where life is found', 12742 ) - ] +# ] planets_bp= Blueprint('planets', __name__,url_prefix='/planets') +@planets_bp.route("", methods=['POST']) +def create_planet(): + request_body = request.get_json() + new_planet = Planet(name=request_body["name"], + description=request_body["description"], form=request_body["form"]) + db.session.add(new_planet) + db.session.commit() + return make_response(f"Planet {new_planet.name} was created successfully", 201) + @planets_bp.route("", methods=['GET']) -def handle_planets(): +def read_all_planets(): planet_records= [] + planets=Planet.query.all() for planet in planets: planet_records.append( {"id": planet.id, "name": planet.name, "description": planet.description, - "diameter": planet.diameter} + "form": planet.form} ) return jsonify(planet_records) -def validate_planet(id): - try: - id = int(id) - except: - abort(make_response({"message": f" planet {id} invalid"}, 400)) +# def validate_planet(id): +# try: +# id = int(id) +# except: +# abort(make_response({"message": f" planet {id} invalid"}, 400)) - for planet in planets: - if planet.id == id: - return planet - abort(make_response({"message":f"planet {id} not found"}, 404)) +# for planet in planets: +# if planet.id == id: +# return planet +# abort(make_response({"message":f"planet {id} not found"}, 404)) -@planets_bp.route("/", methods= ['GET']) -def handle_book(planet_id): - planet = validate_planet(planet_id) - return { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "diameter": planet.diameter - } \ No newline at end of file +# @planets_bp.route("/", methods= ['GET']) +# def handle_book(planet_id): +# planet = validate_planet(planet_id) +# return { +# "id": planet.id, +# "name": planet.name, +# "description": planet.description, +# "diameter": planet.diameter +# } \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/ba182818ae97_changed_name_to_solar.py b/migrations/versions/ba182818ae97_changed_name_to_solar.py new file mode 100644 index 000000000..e7bf8e473 --- /dev/null +++ b/migrations/versions/ba182818ae97_changed_name_to_solar.py @@ -0,0 +1,42 @@ +"""changed name to solar + +Revision ID: ba182818ae97 +Revises: e9b8e201f964 +Create Date: 2023-04-26 16:13:55.883068 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ba182818ae97' +down_revision = 'e9b8e201f964' +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.Text(), nullable=True), + sa.Column('form', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.drop_table('solar') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('solar', + sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), + sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=True), + sa.Column('description', sa.TEXT(), autoincrement=False, nullable=True), + sa.Column('form', sa.VARCHAR(), autoincrement=False, nullable=True), + sa.PrimaryKeyConstraint('id', name='solar_pkey') + ) + op.drop_table('planet') + # ### end Alembic commands ### diff --git a/migrations/versions/e9b8e201f964_created_solar_model.py b/migrations/versions/e9b8e201f964_created_solar_model.py new file mode 100644 index 000000000..b3e1943a0 --- /dev/null +++ b/migrations/versions/e9b8e201f964_created_solar_model.py @@ -0,0 +1,34 @@ +"""created Solar model + +Revision ID: e9b8e201f964 +Revises: +Create Date: 2023-04-26 15:23:17.593584 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e9b8e201f964' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('solar', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('description', sa.Text(), nullable=True), + sa.Column('form', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('solar') + # ### end Alembic commands ### From d954946bdd14abe248bc60675ef0eb9fefda2909 Mon Sep 17 00:00:00 2001 From: halimAremu Date: Sun, 30 Apr 2023 06:12:22 -0500 Subject: [PATCH 4/9] completed wave 4 --- app/routes.py | 61 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/app/routes.py b/app/routes.py index cdbd9e35c..99ae2df83 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,7 +16,21 @@ # ] planets_bp= Blueprint('planets', __name__,url_prefix='/planets') - +# Helper function +def validate_planet(id): + try: + id = int(id) + except: + abort(make_response({"message": f" planet {id} invalid"}, 400)) + + planet = Planet.query.get(id) + if not planet: + abort(make_response({"message":f"planet {id} not found"}, 404)) + return planet + + + +# Routes @planets_bp.route("", methods=['POST']) def create_planet(): request_body = request.get_json() @@ -39,25 +53,32 @@ def read_all_planets(): "form": planet.form} ) return jsonify(planet_records) - -# def validate_planet(id): -# try: -# id = int(id) -# except: -# abort(make_response({"message": f" planet {id} invalid"}, 400)) -# for planet in planets: -# if planet.id == id: -# return planet -# abort(make_response({"message":f"planet {id} not found"}, 404)) +@planets_bp.route("/", methods= ['GET']) +def get_one_planet(planet_id): + planet = validate_planet(planet_id) + return { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "form": planet.form + } -# @planets_bp.route("/", methods= ['GET']) -# def handle_book(planet_id): -# planet = validate_planet(planet_id) -# return { -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "diameter": planet.diameter -# } \ No newline at end of file +@planets_bp.route("/", methods= ['PUT']) +def update_planet(planet_id): + planet = validate_planet(planet_id) + request_body = request.get_json() + planet.name = request_body["name"] + planet.description = request_body["description"] + planet.form = request_body["form"] + + db.session.commit() + return make_response(f"Planet {planet_id} updated succesffuly") + +@planets_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} deleted successfully") \ No newline at end of file From 7224468bfcb99e8edf7a0832a1d5afbd607ba7c5 Mon Sep 17 00:00:00 2001 From: halimAremu Date: Mon, 1 May 2023 19:05:29 -0500 Subject: [PATCH 5/9] created test files --- app/__init__.py | 13 +++++++++++-- app/routes.py | 6 +++--- tests/__init__.py | 0 tests/conftest.py | 25 +++++++++++++++++++++++++ tests/test_routes.py | 7 +++++++ 5 files changed, 46 insertions(+), 5 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 ae99ff414..99e0fbb29 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,14 +1,23 @@ 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") + from app.models.planet import Planet db.init_app(app) migrate.init_app(app, db) diff --git a/app/routes.py b/app/routes.py index 99ae2df83..37dc3c122 100644 --- a/app/routes.py +++ b/app/routes.py @@ -38,7 +38,7 @@ def create_planet(): description=request_body["description"], form=request_body["form"]) db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.name} was created successfully", 201) + return make_response(jsonify(f"Planet {new_planet.name} was created successfully"), 201) @planets_bp.route("", methods=['GET']) @@ -74,11 +74,11 @@ def update_planet(planet_id): planet.form = request_body["form"] db.session.commit() - return make_response(f"Planet {planet_id} updated succesffuly") + return make_response(jsonify(f"Planet {planet_id} updated succesffuly"), 200) @planets_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} deleted successfully") \ No newline at end of file + return make_response(jsonify(f"Planet {planet_id} deleted successfully")) \ No newline at end of file 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..5bb24c416 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,25 @@ +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() + + \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..10b9c9442 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,7 @@ +def test_get_all_planets_no_record(client): + response = client.get("/planets") + response_body = response.get_json() + + # assert + assert response.status_code == 200 + assert response_body == [] \ No newline at end of file From 520bd14439aa19e0ec2d753ef137d985b94a6234 Mon Sep 17 00:00:00 2001 From: halimAremu Date: Tue, 2 May 2023 17:32:56 -0500 Subject: [PATCH 6/9] more tests --- app/models/planet.py | 17 ++++++++++++++++- app/routes.py | 18 +++++------------- tests/conftest.py | 8 +++++++- tests/test_routes.py | 21 ++++++++++++++++++++- 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 1b2af6dfc..96446fbc6 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -4,4 +4,19 @@ class Planet(db.Model): id = db.Column(db.Integer,primary_key = True, autoincrement = True) name = db.Column(db.String) description = db.Column(db.Text) - form = db.Column(db.String) \ No newline at end of file + form = db.Column(db.String) + + def to_dict(self): + planet_dict = {} + planet_dict["id"] = self.id + planet_dict["name"] = self.name + planet_dict["description"] = self.description + planet_dict["form"] = self.form + + return planet_dict + @classmethod + def from_dict(cls, planet_data): + new_planet = Planet(name=planet_data["name"], + description=planet_data["description"], + form=planet_data["form"]) + return new_planet \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 37dc3c122..2ed69a195 100644 --- a/app/routes.py +++ b/app/routes.py @@ -34,8 +34,7 @@ def validate_planet(id): @planets_bp.route("", methods=['POST']) def create_planet(): request_body = request.get_json() - new_planet = Planet(name=request_body["name"], - description=request_body["description"], form=request_body["form"]) + new_planet = Planet.from_dict(request_body) db.session.add(new_planet) db.session.commit() return make_response(jsonify(f"Planet {new_planet.name} was created successfully"), 201) @@ -47,23 +46,16 @@ def read_all_planets(): planets=Planet.query.all() for planet in planets: planet_records.append( - {"id": planet.id, - "name": planet.name, - "description": planet.description, - "form": planet.form} - ) + planet.to_dict()) return jsonify(planet_records) @planets_bp.route("/", methods= ['GET']) def get_one_planet(planet_id): planet = validate_planet(planet_id) - return { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "form": planet.form - } + + return planet.to_dict() + @planets_bp.route("/", methods= ['PUT']) def update_planet(planet_id): diff --git a/tests/conftest.py b/tests/conftest.py index 5bb24c416..ec286a144 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,5 +21,11 @@ def expire_session(sender, response, **extra): @pytest.fixture def client(app): return app.test_client() - + +@pytest.fixture +def saved_planets(app): + planet_mercury = Planet(name = "Mercury", description = "rocky planet", form = "solid" ) + planet_venus = Planet(name = "Venus", description = "gassy planet", form = "gas" ) + db.session.add_all([planet_mercury, planet_venus]) + db.session.commit() \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py index 10b9c9442..e3d7b6d0c 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,7 +1,26 @@ +from app.models.planet import Planet def test_get_all_planets_no_record(client): response = client.get("/planets") response_body = response.get_json() # assert assert response.status_code == 200 - assert response_body == [] \ No newline at end of file + assert response_body == [] + +def test_get_one_planet_with_test_data(client, saved_planets): + response = client.get("/planets/1") + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == { + "id": 1, + "name": "Mercury", + "description": "rocky planet", + "form": "solid" + } +def test_get_one_planet_with_no_data(client): + response = client.get("/planets/1") + response_body = response.get_json() + + assert response.status_code == 404 + assert response_body == {"message":"planet 1 not found"} \ No newline at end of file From 27936ea3256ca1acbbcfdc26eb2d345f783981e0 Mon Sep 17 00:00:00 2001 From: halimAremu Date: Wed, 3 May 2023 13:30:19 -0500 Subject: [PATCH 7/9] wave 6 complete --- app/routes.py | 6 +++++- tests/test_routes.py | 26 +++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 2ed69a195..fb7da5fb7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -42,8 +42,12 @@ def create_planet(): @planets_bp.route("", methods=['GET']) def read_all_planets(): + name_query = request.args.get("name") + if name_query: + planets = Planet.query.filter_by(name=name_query) + else: + planets = Planet.query.all() planet_records= [] - planets=Planet.query.all() for planet in planets: planet_records.append( planet.to_dict()) diff --git a/tests/test_routes.py b/tests/test_routes.py index e3d7b6d0c..93944f523 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -23,4 +23,28 @@ def test_get_one_planet_with_no_data(client): response_body = response.get_json() assert response.status_code == 404 - assert response_body == {"message":"planet 1 not found"} \ No newline at end of file + assert response_body == {"message":"planet 1 not found"} + +def test_get_planets_with_valid_test_data(client, saved_planets): + response = client.get("/planets") + response_body = response.get_json() + + assert response.status_code == 200 + assert len(response_body) == 2 + assert response_body[0] == {"id":1, "name":"Mercury", + "description":"rocky planet", "form":"solid" } + +def test_create_one_planet(client): + PLANET_DICT = {"name": "Saturn", + "description":"made of hydrogen", + "form":"gas"} + response = client.post("/planets", json=PLANET_DICT) + response_body = response.get_json() + + actual_planet = Planet.query.get(1) + + assert response.status_code == 201 + assert response_body == "Planet Saturn was created successfully" + assert actual_planet.name == "Saturn" + assert actual_planet.description == "made of hydrogen" + assert actual_planet.form =="gas" \ No newline at end of file From 8ef3eefec4ece08615db92c316ac92dc1e691d38 Mon Sep 17 00:00:00 2001 From: halimAremu Date: Thu, 4 May 2023 13:30:22 -0500 Subject: [PATCH 8/9] refactored validate_planet to validate_model --- app/routes.py | 20 ++++++++++---------- tests/test_routes.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/routes.py b/app/routes.py index fb7da5fb7..ae8125fb6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,16 +17,16 @@ planets_bp= Blueprint('planets', __name__,url_prefix='/planets') # Helper function -def validate_planet(id): +def validate_planet(cls,model_id): try: - id = int(id) + model_id = int(model_id) except: - abort(make_response({"message": f" planet {id} invalid"}, 400)) + abort(make_response({"message": f" {cls.__name__} {model_id} invalid"}, 400)) - planet = Planet.query.get(id) - if not planet: - abort(make_response({"message":f"planet {id} not found"}, 404)) - return planet + model = cls.query.get(model_id) + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + return model @@ -56,14 +56,14 @@ def read_all_planets(): @planets_bp.route("/", methods= ['GET']) def get_one_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_planet(Planet, planet_id) return planet.to_dict() @planets_bp.route("/", methods= ['PUT']) def update_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_planet(Planet, planet_id) request_body = request.get_json() planet.name = request_body["name"] planet.description = request_body["description"] @@ -74,7 +74,7 @@ def update_planet(planet_id): @planets_bp.route("/", methods= ['DELETE']) def delete_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_planet(Planet, planet_id) db.session.delete(planet) db.session.commit() return make_response(jsonify(f"Planet {planet_id} deleted successfully")) \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py index 93944f523..b800ff91e 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -23,7 +23,7 @@ def test_get_one_planet_with_no_data(client): response_body = response.get_json() assert response.status_code == 404 - assert response_body == {"message":"planet 1 not found"} + assert response_body == {"message":"Planet 1 not found"} def test_get_planets_with_valid_test_data(client, saved_planets): response = client.get("/planets") From ea16ba19947a09487d2a5aebcd84ada3dba7d19a Mon Sep 17 00:00:00 2001 From: halimAremu Date: Thu, 4 May 2023 13:32:39 -0500 Subject: [PATCH 9/9] corrected validate_model error --- app/routes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index ae8125fb6..998e78ad7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,7 +17,7 @@ planets_bp= Blueprint('planets', __name__,url_prefix='/planets') # Helper function -def validate_planet(cls,model_id): +def validate_model(cls,model_id): try: model_id = int(model_id) except: @@ -56,14 +56,14 @@ def read_all_planets(): @planets_bp.route("/", methods= ['GET']) def get_one_planet(planet_id): - planet = validate_planet(Planet, planet_id) + planet = validate_model(Planet, planet_id) return planet.to_dict() @planets_bp.route("/", methods= ['PUT']) def update_planet(planet_id): - planet = validate_planet(Planet, planet_id) + planet = validate_model(Planet, planet_id) request_body = request.get_json() planet.name = request_body["name"] planet.description = request_body["description"] @@ -74,7 +74,7 @@ def update_planet(planet_id): @planets_bp.route("/", methods= ['DELETE']) def delete_planet(planet_id): - planet = validate_planet(Planet, planet_id) + planet = validate_model(Planet, planet_id) db.session.delete(planet) db.session.commit() return make_response(jsonify(f"Planet {planet_id} deleted successfully")) \ No newline at end of file