Skip to content
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

Sea Turtles, Christina & Jae #16

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,35 @@
from dotenv import load_dotenv
from flask import Flask
from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate
import os

db = SQLAlchemy()
migrate = Migrate()
load_dotenv()


def create_app(test_config=None):
app = Flask(__name__)

return app
if not test_config:
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Notice that since this option is being set in both branches of the if, it could be pulled out of the branches to either before or after the if to remove the repetition.

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 app.models.planet import Planet

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once we have an import path that leads to the model being imported (init→route→model) we don't really need this import here, but it can be handy as a sanity check.


from app.routes import planet_routes
app.register_blueprint(planet_routes.planets_bp)



return app
Empty file added app/models/__init__.py
Empty file.
33 changes: 33 additions & 0 deletions app/models/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
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)
life = db.Column(db.Boolean)
moons = db.Column(db.Integer)
Comment on lines +5 to +8

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider setting some of these columns to have nullable=false. For example, should we be able to create a planet without a name? Should life be able to be NULL rather than true or false? If there are no moons, shouldn't we require the value to be 0 rather than NULL?


def to_dict(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return dict(
id=self.id,
name=self.name,
description=self.description,
life=self.life,
moons=self.moons,
)

@classmethod
def from_dict(cls, data_dict):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return cls(
name=data_dict["name"],
description=data_dict["description"],
life=data_dict["life"],
moons=data_dict["moons"]
)

def replace_details(self, data_dict):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

self.name=data_dict["name"]
self.description=data_dict["description"]
self.life=data_dict["life"]
self.moons=data_dict["moons"]
return self.to_dict()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having this method return the dictionary form of the record feels a little premature to me. Yes, it's very likely that we'll want this information, but mutating method like this usually just perform the modifications as their single responsibility. They might return the instance itself (it can be useful for chaining operations), but I'd leave it to the caller to decide whether they want to convert the result to a dictionary themself.

2 changes: 0 additions & 2 deletions app/routes.py

This file was deleted.

Empty file added app/routes/__init__.py
Empty file.
93 changes: 93 additions & 0 deletions app/routes/planet_routes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
from app import db
from app.models.planet import Planet
from flask import Blueprint, jsonify, make_response, request
from app.routes.routes_helper import error_message

planets_bp = Blueprint("planets", __name__, url_prefix="/planets")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is the only blueprint in this file, consider naming the variable bp.


def make_planet_safely(data_dict):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

try:
return Planet.from_dict(data_dict)
except KeyError as err:
error_message(f"Missing key: {err}", 400)

def replace_planet_safely(planet, data_dict):
try:
return planet.replace_details(data_dict)
except KeyError as err:
error_message(f"Missing key: {err}", 400)

@planets_bp.route("", methods=["POST"])
def handle_planets():
request_body = request.get_json()
new_planet = make_planet_safely(request_body)

db.session.add(new_planet)
db.session.commit()

return jsonify(new_planet.to_dict()), 201

@planets_bp.route("", methods=["GET"])
def index_planets():
name_param = request.args.get("name")

if name_param:
planets = Planet.query.filter_by(name=name_param)
else:
planets = Planet.query.all()
Comment on lines +34 to +37

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a @classmethod to Planet that could be used to perform this filtering.

Also, think about how you might filter on multiple fields, or use partial matches. Check out https://docs.sqlalchemy.org/en/13/orm/tutorial.html#common-filter-operators for some ideas!


result_list = [planet.to_dict() for planet in planets]
return jsonify(result_list)

@planets_bp.route("/<id>", methods=["GET"])
def get_planet(id):
planet = validate_planet(id)
return jsonify(planet.to_dict())

def validate_planet(id):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

try:
id = int(id)
except ValueError:
error_message(f"Invalid id {id}", 400)

planet = Planet.query.get(id)

if planet:
return planet
error_message(f'No planet with id {id} found', 404)

@planets_bp.route("/<id>", methods=["PUT"])
def update_planet(id):
planet = validate_planet(id)
request_body = request.get_json()
result = replace_planet_safely(planet, request_body)
db.session.commit()
return jsonify(result)
Comment on lines +63 to +65

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be more inclined to have the replace calls just update the contents without returning the dictionarified result. More like the following.

	replace_planet_safely(planet, request_body)
	db.session.commit()
	return jsonify(planet.to_dict())


@planets_bp.route("/<id>", methods=["PATCH"])
def upgrade_planet_with_id(id):
planet = validate_planet(id)
request_body = request.get_json()
planet_keys = request_body.keys()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to retrieve the keys separately here. The in operator on dictionaries checks for a key itself, so the later checks could be written as:

    if "name" in request_body:
        # handle name key...


if "name" in planet_keys:
planet.name = request_body["name"]
if "description" in planet_keys:
planet.description = request_body["description"]
if "life" in planet_keys:
planet.life = request_body["life"]
if "moons" in planet_keys:
planet.moons = request_body["moons"]
Comment on lines +73 to +80

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider moving this to an instance method in Planet.


db.session.commit()
return jsonify(planet.to_dict())




@planets_bp.route("/<id>", methods=["DELETE"])
def delete_planet(id):
planet = validate_planet(id)
db.session.delete(planet)
db.session.commit()
return make_response('*** You have successfully destroyed Earth ! ***')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure to return this as JSON. If we return a bare string, Flask will assume we want to return it as HTML. Also, make sure not to hardcode the name of the planet being destroyed.

	return jsonify(f'*** You have successfully destroyed {planet.name} ! ***')

4 changes: 4 additions & 0 deletions app/routes/routes_helper.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from flask import jsonify, abort, make_response

def error_message(message, status_code):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

abort(make_response(jsonify(dict(details=message)), status_code))
1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Generic single-database configuration.
45 changes: 45 additions & 0 deletions migrations/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# A generic, single database configuration.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Disregard the file this comment is on, I just needed a place to add it!)

It looks like you didn't check in your migrations. We should be sure to check in the migrations files so that team members who join the project have a way to get the instructions for flask to use to set up the database. One person should generate the initial migration and check it in, then the rest of the team would just flask db upgrade to get the changes. The same would be true for any subsequent migrations. One person would do the change, and check it in, then the rest of the team would pull the change and upgrade.


[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
96 changes: 96 additions & 0 deletions migrations/env.py
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()
24 changes: 24 additions & 0 deletions migrations/script.py.mako
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"}
Empty file added tests/__init__.py
Empty file.
34 changes: 34 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import pytest
from flask.signals import request_finished
from app import db
from app import create_app
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_planets(app):
Earth = Planet(id=1, name="Earth", description="home", life=True, moons=1)
Mars = Planet(id=2, name="Mars", description="1st Colony", life=True, moons=0)

db.session.add(Earth)
db.session.add(Mars)
db.session.commit()
Comment on lines +27 to +34

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
We could leave off the ids for the records here, and the db will assign them. If we have created these table ourselves, we wouldn't even be able to supply the ids, but the way that SQLAlchemy sets up a primary key is a little different from the GENERATED ALWAYS AS IDENTITY that we used when looking at SQL.

One nice thing about setting the id explicitly in a fixture is that we know what id to use in subsequent tests. If we don't, then we should still be able to assume that the ids will start from 1 and increment, but we probably shouldn't depend on it. So if we leave off the ids, then we'd probably want to return the two records in a list so that the test using these records could get their ids safely, regardless of what they were set to. This would look like:

@pytest.fixture
def two_planets(app):
    earth = Planet(name="Earth", description="home", life=True, moons=1)
    mars = Planet(name="Mars", description="1st Colony", life=True, moons=0)

    db.session.add(earth)
    db.session.add(mars)
    db.session.commit()
    
    return [earth, mars]

And then in a test using the two_planets fixture, we could get the id of the first planet as two_planets[0].id

(Also, resist the urge to capitalize a variable that happens to be a proper noun. Reserve capitalized names for classes.)

Loading