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

cedar mac #29

Open
wants to merge 17 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
29 changes: 29 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,36 @@
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
Empty file added app/models/__init__.py
Empty file.
14 changes: 14 additions & 0 deletions app/models/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
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)

def to_json(self):
return {
"id": self.id,
"name": self.name,
"description": self.description,
}
51 changes: 50 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,51 @@
from flask import Blueprint
from app import db
from app.models.planet import Planet
from flask import Blueprint, jsonify, make_response, request

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


@planets_bp.route("", methods=["GET", "POST"])
def handle_planets():
if request.method == "GET":
name_query = request.args.get("name")

Choose a reason for hiding this comment

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

Nice work using query params

if name_query:
planets = Planet.query.filter_by(name=name_query)
else:
planets = Planet.query.all()
planets_response = [planet.to_json() for planet in planets]

return jsonify(planets_response)

elif request.method == "POST":
request_body = request.get_json()
new_planet = Planet(

Choose a reason for hiding this comment

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

Consider how this code would behave if "name" or "description" were missing from the request body. One way to handle this sort of invalid request body is with the following code:

if "name" not in request_body or "description" not in request_body":
    return {"error":"incomplete request body", 400

name=request_body["name"], description=request_body["description"]
)

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

return make_response(f"Planet {new_planet.name} successfully created", 201)


@planets_bp.route("/<planet_id>", methods=["GET", "PUT", "DELETE"])
def handle_planet(planet_id):
planet = Planet.query.get_or_404(planet_id)

Choose a reason for hiding this comment

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

Good use of get_or_404. If you were to separate out handle_planet into different functions for each verb, consider how you could move this functionality into a helper function.

Choose a reason for hiding this comment

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

Consider also how this method would behave if planet_id was not an integer. How can we build in error checking for the parameters in the route.

if request.method == "GET":
return planet.to_json()

elif request.method == "PUT":
form_data = request.get_json()

planet.name = form_data["name"]
planet.description = form_data["description"]

db.session.commit()

return make_response(f"Book #{planet.id} successfully updated")

elif request.method == "DELETE":
db.session.delete(planet)
db.session.commit()
return make_response(f"Planet #{planet.id} successfully deleted")
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.

[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"}
33 changes: 33 additions & 0 deletions migrations/versions/be23e6252c40_adds_planet_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
"""adds Planet model

Revision ID: be23e6252c40
Revises:
Create Date: 2021-10-28 12:29:57.133835

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'be23e6252c40'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('planet',
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
sa.Column('name', sa.String(), nullable=True),
sa.Column('description', sa.String(), nullable=True),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('planet')
# ### end Alembic commands ###
Empty file added tests/__init__.py
Empty file.
30 changes: 30 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
from app.models.planet import Planet
import pytest
from app import create_app
from app import db


@pytest.fixture
def app():
app = create_app({"TESTING": True})

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):
neptune = Planet(name="Neptune", description="no surface")
mars = Planet(name="Mars", description="elon")

db.session.add_all([neptune, mars])
db.session.commit()
43 changes: 43 additions & 0 deletions tests/test_routes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
def test_get_all_planets_with_no_records(client):
response = client.get("/planets")
response_body = response.get_json()

assert response.status_code == 200
assert response_body == []


def test_get_one_planet(client, two_saved_planets):
response = client.get("/planets/1")
response_body = response.get_json()

assert response.status_code == 200
assert response_body == {"id": 1, "name": "Neptune", "description": "no surface"}

def test_get_one_planet_with_empty_db_returns_404(client):
response = client.get("/planets/1")
assert response.status_code == 404

def test_get_all_planets_returns_list_of_planets(client, two_saved_planets):
response = client.get("/planets")
assert response.status_code == 200
assert response.get_json() == [
{
"name": "Neptune",
"description": "no surface",
"id": 1
},
{
"name": "Mars",
"description": "elon",
"id": 2
}
]

def test_create_planet_returns_201(client):
request_body = {
"name": "Earth",
"description": "Us"
}
response = client.post("/planets", json=request_body)

assert response.status_code == 201