From 93e576903a4d779f86e242b84cea8429a09c6617 Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Fri, 15 Oct 2021 11:24:41 -0700 Subject: [PATCH 01/13] update init and routes files. Need to find bug. --- app/__init__.py | 4 ++++ app/routes.py | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..87538dcc8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,4 +4,8 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import planets_bp + + app.register_blueprint(planets_bp) + return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..4bc370565 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,33 @@ -from flask import Blueprint +from flask import Blueprint, jsonify + +class Planet: + def __init__(self, id, name, description): + self.id = id + self.name = name + self.description = description + + +# list of planet +planets = [ + Planet(1, "Saturn", "Six planet from the Sun and a gas giant."), + Planet(2, "Venus", "Second planet from the Sun and the hottest planet in our solar system."), + Planet(3, "Mars", "Fourth planet from the Sun and it is the second smallest planet in our solar system.") + +] + +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + + +@planets_bp.route("", methods=["GET"]) +def get_list_planets(): + planets_list = [] + for planet in planets: + planets.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description + + }) + + return jsonify(planets_list) From 0dc27e88009dd9009a24fcd282a07f74c4e7845b Mon Sep 17 00:00:00 2001 From: cecily-916 Date: Fri, 15 Oct 2021 14:28:33 -0400 Subject: [PATCH 02/13] Fixed bug --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 4bc370565..848eaae77 100644 --- a/app/routes.py +++ b/app/routes.py @@ -23,7 +23,7 @@ def __init__(self, id, name, description): def get_list_planets(): planets_list = [] for planet in planets: - planets.append({ + planets_list.append({ "id": planet.id, "name": planet.name, "description": planet.description From 588393192a7eea9f0492b56c0d9889dfecea5b85 Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Sun, 17 Oct 2021 18:57:22 -0700 Subject: [PATCH 03/13] correctedget_list_planets function error --- app/__init__.py | 1 - app/routes.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 87538dcc8..ab9eee40e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,7 +5,6 @@ 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 4bc370565..848eaae77 100644 --- a/app/routes.py +++ b/app/routes.py @@ -23,7 +23,7 @@ def __init__(self, id, name, description): def get_list_planets(): planets_list = [] for planet in planets: - planets.append({ + planets_list.append({ "id": planet.id, "name": planet.name, "description": planet.description From ea02a294217126cdd6f0e378525bd08e8e88c4ec Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Sun, 17 Oct 2021 19:28:58 -0700 Subject: [PATCH 04/13] add planet function to request for single planet --- app/routes.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 848eaae77..50757a2ee 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,7 +8,7 @@ def __init__(self, id, name, description): self.description = description -# list of planet +# list of planets planets = [ Planet(1, "Saturn", "Six planet from the Sun and a gas giant."), Planet(2, "Venus", "Second planet from the Sun and the hottest planet in our solar system."), @@ -18,6 +18,8 @@ def __init__(self, id, name, description): planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +# search request for list of planets + @planets_bp.route("", methods=["GET"]) def get_list_planets(): @@ -31,3 +33,19 @@ def get_list_planets(): }) return jsonify(planets_list) + +# search request for one planet and return 404 if not found + + +@planets_bp.route("/", methods=["GET"]) +def planet(planet_id): + planet_id = int(planet_id) + for planet in planets: + if planet_id == planet.id: + return { + "id": planet.id, + "name": planet.name, + "description": planet.description + } + elif planet_id != planet.id: + return (f"Planet {planet_id} not found."), 404 From db20b945c6da83e8b4d92805208693e0df4a7aee Mon Sep 17 00:00:00 2001 From: cecily-916 Date: Fri, 22 Oct 2021 14:34:06 -0400 Subject: [PATCH 05/13] add init files --- app/__init__.py | 15 ++++- app/models/__init__.py | 0 app/models/planet.py | 7 ++ app/routes.py | 83 ++++++++++++++---------- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/47a38ad4ce75_.py | 33 ++++++++++ 9 files changed, 269 insertions(+), 35 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/47a38ad4ce75_.py diff --git a/app/__init__.py b/app/__init__.py index 87538dcc8..cdd9d1de8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,11 +1,22 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +db = SQLAlchemy() +migrate = Migrate() def create_app(test_config=None): app = Flask(__name__) - from .routes import planets_bp + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' - app.register_blueprint(planets_bp) + db.init_app(app) + migrate.init_app(app, db) + + from app.models.planet import Planet + + from .routes import planets_db + app.register_blueprint(planets_db) return app 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..8843c4043 --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,7 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key = True, autoincrement = True) + name = db.Column(db.String) + description = db.Column(db.String) + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 848eaae77..2ec658c5a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,33 +1,50 @@ -from flask import Blueprint, jsonify - - -class Planet: - def __init__(self, id, name, description): - self.id = id - self.name = name - self.description = description - - -# list of planet -planets = [ - Planet(1, "Saturn", "Six planet from the Sun and a gas giant."), - Planet(2, "Venus", "Second planet from the Sun and the hottest planet in our solar system."), - Planet(3, "Mars", "Fourth planet from the Sun and it is the second smallest planet in our solar system.") - -] - -planets_bp = Blueprint("planets", __name__, url_prefix="/planets") - - -@planets_bp.route("", methods=["GET"]) -def get_list_planets(): - planets_list = [] - for planet in planets: - planets_list.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description - - }) - - return jsonify(planets_list) +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, make_response, request + +planets_db = Blueprint("planets_db", __name__, url_prefix= "/planets") + +@planets_db.route("", methods = ["POST"]) +def handle_planets(): + request_body = request.get_json() + if "name" not in request_body or "description" not in request_body: + return make_response("Invalid request", 400) + + new_planet = Planet( + name = request_body["name"], + description = request_body["description"] + ) + db.session.add(new_planet) + db.session.commit() + return make_response(f"Planet {new_planet.name} created successfully", 201) + +# class Planet: +# def __init__(self, id, name, description): +# self.id = id +# self.name = name +# self.description = description + + +# # list of planet +# planets = [ +# Planet(1, "Saturn", "Six planet from the Sun and a gas giant."), +# Planet(2, "Venus", "Second planet from the Sun and the hottest planet in our solar system."), +# Planet(3, "Mars", "Fourth planet from the Sun and it is the second smallest planet in our solar system.") + +# ] + +# planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + + +# @planets_bp.route("", methods=["GET"]) +# def get_list_planets(): +# planets_list = [] +# for planet in planets: +# planets_list.append({ +# "id": planet.id, +# "name": planet.name, +# "description": planet.description + +# }) + +# return jsonify(planets_list) 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/47a38ad4ce75_.py b/migrations/versions/47a38ad4ce75_.py new file mode 100644 index 000000000..1ac88f6b8 --- /dev/null +++ b/migrations/versions/47a38ad4ce75_.py @@ -0,0 +1,33 @@ +"""empty message + +Revision ID: 47a38ad4ce75 +Revises: +Create Date: 2021-10-22 14:30:38.038421 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '47a38ad4ce75' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('planet', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 5977b7605dfbe0be8f381d7bcd17fe39607effcc Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Sun, 24 Oct 2021 19:26:05 -0700 Subject: [PATCH 06/13] add handle_planet function and modify handle_planets funtion to handle both GET and POST requests. --- app/__init__.py | 5 ----- app/routes.py | 57 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index cf5271f9f..cdd9d1de8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -8,7 +8,6 @@ def create_app(test_config=None): app = Flask(__name__) -<<<<<<< HEAD app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' @@ -19,9 +18,5 @@ def create_app(test_config=None): from .routes import planets_db app.register_blueprint(planets_db) -======= - from .routes import planets_bp - app.register_blueprint(planets_bp) ->>>>>>> ea02a294217126cdd6f0e378525bd08e8e88c4ec return app diff --git a/app/routes.py b/app/routes.py index 2ec658c5a..8ef942450 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,21 +2,52 @@ from app.models.planet import Planet from flask import Blueprint, jsonify, make_response, request -planets_db = Blueprint("planets_db", __name__, url_prefix= "/planets") +planets_db = Blueprint("planets_db", __name__, url_prefix="/planets") -@planets_db.route("", methods = ["POST"]) + +@planets_db.route("", methods=["POST", "GET"]) def handle_planets(): - request_body = request.get_json() - if "name" not in request_body or "description" not in request_body: - return make_response("Invalid request", 400) - - new_planet = Planet( - name = request_body["name"], - description = request_body["description"] - ) - db.session.add(new_planet) - db.session.commit() - return make_response(f"Planet {new_planet.name} created successfully", 201) + if request.method == "POST": + request_body = request.get_json() + if "name" not in request_body or "description" not in request_body: + return make_response("Invalid request", 400) + + new_planet = Planet( + name=request_body["name"], + description=request_body["description"] + ) + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} created successfully", 201) + + elif 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 + }) + + return jsonify(planets_response) + + +@planets_db.route("/", methods=["GET"]) +def handle_planet(planet_id): + + planet = Planet.query.get(planet_id) + + if planet is None: + return make_response(f"Planet {planet_id} Not Found", 404) + + return { + "id": planet.id, + "name": planet.name, + "description": planet.description + } + # class Planet: # def __init__(self, id, name, description): From 15806fdfb8b94a19a8ca32c2c2c657e730d6655a Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Mon, 25 Oct 2021 14:46:26 -0700 Subject: [PATCH 07/13] add PUT and DELETE methods to handle_planet function. --- app/__init__.py | 5 +++-- app/routes.py | 42 ++++++++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index cdd9d1de8..1873b6ff1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,6 +5,7 @@ db = SQLAlchemy() migrate = Migrate() + def create_app(test_config=None): app = Flask(__name__) @@ -16,7 +17,7 @@ def create_app(test_config=None): from app.models.planet import Planet - from .routes import planets_db - app.register_blueprint(planets_db) + from .routes import planets_bp + app.register_blueprint(planets_bp) return app diff --git a/app/routes.py b/app/routes.py index 8ef942450..6098b3868 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,10 +2,10 @@ from app.models.planet import Planet from flask import Blueprint, jsonify, make_response, request -planets_db = Blueprint("planets_db", __name__, url_prefix="/planets") +planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") -@planets_db.route("", methods=["POST", "GET"]) +@planets_bp.route("", methods=["POST", "GET"]) def handle_planets(): if request.method == "POST": request_body = request.get_json() @@ -34,20 +34,42 @@ def handle_planets(): return jsonify(planets_response) -@planets_db.route("/", methods=["GET"]) +@planets_bp.route("/", methods=["GET", "PUT", "DELETE"]) def handle_planet(planet_id): planet = Planet.query.get(planet_id) - if planet is None: - return make_response(f"Planet {planet_id} Not Found", 404) + if request.method == "GET": - return { - "id": planet.id, - "name": planet.name, - "description": planet.description - } + if planet is None: + return make_response(f"Planet {planet_id} Not Found", 404) + return { + "id": planet.id, + "name": planet.name, + "description": planet.description + } + + elif request.method == "PUT": + form_data = request.get_json() + + if planet is None: + return make_response(f"Planet {planet_id} Not Found", 404) + + planet.name = form_data["name"] + planet.description = form_data["description"] + + db.session.commit() + + return jsonify(f"Planet #{planet.id} sucessfully updated", 200) + + elif request.method == "DELETE": + if planet is None: + return make_response(f"Planet {planet_id} Not Found", 404) + + db.session.delete(planet) + db.session.commit() + return jsonify(f"Planet #{planet.id} sucessfully deleted", 200) # class Planet: # def __init__(self, id, name, description): From d09f2b27f845c04cf01f24f777d7e957769c7e5c Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Mon, 25 Oct 2021 22:29:30 -0700 Subject: [PATCH 08/13] add a guard clause to handle a 404 response for the handle_planet function. --- app/routes.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6098b3868..2c3cd4ff0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -39,11 +39,10 @@ def handle_planet(planet_id): planet = Planet.query.get(planet_id) - if request.method == "GET": - - if planet is None: - return make_response(f"Planet {planet_id} Not Found", 404) + if planet is None: + return make_response(f"Not Found", 404) + if request.method == "GET": return { "id": planet.id, "name": planet.name, @@ -53,9 +52,6 @@ def handle_planet(planet_id): elif request.method == "PUT": form_data = request.get_json() - if planet is None: - return make_response(f"Planet {planet_id} Not Found", 404) - planet.name = form_data["name"] planet.description = form_data["description"] @@ -64,9 +60,6 @@ def handle_planet(planet_id): return jsonify(f"Planet #{planet.id} sucessfully updated", 200) elif request.method == "DELETE": - if planet is None: - return make_response(f"Planet {planet_id} Not Found", 404) - db.session.delete(planet) db.session.commit() return jsonify(f"Planet #{planet.id} sucessfully deleted", 200) From edd640dfcd4ba0ea4285fc5ca938eee643917ef7 Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Tue, 26 Oct 2021 21:35:49 -0700 Subject: [PATCH 09/13] change make_response to jsonify --- app/routes.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/routes.py b/app/routes.py index 2c3cd4ff0..12e9dbc1b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,7 +10,7 @@ def handle_planets(): if request.method == "POST": request_body = request.get_json() if "name" not in request_body or "description" not in request_body: - return make_response("Invalid request", 400) + return jsonify("Invalid request"), 400 new_planet = Planet( name=request_body["name"], @@ -19,7 +19,7 @@ def handle_planets(): db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.name} created successfully", 201) + return jsonify(f"Planet {new_planet.name} created successfully"), 201 elif request.method == "GET": planets = Planet.query.all() @@ -40,7 +40,7 @@ def handle_planet(planet_id): planet = Planet.query.get(planet_id) if planet is None: - return make_response(f"Not Found", 404) + return jsonify("Not Found"), 404 if request.method == "GET": return { @@ -57,12 +57,12 @@ def handle_planet(planet_id): db.session.commit() - return jsonify(f"Planet #{planet.id} sucessfully updated", 200) + return jsonify(f"Planet #{planet.id} sucessfully updated"), 200 elif request.method == "DELETE": db.session.delete(planet) db.session.commit() - return jsonify(f"Planet #{planet.id} sucessfully deleted", 200) + return jsonify(f"Planet #{planet.id} sucessfully deleted"), 200 # class Planet: # def __init__(self, id, name, description): From b4c9faf1228c0c5d21229e0954ea85d9fcec6a66 Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Tue, 26 Oct 2021 22:48:09 -0700 Subject: [PATCH 10/13] modify handle_planets function to filter for name query param. --- app/routes.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 12e9dbc1b..7922fb2cf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -22,7 +22,12 @@ def handle_planets(): return jsonify(f"Planet {new_planet.name} created successfully"), 201 elif request.method == "GET": - planets = Planet.query.all() + name_query = request.args.get("name") + if name_query: + planets = Planet.query.filter_by(name=name_query) + else: + planets = Planet.query.all() + planets_response = [] for planet in planets: planets_response.append({ From cf5a0480b907346f5c1cc4cc708d3979bdcff70c Mon Sep 17 00:00:00 2001 From: cecily-916 Date: Wed, 27 Oct 2021 16:58:07 -0400 Subject: [PATCH 11/13] updated tests and configurations --- .gitignore | 1 + app/__init__.py | 16 +++++++++++++--- tests/__init__.py | 0 tests/conftest.py | 27 +++++++++++++++++++++++++++ tests/test_routes.py | 8 ++++++++ 5 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_routes.py diff --git a/.gitignore b/.gitignore index 4e9b18359..72d16b84c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.env .vscode .DS_Store diff --git a/app/__init__.py b/app/__init__.py index 1873b6ff1..b4844024b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,16 +1,26 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate +from dotenv import load_dotenv +import os db = SQLAlchemy() migrate = Migrate() - +load_dotenv() def create_app(test_config=None): app = Flask(__name__) - app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + if not test_config: + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get("SQLALCHEMY_DATABASE_URI") + + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI") + + db.init_app(app) migrate.init_app(app, db) 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..10ae051c5 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,27 @@ +import pytest +from app import db +from app import create_app +from app.models.planet import Planet + +@pytest.fixture +def app(): + app = create_app({"TESTING": True}) + + with app.app_context(): + db.create_all() + yield app + + with app.app_context(): + db.drop_all() + +@pytest.fixture +def client(app): + return app.test_client() + +@pytest.fixture +def two_saved_planets(app): + mars = Planet(name = "Mars", description="Red planet") + saturn = Planet(name = "Saturn", description="Lots of rings!") + + db.session.add_all([mars, saturn]) + 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..45f6fc52e --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,8 @@ +def test_get_list_of_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 b1e46f6bda35a3d21358ea2314698a22d3527aa8 Mon Sep 17 00:00:00 2001 From: cecily-916 Date: Wed, 27 Oct 2021 17:32:12 -0400 Subject: [PATCH 12/13] update tests --- tests/test_routes.py | 48 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index 45f6fc52e..e2a2a1921 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -5,4 +5,50 @@ def test_get_list_of_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_response_body_of_fixture_planet(client, two_saved_planets): + #Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response_body == { + "id": 1, + "name": "Mars", + "description": "Red planet" + } + +def test_get_response_body_of_planet_with_no_data(client): + # Act + response = client.get("/planets/1") + + # Assert + assert response.status_code == 404 + +def test_get_list_of_planets_in_test_db(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": "Mars", + "description": "Red planet" + }, + { + "id": 2, + "name": "Saturn", + "description": "Lots of rings!" + } + ] + +def test_post_new_planet_returns_status_code(client): + # Act + request = client.post("/planets", json = {"name": "Venus", "description": "Test"}) + + # Assert + assert request.status_code == 201 \ No newline at end of file From 0edbbe06726b1c30fab2dfb3ab469dd7f54dd550 Mon Sep 17 00:00:00 2001 From: Zandra Nguyen Date: Wed, 27 Oct 2021 19:47:57 -0700 Subject: [PATCH 13/13] change status code to 404 --- app/routes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 7922fb2cf..6b6f3363f 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, make_response, request +from flask import Blueprint, jsonify, request planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") @@ -10,7 +10,7 @@ def handle_planets(): if request.method == "POST": request_body = request.get_json() if "name" not in request_body or "description" not in request_body: - return jsonify("Invalid request"), 400 + return jsonify("Invalid request"), 404 new_planet = Planet( name=request_body["name"],