From 1435d07ae3c2fbf28faa181fc776fd015962472f Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Mon, 24 Oct 2022 15:55:43 -0400 Subject: [PATCH 01/13] Wave 1 complete --- app/__init__.py | 4 +++- app/routes.py | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..c211c02a9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,9 @@ from flask import Flask - 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..7a167da71 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,27 @@ -from flask import Blueprint +from flask import Blueprint, jsonify +class Planet: + def __init__(self, id, name, description, size): + self.id = id + self.name = name + self.description = description + self.size = size +planets = [ + Planet(1, "Mars", "red", "small"), + Planet(2, "Venus", "poisonous", "smallish"), + Planet(3, "Saturn", "has rings", "large") +] + +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +@planets_bp.route("", methods=["GET"]) +def handle_planets(): + planets_response = [] + for planet in planets: + planets_response.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "size": planet.size + }) + + return jsonify(planets_response) From 4b6be3aca3e1d8971004ca5fc92d335b27d7156e Mon Sep 17 00:00:00 2001 From: Luciane Dias Date: Tue, 25 Oct 2022 13:18:00 -0700 Subject: [PATCH 02/13] Finished wave 2 error 400 --- app/routes.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 7a167da71..9b13dbef7 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, size): @@ -13,6 +13,18 @@ def __init__(self, id, name, description, size): ] planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + +def validate(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message": f"Invalid planet id: '{planet_id}'"}, 400)) + planet = Planet.query.get(planet_id) + if planet: + return planet + + abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) + @planets_bp.route("", methods=["GET"]) def handle_planets(): planets_response = [] From 2a73b73bc98cda047a41fff139c500b963f9b0dd Mon Sep 17 00:00:00 2001 From: Luciane Dias Date: Fri, 28 Oct 2022 11:34:31 -0700 Subject: [PATCH 03/13] created a class planet in wave 3 --- app/model/__init__.py | 0 app/model/planet.py | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 app/model/__init__.py create mode 100644 app/model/planet.py diff --git a/app/model/__init__.py b/app/model/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/model/planet.py b/app/model/planet.py new file mode 100644 index 000000000..762747dfe --- /dev/null +++ b/app/model/planet.py @@ -0,0 +1,8 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Intenger, primary_key=True, autoincrement=True) + name = db.Column(db.String) + description = db.Column(db.String) + size = db.Column(db.String) + From 85bbcade6553fadf860eb5bb66deb60700b536d2 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Fri, 28 Oct 2022 15:16:51 -0400 Subject: [PATCH 04/13] working on wave 3 restful endpoints --- app/__init__.py | 13 +++ app/{model => models}/__init__.py | 0 app/{model => models}/planet.py | 2 +- app/routes.py | 45 +++++---- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../defb5e09b592_adds_planet_model.py | 34 +++++++ 9 files changed, 238 insertions(+), 22 deletions(-) rename app/{model => models}/__init__.py (100%) rename app/{model => models}/planet.py (68%) 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/defb5e09b592_adds_planet_model.py diff --git a/app/__init__.py b/app/__init__.py index c211c02a9..a740e1e75 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,20 @@ 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/model/__init__.py b/app/models/__init__.py similarity index 100% rename from app/model/__init__.py rename to app/models/__init__.py diff --git a/app/model/planet.py b/app/models/planet.py similarity index 68% rename from app/model/planet.py rename to app/models/planet.py index 762747dfe..6b0fcbaf7 100644 --- a/app/model/planet.py +++ b/app/models/planet.py @@ -1,7 +1,7 @@ from app import db class Planet(db.Model): - id = db.Column(db.Intenger, primary_key=True, autoincrement=True) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String) description = db.Column(db.String) size = db.Column(db.String) diff --git a/app/routes.py b/app/routes.py index 9b13dbef7..4d63855cb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,32 +1,35 @@ -from flask import Blueprint, jsonify, abort, make_response +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, abort, make_response, request -class Planet: - def __init__(self, id, name, description, size): - self.id = id - self.name = name - self.description = description - self.size = size -planets = [ - Planet(1, "Mars", "red", "small"), - Planet(2, "Venus", "poisonous", "smallish"), - Planet(3, "Saturn", "has rings", "large") -] +# class Planet: +# def __init__(self, id, name, description, size): +# self.id = id +# self.name = name +# self.description = description +# self.size = size +# planets = [ +# Planet(1, "Mars", "red", "small"), +# Planet(2, "Venus", "poisonous", "smallish"), +# Planet(3, "Saturn", "has rings", "large") +# ] planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -def validate(planet_id): - try: - planet_id = int(planet_id) - except: - abort(make_response({"message": f"Invalid planet id: '{planet_id}'"}, 400)) - planet = Planet.query.get(planet_id) - if planet: - return planet +# def validate(planet_id): +# try: +# planet_id = int(planet_id) +# except: +# abort(make_response({"message": f"Invalid planet id: '{planet_id}'"}, 400)) +# planet = Planet.query.get(planet_id) +# if planet: +# return planet - abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) +# abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) @planets_bp.route("", methods=["GET"]) def handle_planets(): + planets = Planet.query.all() planets_response = [] for planet in planets: planets_response.append({ 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/defb5e09b592_adds_planet_model.py b/migrations/versions/defb5e09b592_adds_planet_model.py new file mode 100644 index 000000000..65b8e8c08 --- /dev/null +++ b/migrations/versions/defb5e09b592_adds_planet_model.py @@ -0,0 +1,34 @@ +"""adds Planet model + +Revision ID: defb5e09b592 +Revises: +Create Date: 2022-10-28 14:56:07.797505 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'defb5e09b592' +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('size', 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 3a8e712183eb564bad1b71bf96242b864055f0f5 Mon Sep 17 00:00:00 2001 From: Luciane Dias Date: Fri, 28 Oct 2022 13:52:52 -0700 Subject: [PATCH 05/13] uptadet migration --- app/model/__init__.py | 0 app/model/planet.py | 8 ++++++++ app/routes.py | 17 ++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 app/model/__init__.py create mode 100644 app/model/planet.py diff --git a/app/model/__init__.py b/app/model/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/model/planet.py b/app/model/planet.py new file mode 100644 index 000000000..762747dfe --- /dev/null +++ b/app/model/planet.py @@ -0,0 +1,8 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Intenger, primary_key=True, autoincrement=True) + name = db.Column(db.String) + description = db.Column(db.String) + size = db.Column(db.String) + diff --git a/app/routes.py b/app/routes.py index 4d63855cb..3cdb6fde0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -28,7 +28,8 @@ # abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) @planets_bp.route("", methods=["GET"]) -def handle_planets(): +def read_all_planets(): + request.method == "GET" planets = Planet.query.all() planets_response = [] for planet in planets: @@ -40,3 +41,17 @@ def handle_planets(): }) return jsonify(planets_response) + +@planets_bp.route("", methods=["POST"]) +def create_planet(): + request_body = request.get_json() + new_planet = Planet( + name=request_body["name"], + description=request_body["description"], + size=request_body["size"] + ) + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} created", 201) + \ No newline at end of file From 6d0936e28383d75cbcf24e3c33267befb60df563 Mon Sep 17 00:00:00 2001 From: Luciane Dias Date: Tue, 1 Nov 2022 11:28:09 -0700 Subject: [PATCH 06/13] created method PUT in routes --- app/routes.py | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3cdb6fde0..eebd22227 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,16 +16,16 @@ planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -# def validate(planet_id): -# try: -# planet_id = int(planet_id) -# except: -# abort(make_response({"message": f"Invalid planet id: '{planet_id}'"}, 400)) -# planet = Planet.query.get(planet_id) -# if planet: -# return planet +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message": f"Invalid planet id: '{planet_id}'"}, 400)) + planet = Planet.query.get(planet_id) + if planet: + return planet -# abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) + abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) @planets_bp.route("", methods=["GET"]) def read_all_planets(): @@ -54,4 +54,18 @@ def create_planet(): db.session.commit() return make_response(f"Planet {new_planet.name} created", 201) - \ 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.size = request_body["size"] + + db.session.commit() + + return make_response(f"Planet #{planet.id} successfully updated") \ No newline at end of file From a81b2af64d5357d106e2b0373fb4f4c50d6ae9d3 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Tue, 1 Nov 2022 14:43:23 -0400 Subject: [PATCH 07/13] adds delete planet method --- app/routes.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index eebd22227..c756f8341 100644 --- a/app/routes.py +++ b/app/routes.py @@ -21,11 +21,13 @@ def validate_planet(planet_id): planet_id = int(planet_id) except: abort(make_response({"message": f"Invalid planet id: '{planet_id}'"}, 400)) + planet = Planet.query.get(planet_id) - if planet: - return planet - abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) + if not planet: + abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) + + return planet @planets_bp.route("", methods=["GET"]) def read_all_planets(): @@ -68,4 +70,13 @@ def update_planet(planet_id): db.session.commit() - return make_response(f"Planet #{planet.id} successfully updated") \ No newline at end of file + return make_response(f"Planet #{planet.id} successfully updated") + +@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} successfully deleted") \ No newline at end of file From 9ef5a2443398e493d79a02301af43255e81d438c Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Tue, 1 Nov 2022 15:01:34 -0400 Subject: [PATCH 08/13] adds read_one_planet --- app/routes.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index c756f8341..8c37bb5d3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,6 @@ from app import db from app.models.planet import Planet -from flask import Blueprint, jsonify, abort, make_response, request +from flask import Blueprint, jsonify, make_response, request, abort # class Planet: # def __init__(self, id, name, description, size): @@ -20,12 +20,12 @@ def validate_planet(planet_id): try: planet_id = int(planet_id) except: - abort(make_response({"message": f"Invalid planet id: '{planet_id}'"}, 400)) + abort(make_response({"message": f"Invalid planet id: {planet_id}"}, 400)) planet = Planet.query.get(planet_id) if not planet: - abort(make_response({"message": f'planet id {planet_id} not found'}, 404)) + abort(make_response({"message": f"planet id {planet_id} not found"}, 404)) return planet @@ -56,6 +56,17 @@ def create_planet(): db.session.commit() return make_response(f"Planet {new_planet.name} created", 201) + +@planets_bp.route("/", methods=["GET"]) +def read_one_planet(planet_id): + planet = validate_planet(planet_id) + + return { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "size": planet.size + } @planets_bp.route("/", methods=["PUT"]) From b52d981d6240b2368e79faa32d41be8f8b5b8fcf Mon Sep 17 00:00:00 2001 From: Luciane Dias Date: Wed, 2 Nov 2022 11:34:15 -0700 Subject: [PATCH 09/13] refactoring code --- app/model/planet.py | 16 +++++++++ app/routes.py | 86 +++++++++++++++++---------------------------- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/app/model/planet.py b/app/model/planet.py index 762747dfe..99f31126a 100644 --- a/app/model/planet.py +++ b/app/model/planet.py @@ -6,3 +6,19 @@ class Planet(db.Model): description = db.Column(db.String) size = db.Column(db.String) + def to_dict(self): + planet_as_dict = {} + planet_as_dict["id"] = self.id + planet_as_dict["name"] = self.name + planet_as_dict["description"] = self.description + planet_as_dict["size"] = self.size + + return planet_as_dict + + @classmethod + def from_dict(cls, planet_data): + new_planet = Planet(name=planet_data["name"], + description=planet_data["description"], + size=planet_data["size"]) + return new_planet + diff --git a/app/routes.py b/app/routes.py index 8c37bb5d3..7489b9df5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,76 +2,54 @@ from app.models.planet import Planet from flask import Blueprint, jsonify, make_response, request, abort -# class Planet: -# def __init__(self, id, name, description, size): -# self.id = id -# self.name = name -# self.description = description -# self.size = size -# planets = [ -# Planet(1, "Mars", "red", "small"), -# Planet(2, "Venus", "poisonous", "smallish"), -# Planet(3, "Saturn", "has rings", "large") -# ] planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -def validate_planet(planet_id): +#helper functions +def validate_model(cls, model_id): try: - planet_id = int(planet_id) + model_id = int(model_id) except: - abort(make_response({"message": f"Invalid planet id: {planet_id}"}, 400)) - - planet = Planet.query.get(planet_id) + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + return model - if not planet: - abort(make_response({"message": f"planet id {planet_id} not found"}, 404)) +#route functions +@planets_bp.route("", methods=["POST"]) +def create_planet(): + request_body = request.get_json() + new_planet = Planet.from_dict(request_body) + + db.session.add(new_planet) + db.session.commit() - return planet + return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) @planets_bp.route("", methods=["GET"]) def read_all_planets(): - request.method == "GET" - planets = Planet.query.all() + #this code replaces thge previous query all code + name_query = request.args.get("name") + if name_query: + planets = Planet.query.filter_by(name=name_query) + else: + planets = Planet.query.all() + # end of the new code planets_response = [] for planet in planets: - planets_response.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "size": planet.size - }) - + planets_response.append(planet.to_dict()) return jsonify(planets_response) -@planets_bp.route("", methods=["POST"]) -def create_planet(): - request_body = request.get_json() - new_planet = Planet( - name=request_body["name"], - description=request_body["description"], - size=request_body["size"] - ) - db.session.add(new_planet) - db.session.commit() - - return make_response(f"Planet {new_planet.name} created", 201) - @planets_bp.route("/", methods=["GET"]) def read_one_planet(planet_id): - planet = validate_planet(planet_id) - - return { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "size": planet.size - } - + planet = validate_model(Planet, planet_id) + return planet.to_dict() @planets_bp.route("/", methods=["PUT"]) def update_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_model(Planet, planet_id) request_body = request.get_json() @@ -81,13 +59,13 @@ def update_planet(planet_id): db.session.commit() - return make_response(f"Planet #{planet.id} successfully updated") + return make_response(jsonify(f"Planet #{planet.id} successfully updated")) @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_model(Planet, planet_id) db.session.delete(planet) db.session.commit() - return make_response(f"Planet #{planet_id} successfully deleted") \ No newline at end of file + return make_response(jsonify(f"Planet #{planet.id} successfully deleted")) \ No newline at end of file From fa534a187a01f8eb654e91c12b6a7eeace887c20 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Wed, 2 Nov 2022 14:46:28 -0400 Subject: [PATCH 10/13] Marie fixed the planet.py file --- app/models/planet.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/models/planet.py b/app/models/planet.py index 6b0fcbaf7..215a823d2 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -6,3 +6,18 @@ class Planet(db.Model): description = db.Column(db.String) size = db.Column(db.String) + def to_dict(self): + planet_as_dict = {} + planet_as_dict["id"] = self.id + planet_as_dict["name"] = self.name + planet_as_dict["description"] = self.description + planet_as_dict["size"] = self.size + + return planet_as_dict + + @classmethod + def from_dict(cls, planet_data): + new_planet = Planet(name=planet_data["name"], + description=planet_data["description"], + size=planet_data["size"]) + return new_planet \ No newline at end of file From c8be2675aa21846a8b25ced90241718e3f0fda74 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Thu, 3 Nov 2022 14:55:45 -0400 Subject: [PATCH 11/13] Created test to check GET /planets and returns 200 and empty array --- app/__init__.py | 8 +++++++- tests/__init__.py | 0 tests/conftest.py | 40 ++++++++++++++++++++++++++++++++++++++++ tests/test_routes.py | 9 +++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) 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 a740e1e75..de37ef595 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,15 +1,21 @@ 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['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_TEST_DATABASE_URI') db.init_app(app) migrate.init_app(app, db) 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..5884233dc --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,40 @@ +import pytest +from app import create_app +from app import db +from app.models.planet import Planet +from flask.signals import request_finished + +@pytest.fixture +def app(): + app = create_app({"TESTING": True}) + + @request_finished.connect_via(app) + def expire_session(sender, response, **extra): + db.session.remove() + + with app.app_context(): + db.create_all() + yield app + + with app.app_context(): + db.drop_all() + +@pytest.fixture +def client(app): + return app.test_client() + +@pytest.fixture +def two_saved_planets(app): + # Arrange + big_planet= Planet(name="Big Planet", + description="whatever", + size="Big") + small_planet = Planet(name="Small Planet", + description="Wow small", + size="Small") + + db.session.add_all([big_planet, small_planet]) + # Alternatively, we could do + # db.session.add(big_planet) + # db.session.add(small_planet) + db.session.commit() \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..a815bbef8 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,9 @@ +# get all planets and return no records +def test_get_all_planets_with_no_records(client): + # Act + 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 b8bb2be97d738ee6cd8824a62d36696b88a2a313 Mon Sep 17 00:00:00 2001 From: Luciane Dias Date: Thu, 3 Nov 2022 12:18:09 -0700 Subject: [PATCH 12/13] created tests 200, 404, 201 --- tests/test_routes.py | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index a815bbef8..0cd5f3b71 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -6,4 +6,42 @@ def test_get_all_planets_with_no_records(client): # Assert assert response.status_code == 200 - assert response_body == [] \ No newline at end of file + assert response_body == [] + +def test_get_one_planet_missing_record(client, two_saved_planets): + # Act + response = client.get("/planets/5") + response_body = response.get_json() + + # Assert + assert response.status_code == 404 + assert response_body == {"message":"planet 5 not found"} + +def test_get_one_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": "Big Planet", + "description": "whatever", + "size": "Big" + } + +def test_create_one_planet(client): + # Act + response = client.post("/planets", json={ + "name": "New Planet", + "description": "The Best!" + "size": "medium" + }) + response_body = response.get_json() + + # Assert + assert response.status_code == 201 + assert response_body == "Planet successfully created" + + From bba18a824a2cc5fc88d9192e0b46b62f23e72eb7 Mon Sep 17 00:00:00 2001 From: Luciane Dias Date: Thu, 3 Nov 2022 15:08:58 -0700 Subject: [PATCH 13/13] corrected errors and passed in the pytest --- tests/test_routes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index 0cd5f3b71..e6f155172 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -15,7 +15,7 @@ def test_get_one_planet_missing_record(client, two_saved_planets): # Assert assert response.status_code == 404 - assert response_body == {"message":"planet 5 not found"} + assert response_body == {"message":"Planet 5 not found"} def test_get_one_planet(client, two_saved_planets): # Act @@ -35,13 +35,13 @@ def test_create_one_planet(client): # Act response = client.post("/planets", json={ "name": "New Planet", - "description": "The Best!" - "size": "medium" + "description": "The Best!", + "size": "Medium" }) response_body = response.get_json() # Assert assert response.status_code == 201 - assert response_body == "Planet successfully created" + assert response_body == "Planet New Planet successfully created"