-
Notifications
You must be signed in to change notification settings - Fork 79
Snow Leopards - Geiselle H. and Justina L. #21
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
base: main
Are you sure you want to change the base?
Changes from all commits
49d78f0
a0e06c7
8fe6e8d
07beac8
a7e88ce
6340b31
639d4fe
0b62470
0967274
fd2fbcf
f469fb0
f200d01
f714afa
4c671a1
acccfd3
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,35 @@ | ||
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 | ||
|
||
if not test_config: | ||
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get("SQLALCHEMY_DATABASE_URI") | ||
else: | ||
app.config["TESTING"] = True | ||
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( | ||
"SQLALCHEMY_TEST_DATABASE_URI") | ||
|
||
db.init_app(app) | ||
migrate.init_app(app, db) | ||
|
||
|
||
from .routes import planet | ||
from .routes import fictional_caretaker | ||
app.register_blueprint(planet.bp) | ||
app.register_blueprint(fictional_caretaker.bp) | ||
|
||
from app.models.planet import Planet | ||
from app.models.fictional_caretaker import Caretaker | ||
|
||
return app |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
from app import db | ||
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. Why "fictional" caretaker? You mean your planets don't have real caretakers? 🙂 Remember that we prefer to have a file containing a class definition to match the name of the class (allowing for differences in capitalization). |
||
|
||
class Caretaker(db.Model): | ||
id = db.Column(db.Integer, primary_key=True, autoincrement=True) | ||
name = db.Column(db.String) | ||
planets = db.relationship("Planet", back_populates="caretaker") | ||
|
||
@classmethod | ||
def from_dict(cls, data_dict): | ||
return cls(name=data_dict["name"]) | ||
|
||
def to_dict(self): | ||
return dict( | ||
id=self.id, | ||
name=self.name | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
from app import db | ||
|
||
class Planet(db.Model): | ||
id = db.Column(db.Integer, primary_key=True, autoincrement=True) | ||
name = db.Column(db.String, nullable=False) | ||
description = db.Column(db.String, nullable=False) | ||
moons = db.Column(db.Integer, nullable=False) | ||
caretaker_id = db.Column(db.Integer, db.ForeignKey("caretaker.id")) | ||
caretaker = db.relationship("Caretaker", back_populates="planets") | ||
|
||
def to_dict(self): | ||
return dict( | ||
id=self.id, | ||
name=self.name, | ||
description=self.description, | ||
moons=self.moons | ||
) | ||
|
||
@classmethod | ||
def from_dict(cls, data_dict): | ||
return cls(name=data_dict["name"], | ||
description=data_dict["description"], | ||
moons=data_dict["moons"]) | ||
|
||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
from app import db | ||
from app.models.fictional_caretaker import Caretaker | ||
from app.models.planet import Planet | ||
from flask import Blueprint, jsonify, make_response, request | ||
from app.routes.helper_functions import validate_model | ||
|
||
bp = Blueprint("caretakers", __name__, url_prefix="/caretakers") | ||
|
||
@bp.route("", methods=["POST"]) | ||
def create_caretaker(): | ||
request_body = request.get_json() | ||
new_caretaker = Caretaker.from_dict(request_body) | ||
|
||
db.session.add(new_caretaker) | ||
db.session.commit() | ||
|
||
return make_response(f"Caretaker {new_caretaker.name} successfully created", 201) | ||
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. 👀 Make sure to |
||
|
||
|
||
@bp.route("", methods=["GET"]) | ||
def read_all_caretakers(): | ||
caretakers = Caretaker.query.all() | ||
|
||
caretakers_response = [caretaker.to_dict() for caretaker in caretakers] | ||
|
||
return jsonify(caretakers_response) | ||
|
||
|
||
@bp.route("/<caretaker_id>/planets", methods=["POST"]) | ||
def create_planet(caretaker_id): | ||
caretaker = validate_model(Caretaker, caretaker_id) | ||
request_body = request.get_json() | ||
new_planet = Planet.from_dict(request_body) | ||
new_planet.caretaker = caretaker | ||
|
||
db.session.add(new_planet) | ||
db.session.commit() | ||
|
||
return make_response(f"Planet {new_planet.name} cared for by {caretaker.name}", 201) | ||
|
||
|
||
@bp.route("/<caretaker_id>/planets", methods=["GET"]) | ||
def read_one_planet(caretaker_id): | ||
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. maybe call this |
||
caretaker = validate_model(Caretaker, caretaker_id) | ||
|
||
planet_response = [planet.to_dict() for planet in caretaker.planets] | ||
|
||
|
||
return(jsonify(planet_response)) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
from flask import abort, make_response | ||
|
||
def validate_model(cls, model_id): | ||
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 on the reafactor, and moving it out of the original routes file. |
||
try: | ||
model_id = int(model_id) | ||
except: | ||
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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
from app import db | ||
from app.models.planet import Planet | ||
from flask import Blueprint, jsonify, make_response, request | ||
from app.routes.helper_functions import validate_model | ||
|
||
bp = Blueprint("planets", __name__, url_prefix = "/planets") | ||
|
||
@bp.route("/<planet_id>", methods=["GET"]) | ||
def read_one_planet(planet_id): | ||
planet = validate_model(Planet, planet_id) | ||
return jsonify(planet.to_dict()), 200 | ||
|
||
@bp.route("", methods=["GET"]) | ||
def read_all_planets(): | ||
name_query = request.args.get("name") | ||
description_query = request.args.get("description") | ||
moons_query = request.args.get("moons") | ||
limit_query = request.args.get("limit") | ||
|
||
planet_query = Planet.query | ||
|
||
if name_query: | ||
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 multi-value filtering! |
||
planet_query = planet_query.filter_by(name=name_query) | ||
|
||
if description_query: | ||
planet_query = planet_query.filter_by(description=description_query) | ||
|
||
if moons_query: | ||
planet_query = planet_query.filter_by(moons=moons_query) | ||
|
||
if limit_query: | ||
planet_query = planet_query.limit(limit_query) | ||
|
||
planets = planet_query.all() | ||
|
||
planet_response = [planet.to_dict() for planet in planets] | ||
|
||
return jsonify(planet_response) | ||
|
||
@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 make_response(f"Planet {new_planet.name} successfully created", 201) | ||
|
||
@bp.route("/<planet_id>", methods=["PUT"]) | ||
def update_planet(planet_id): | ||
planet = validate_model(Planet, planet_id) | ||
request_body = request.get_json() | ||
|
||
planet.name = request_body["name"] | ||
planet.description = request_body["description"] | ||
planet.moons = request_body["moons"] | ||
Comment on lines
+54
to
+56
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. In the same way we made |
||
|
||
db.session.commit() | ||
return make_response(f"Planet #{planet.id} successfully updated", 200) | ||
|
||
@bp.route("/<planet_id>", methods=["DELETE"]) | ||
def delete_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", 200) |
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() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"} |
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.
👍