-
Notifications
You must be signed in to change notification settings - Fork 61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Sharks - Morgan B. and Huma H. #21
base: main
Are you sure you want to change the base?
Changes from all commits
3cc5774
5f18e47
1ae4803
f962a33
a968b9e
2f43a2d
59e6abc
a9ca585
bcf5ceb
c66c7a5
83b5578
43cdbc4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,32 @@ | ||
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__) | ||
|
||
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) | ||
|
||
from .routes import planets_bp | ||
app.register_blueprint(planets_bp) | ||
|
||
from app.models.planet import Planet | ||
|
||
return app |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
from flask import abort, make_response | ||
from .models.planet import Planet | ||
|
||
def validate_planet(id): | ||
try: | ||
id = int(id) | ||
except: | ||
abort(make_response({"message": f"Planet {id} is not valid"}, 400)) | ||
|
||
planet = Planet.query.get(id) | ||
|
||
if not planet: | ||
abort(make_response({"message": f"Planet {id} not found"}, 404)) | ||
|
||
return planet |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
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) | ||
moon_count = db.Column(db.Integer) | ||
|
||
def to_json(self): | ||
return { | ||
"id": self.id, | ||
"name": self.name, | ||
"description": self.description, | ||
"moon_count": self.moon_count | ||
} | ||
|
||
def update(self, req_body): | ||
self.name = req_body["name"] | ||
self.description = req_body["description"] | ||
self.moon_count = req_body["moon_count"] | ||
|
||
@classmethod | ||
def create(cls, req_body): | ||
new_planet = cls( | ||
name=req_body["name"], | ||
description=req_body["description"], | ||
moon_count=req_body["moon_count"] | ||
) | ||
return new_planet | ||
Comment on lines
+23
to
+29
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice work refactoring this into a class method so that your route stays short. How would you add in validation to make sure that all the required fields are sent in the request to your server? For example, if someone sent a POST request but left off moon_count, then line 27 would throw KeyError that it couldn't find moon_count. it would be nice to handle the error and return a message so that the client knows their request was invalid and they need to include moon_count. Something to think about for Task List. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,58 @@ | ||
from flask import Blueprint | ||
from app import db | ||
from app.models.planet import Planet | ||
from flask import Blueprint, jsonify, make_response, request | ||
from .helpers import validate_planet | ||
|
||
planets_bp = Blueprint("planets", __name__, url_prefix="/planets") | ||
|
||
@planets_bp.route("", methods=["POST"]) | ||
def create_planet(): | ||
request_body = request.get_json() | ||
new_planet = Planet.create(request_body) | ||
|
||
db.session.add(new_planet) | ||
db.session.commit() | ||
|
||
return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) | ||
|
||
@planets_bp.route("", methods=["GET"]) | ||
def get_planets(): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice job naming the method to describe what this route does. In the future, when you split your routes up into distinct route files (cat_routes.py and dog_routes.py for example in a routes directory) then you could have method names like get_all() and get_one() since we know that all the routes in cat_routes.py are related to the Cat class. |
||
name_query = request.args.get("name") | ||
|
||
if name_query: | ||
planets = Planet.query.filter_by(name=name_query) | ||
else: | ||
planets = Planet.query.all() | ||
|
||
planet_response_body = [] | ||
for planet in planets: | ||
planet_response_body.append(planet.to_json()) | ||
|
||
return jsonify(planet_response_body), 200 | ||
|
||
@planets_bp.route("/<planet_id>", methods=["GET"]) | ||
def read_one_planet(planet_id): | ||
planet = validate_planet(planet_id) | ||
|
||
return jsonify(planet.to_json()), 200 | ||
|
||
@planets_bp.route("/<planet_id>", methods=["PUT"]) | ||
def update_planet(planet_id): | ||
planet = validate_planet(planet_id) | ||
|
||
request_body = request.get_json() | ||
|
||
planet.update(request_body) | ||
|
||
db.session.commit() | ||
|
||
return make_response(jsonify(f"Planet #{planet.id} successfully updated"), 200) | ||
|
||
@planets_bp.route("/<planet_id>", methods=["DELETE"]) | ||
def delete_planet(planet_id): | ||
planet = validate_planet(planet_id) | ||
|
||
db.session.delete(planet) | ||
db.session.commit() | ||
|
||
return make_response(jsonify(f"Planet #{planet.id} successfully deleted"), 200) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
import pytest | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks good! |
||
from app import create_app | ||
from app import db | ||
from flask.signals import request_finished | ||
from app.models.planet import Planet | ||
|
||
|
||
@pytest.fixture | ||
def app(): | ||
app = create_app({"TESTING": True}) | ||
|
||
@request_finished.connect_via(app) | ||
def expire_session(sender, response, **extra): | ||
db.session.remove() | ||
|
||
with app.app_context(): | ||
db.create_all() | ||
yield app | ||
|
||
with app.app_context(): | ||
db.drop_all() | ||
|
||
|
||
@pytest.fixture | ||
def client(app): | ||
return app.test_client() | ||
|
||
@pytest.fixture | ||
def two_saved_planets(app): | ||
|
||
ocean_planet = Planet(name="Caladan", | ||
description="OG home of House Atreides", | ||
moon_count=4) | ||
spice_planet = Planet(name="Arrakis", | ||
description="Control Arrakis, control the universe", | ||
moon_count=2) | ||
|
||
db.session.add_all([ocean_planet, spice_planet]) | ||
db.session.commit() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
from urllib import response | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These tests look good to me! |
||
|
||
|
||
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 == [] | ||
|
||
def test_get_all_planets_with_saved_records(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": "Caladan", | ||
"description": "OG home of House Atreides", | ||
"moon_count": 4 | ||
}, | ||
{ | ||
"id": 2, | ||
"name": "Arrakis", | ||
"description": "Control Arrakis, control the universe", | ||
"moon_count": 2 | ||
}] | ||
|
||
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": "Caladan", | ||
"description": "OG home of House Atreides", | ||
"moon_count": 4 | ||
} | ||
|
||
def test_get_one_missing_planet(client): | ||
response = client.get("/planets/1") | ||
response_body = response.get_json() | ||
|
||
assert response.status_code == 404 | ||
assert response_body == {"message": "Planet 1 not found"} | ||
|
||
def test_create_one_planet(client): | ||
# Act | ||
response = client.post("/planets", json={ | ||
"name": "Giedi Prime", | ||
"description": "Not a great planet", | ||
"moon_count": 1 | ||
}) | ||
response_body = response.get_json() | ||
|
||
# Assert | ||
assert response.status_code == 201 | ||
assert response_body == "Planet Giedi Prime successfully created" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Generic single-database configuration. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same thought here about validating the PUT request fields that your server needs to handle as with POST. How can you validate and handle the KeyError if a field is not present in the request?