-
Notifications
You must be signed in to change notification settings - Fork 69
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
Angelica Yee and Genesis Solar System Project Kunzite #27
base: main
Are you sure you want to change the base?
Changes from all commits
5d176b5
a6c36a0
0f7c593
4be50aa
f347cd0
ec7a188
a3daf9d
bf403ed
ce61787
9fcaca1
83068cb
9ecff55
eb76a25
57b3087
142690a
da30cbf
12bcf33
ba9da66
e28c289
3d3d8ae
1ead1a5
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,39 @@ | ||
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") | ||
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( | ||
"RENDER_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 app.models.planet import Planet | ||
from app.models.moon import Moon | ||
|
||
from .routes.planet_routes import planets_bp | ||
app.register_blueprint(planets_bp) | ||
|
||
from .routes.moon_routes import moons_bp | ||
app.register_blueprint(moons_bp) | ||
|
||
return app |
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,17 @@ | ||||||||||
from app import db | ||||||||||
|
||||||||||
class Moon(db.Model): | ||||||||||
|
||||||||||
id = db.Column(db.Integer, primary_key=True, autoincrement=True) | ||||||||||
name = db.Column(db.String) | ||||||||||
planet= db.relationship("Planet", back_populates="moons") | ||||||||||
planet_id= db.Column(db.Integer, db.ForeignKey('planet.id')) | ||||||||||
Comment on lines
+7
to
+8
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.
Suggested change
|
||||||||||
|
||||||||||
@classmethod | ||||||||||
def dict_to_model(cls, data_dict): | ||||||||||
return cls(name = data_dict["name"]) | ||||||||||
|
||||||||||
def make_moon_dict(self): | ||||||||||
return dict( | ||||||||||
name=self.name | ||||||||||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
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) | ||
moons= db.relationship("Moon", back_populates="planet") | ||
|
||
|
||
@classmethod | ||
def dict_to_model(cls, data_dict): | ||
return cls(name = data_dict["name"], | ||
description = data_dict["description"], | ||
moons = data_dict["moons"]) | ||
|
||
def make_planet_dict(self): | ||
return dict( | ||
id=self.id, | ||
name=self.name, | ||
description=self.description, | ||
) |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
from app import db | ||
from app.models.planet import Planet | ||
from app.models.moon import Moon | ||
from flask import Blueprint, jsonify, make_response, request, abort | ||
from .routes_helpers import validate_model | ||
|
||
moons_bp = Blueprint("moons", __name__, url_prefix="/moons") | ||
|
||
|
||
@moons_bp.route("", methods=["POST"]) | ||
def make_new_moon(): | ||
request_body = request.get_json() | ||
|
||
new_moon = Moon(name=request_body["name"]) | ||
|
||
db.session.add(new_moon) | ||
db.session.commit() | ||
|
||
return make_response(f"Moon {new_moon.name} successfully created", 201) | ||
|
||
@moons_bp.route("", methods=["GET"]) | ||
def get_all_moons(): | ||
|
||
name_param = request.args.get("name") | ||
|
||
if name_param: | ||
moons = Moon.query.filter_by(name=name_param) | ||
else: | ||
moons = Moon.query.all() | ||
|
||
moons_list=[moon.make_moon_dict()for moon in moons] | ||
|
||
return jsonify(moons_list), 200 |
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,92 @@ | ||||||||||
from app import db | ||||||||||
from app.models.planet import Planet | ||||||||||
from app.models.moon import Moon | ||||||||||
from flask import Blueprint, jsonify, make_response, request, abort | ||||||||||
from .routes_helpers import validate_model | ||||||||||
|
||||||||||
|
||||||||||
|
||||||||||
planets_bp = Blueprint("planets", __name__, url_prefix="/planets") | ||||||||||
|
||||||||||
|
||||||||||
@planets_bp.route("", methods=["POST"]) | ||||||||||
def add_new_planet(): | ||||||||||
request_body = request.get_json() | ||||||||||
|
||||||||||
new_planet = Planet.dict_to_model(request_body) | ||||||||||
|
||||||||||
|
||||||||||
db.session.add(new_planet) | ||||||||||
db.session.commit() | ||||||||||
|
||||||||||
return make_response(f"Planet {new_planet.name} successfully created", 201) | ||||||||||
|
||||||||||
@planets_bp.route("", methods=["GET"]) | ||||||||||
def get_all_planets(): | ||||||||||
|
||||||||||
name_param = request.args.get("name") | ||||||||||
|
||||||||||
if name_param: | ||||||||||
planets = Planet.query.filter_by(name=name_param) | ||||||||||
else: | ||||||||||
planets = Planet.query.all() | ||||||||||
|
||||||||||
planets_list=[planet.make_planet_dict()for planet in planets] | ||||||||||
|
||||||||||
return jsonify(planets_list), 200 | ||||||||||
|
||||||||||
@planets_bp.route("/<planet_id>", methods=["GET"]) | ||||||||||
def get_one_planet(planet_id): | ||||||||||
|
||||||||||
planet = validate_model(Planet, planet_id) | ||||||||||
|
||||||||||
return planet.make_planet_dict(), 200 | ||||||||||
|
||||||||||
|
||||||||||
@planets_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") | ||||||||||
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. whoops, you forgot your status code |
||||||||||
|
||||||||||
@planets_bp.route("/<planet_id>", methods=["PUT"]) | ||||||||||
def update_planet(planet_id): | ||||||||||
planet=validate_model(Planet, planet_id) | ||||||||||
request_body=request.get_json() | ||||||||||
|
||||||||||
if request_body.get("name") is None or request_body.get("description") is None or request_body.get("moons") is None: | ||||||||||
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.
Suggested change
|
||||||||||
return make_response(f"some additional information needed to update planet {planet.name}",400) | ||||||||||
|
||||||||||
planet.name=request_body["name"] | ||||||||||
planet.description=request_body["description"] | ||||||||||
planet.moons=request_body["moons"] | ||||||||||
|
||||||||||
db.session.commit() | ||||||||||
|
||||||||||
return make_response(f"planet {planet.name} succesfully updated",200) | ||||||||||
|
||||||||||
@planets_bp.route("/<planet_id>/moons", methods=["POST"]) | ||||||||||
def create_moon(planet_id): | ||||||||||
planet = validate_model(Planet, planet_id) | ||||||||||
request_body = request.get_json() | ||||||||||
|
||||||||||
new_moon = Moon( | ||||||||||
name=request_body["name"], | ||||||||||
planet = planet | ||||||||||
) | ||||||||||
db.session.add(new_moon) | ||||||||||
db.session.commit() | ||||||||||
return make_response(jsonify(f"Moon {new_moon.name} successfully created with Planet {planet.name}", 201)) | ||||||||||
|
||||||||||
@planets_bp.route("/<planet_id>/moons", methods=["GET"]) | ||||||||||
def get_moons_from_planets(planet_id): | ||||||||||
planet = validate_model(Planet, planet_id) | ||||||||||
|
||||||||||
moons_response = [] | ||||||||||
for moon in planet.moons: | ||||||||||
moons_response.append(moon.make_moon_dict()) | ||||||||||
|
||||||||||
return jsonify(moons_response), 200 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
from flask import make_response, abort | ||
|
||
def validate_model(cls, id): | ||
try: | ||
id = int(id) | ||
except: | ||
abort(make_response({"message": f"{id} was invalid"}, 400)) | ||
|
||
model = cls.query.get(id) | ||
|
||
if not model: | ||
abort(make_response( | ||
{"message": f"{cls.__name__} with id {id} was not found"}, 404)) | ||
|
||
return model |
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.
Let's remove commented code if we aren't using it