-
Notifications
You must be signed in to change notification settings - Fork 20
Phoenix + Sphinx - Aksana + Brianna #12
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
141c191
4fa0895
99c295c
e35ea09
d4d99b0
fa2bc16
32912b8
c977df2
43064a0
793f4bd
78e4706
499e329
25a2767
d33ad42
3defc70
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,22 @@ | ||
| from flask import Flask | ||
|
|
||
| from .db import db, migrate | ||
| from app.models.planet import Planet | ||
| from .routes.planet_routes import planets_bp | ||
| import os | ||
|
|
||
| def create_app(test_config=None): | ||
| app = Flask(__name__) | ||
|
|
||
| app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False | ||
| app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') | ||
|
|
||
| if test_config: | ||
| app.config.update(test_config) | ||
|
|
||
|
|
||
| db.init_app(app) | ||
| migrate.init_app(app, db) | ||
|
|
||
| app.register_blueprint(planets_bp) | ||
|
|
||
| return app | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| from flask_sqlalchemy import SQLAlchemy | ||
| from flask_migrate import Migrate | ||
| from .models.base import Base | ||
|
|
||
| db = SQLAlchemy(model_class=Base) | ||
| migrate = Migrate() |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| from sqlalchemy.orm import DeclarativeBase | ||
|
|
||
| class Base(DeclarativeBase): | ||
| pass |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| from sqlalchemy.orm import Mapped, mapped_column | ||
| from ..db import db | ||
|
|
||
| class Planet(db.Model): | ||
| id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) | ||
| name: Mapped[str] | ||
| description: Mapped[str] | ||
| num_moons: Mapped[int] | ||
|
Comment on lines
+4
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. We could have some methods on this class that could make our business logic in our routes more clean and in line with SRP |
||
|
|
||
| # class Planet: | ||
| # def __init__(self, id, name, description, num_moons): | ||
| # self.id = id | ||
| # self.name = name | ||
| # self.description = description | ||
| # self.num_moons = num_moons | ||
|
|
||
| # def to_dict(self): | ||
| # return dict( | ||
| # id = self.id, | ||
| # name = self.name, | ||
| # description = self.description, | ||
| # num_moons = self.num_moons, | ||
| # ) | ||
|
Comment on lines
+17
to
+23
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. Like this here could be added to our |
||
|
|
||
| # planets = [ | ||
| # Planet(1, "Mercury", "the closest to the Sun", 0), | ||
| # Planet(2, "Venus", "similar in size to Earth", 0), | ||
| # Planet(3, "Earth", "suitable for live", 1), | ||
| # Planet(4, "Mars", "red", 2), | ||
| # Planet(5, "Jupiter", "the largest planet", 95), | ||
| # Planet(6, "Saturn","has rings", 146), | ||
| # Planet(7, "Uranus", "blue gas giant", 27), | ||
| # Planet(8, "Neptune", "dark and cold", 16) | ||
|
|
||
| # ] | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| from flask import Blueprint, abort, make_response, request, Response | ||
| from app.models.planet import Planet | ||
| from ..db import db | ||
|
|
||
| planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") | ||
|
|
||
| @planets_bp.post("") | ||
| def create_planet(): | ||
| request_body = request.get_json() | ||
| name = request_body["name"] | ||
| description = request_body["description"] | ||
| num_moons = request_body["num_moons"] | ||
|
|
||
| new_planet = Planet(name=name, description=description, num_moons=num_moons) | ||
| db.session.add(new_planet) | ||
| db.session.commit() | ||
|
|
||
| response = { | ||
| "id": new_planet.id, | ||
| "name": new_planet.name, | ||
| "description": new_planet.description, | ||
| "num_moons": new_planet.num_moons | ||
| } | ||
|
Comment on lines
+18
to
+23
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. This is a place where you could call that method, like so |
||
| return response, 201 | ||
|
|
||
|
|
||
| @planets_bp.get("") | ||
| def get_all_planets(): | ||
|
|
||
| query = db.select(Planet) | ||
|
|
||
| description_param = request.args.get("description") | ||
|
|
||
| if description_param: | ||
| query = query.where(Planet.description.ilike(f"%{description_param}%")) | ||
|
|
||
| num_moons_param = request.args.get("num_moons") | ||
|
|
||
| if num_moons_param: | ||
| query = query.where(Planet.num_moons == num_moons_param) | ||
|
|
||
| query = query.order_by(Planet.id) | ||
| planets = db.session.scalars(query) | ||
|
|
||
| planets_response = [] | ||
| for planet in planets: | ||
| planets_response.append( | ||
| { | ||
| "id": planet.id, | ||
| "name": planet.name, | ||
| "description": planet.description, | ||
| "num_moons": planet.num_moons | ||
| } | ||
| ) | ||
| return planets_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. ✅ |
||
|
|
||
| @planets_bp.get("/<planet_id>") | ||
| def get_one_planet(planet_id): | ||
| planet = validate_planet(planet_id) | ||
|
|
||
| return { | ||
| "id": planet.id, | ||
| "name": planet.name, | ||
| "description": planet.description, | ||
| "num_moons": planet.num_moons, | ||
| } | ||
|
Comment on lines
+61
to
+66
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. Another place where you could call |
||
|
|
||
| @planets_bp.put("/<planet_id>") | ||
| 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.num_moons = request_body["num_moons"] | ||
| db.session.commit() | ||
|
Comment on lines
+73
to
+76
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. Could this be its own helper function perhaps? |
||
|
|
||
| return Response(status=204, mimetype="application/json") | ||
|
|
||
| @planets_bp.delete("/<planet_id>") | ||
| def delete_planet(planet_id): | ||
| planet = validate_planet(planet_id) | ||
| db.session.delete(planet) | ||
| db.session.commit() | ||
|
|
||
| return Response(status=204, mimetype="application/json") | ||
|
|
||
| def validate_planet(planet_id): | ||
| try: | ||
| planet_id =int(planet_id) | ||
| except: | ||
| response = {"message": f"Planet {planet_id} invalid."} | ||
| abort(make_response(response, 400)) | ||
|
|
||
| query = db.select(Planet).where(Planet.id==planet_id) | ||
| planet = db.session.scalar(query) | ||
|
|
||
| if not planet: | ||
| response = {"message": f"Planet {planet_id} not found."} | ||
| abort(make_response(response, 404)) | ||
|
|
||
| return planet | ||
|
Comment on lines
+88
to
+102
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. Now that we've learned a little more about refactoring, where could this function live? |
||
|
|
||
|
|
||
|
|
||
| # @planets_bp.get("") | ||
| # def get_all_planets(): | ||
| # results_list = [] | ||
|
|
||
| # for planet in planets: | ||
| # results_list.append(dict( | ||
| # id=planet.id, | ||
| # name=planet.name, | ||
| # description=planet.description, | ||
| # num_moon=planet.num_moons | ||
| # )) | ||
|
|
||
| # return results_list | ||
|
|
||
| # @planets_bp.get("/<planet_id>") | ||
| # def get_one_planet(planet_id): | ||
| # planet = validate_planet(planet_id) | ||
| # return planet.to_dict(), 200 | ||
|
|
||
|
|
||
| # def validate_planet(planet_id): | ||
| # try: | ||
| # planet_id = int(planet_id) | ||
| # except: | ||
| # abort(make_response({"message": f"Planet {planet_id} is invalid."}, 400)) | ||
| # for planet in planets: | ||
| # if planet.id == planet_id: | ||
| # return planet | ||
| # abort(make_response({"message": f"Planet {planet_id} is not found."}, 404)) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Single-database configuration for Flask. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| # 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,flask_migrate | ||
|
|
||
| [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 | ||
|
|
||
| [logger_flask_migrate] | ||
| level = INFO | ||
| handlers = | ||
| qualname = flask_migrate | ||
|
|
||
| [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,113 @@ | ||
| import logging | ||
| from logging.config import fileConfig | ||
|
|
||
| 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') | ||
|
|
||
|
|
||
| def get_engine(): | ||
| try: | ||
| # this works with Flask-SQLAlchemy<3 and Alchemical | ||
| return current_app.extensions['migrate'].db.get_engine() | ||
| except (TypeError, AttributeError): | ||
| # this works with Flask-SQLAlchemy>=3 | ||
| return current_app.extensions['migrate'].db.engine | ||
|
|
||
|
|
||
| def get_engine_url(): | ||
| try: | ||
| return get_engine().url.render_as_string(hide_password=False).replace( | ||
| '%', '%%') | ||
| except AttributeError: | ||
| return str(get_engine().url).replace('%', '%%') | ||
|
|
||
|
|
||
| # 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', get_engine_url()) | ||
| target_db = current_app.extensions['migrate'].db | ||
|
|
||
| # 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 get_metadata(): | ||
| if hasattr(target_db, 'metadatas'): | ||
| return target_db.metadatas[None] | ||
| return target_db.metadata | ||
|
|
||
|
|
||
| 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=get_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.') | ||
|
|
||
| conf_args = current_app.extensions['migrate'].configure_args | ||
| if conf_args.get("process_revision_directives") is None: | ||
| conf_args["process_revision_directives"] = process_revision_directives | ||
|
|
||
| connectable = get_engine() | ||
|
|
||
| with connectable.connect() as connection: | ||
| context.configure( | ||
| connection=connection, | ||
| target_metadata=get_metadata(), | ||
| **conf_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.
✨