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 - Nina G. (Waves 3-6) #31

Open
wants to merge 10 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
25 changes: 25 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,32 @@
from flask import Flask
from flask_sqlalchemy import SQLAlchemy
Copy link

Choose a reason for hiding this comment

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

👍🏽

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")

from app.models.planet import Planet

db.init_app(app)
migrate.init_app(app, db)

from .routes import planet_bp
app.register_blueprint(planet_bp)

return app
Empty file added app/models/__init__.py
Empty file.
25 changes: 25 additions & 0 deletions app/models/planet.py
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)
has_moon = db.Column(db.Boolean, nullable=False, default=False)

def to_dict(self):
Copy link

Choose a reason for hiding this comment

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

Nice helper methods and use of a classmethod!

return dict(
id = self.id,
name = self.name,
description = self.description,
has_moon = self.has_moon,)

@classmethod
def from_dict(cls, data_dict):
return cls(name=data_dict["name"],
description=data_dict["description"],
has_moon=data_dict["has_moon"],)

def replace_details(self, data_dict):
self.name = data_dict["name"]
self.description = data_dict["description"]
self.has_moon = data_dict["has_moon"]
88 changes: 87 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,88 @@
from flask import Blueprint
from flask import Blueprint, jsonify, abort, make_response, request
from .models.planet import Planet
from app import db

def error_message(message, status_code):
Copy link

Choose a reason for hiding this comment

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

you could move your helper functions to a file helper_functions.py to clean up your routes file

abort(make_response(jsonify(dict(details=message)), status_code))

def validate_planet(planet_id):
Copy link

Choose a reason for hiding this comment

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

functions look good!

try:
planet_id = int(planet_id)
except:
error_message(f"planet {planet_id} invalid", 400)

planet = Planet.query.get(planet_id)

if not planet:
error_message(f"planet {planet_id} not found", 404)

return planet

def create_planet_safely(data_dict):
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:
planet.replace_details(data_dict)
except KeyError as err:
error_message(f"Missing key: {err}", 400)


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

@planet_bp.route("", methods=("GET",))
def get_planets():
description_query = request.args.get("description")
has_moon_query = request.args.get("has_moon")

if description_query:
planets = Planet.query.filter_by(description=description_query)
elif has_moon_query:
planets = Planet.query.filter_by(has_moon=has_moon_query)
else:
planets = Planet.query.all()

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

return jsonify(result_list), 200

@planet_bp.route("", methods=("POST",))
def post_one_planet():
request_body = request.get_json()

new_planet = create_planet_safely(request_body)

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

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

@planet_bp.route("/<planet_id>", methods=("GET",))
def get_individual_planet(planet_id):
planet = validate_planet(planet_id)

return jsonify(planet.to_dict()), 200

@planet_bp.route("/<planet_id>", methods=("PUT",))
def put_planet(planet_id):
planet = validate_planet(planet_id)

request_body = request.get_json()

replace_planet_safely(planet, request_body)

db.session.commit()

return make_response(jsonify(f"Planet #{planet.id} successfully updated")), 200

@planet_bp.route("/<planet_id>", methods=("DELETE",))
def delete_planet(planet_id):
planet = validate_planet(planet_id)

db.session.delete(planet)
db.session.commit()

return make_response(jsonify(f"Planet {planet.id} successfully deleted")), 200
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"}
34 changes: 34 additions & 0 deletions migrations/versions/91b40f34c954_added_planet_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""Added planet model

Revision ID: 91b40f34c954
Revises:
Create Date: 2022-05-12 09:42:22.183892

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '91b40f34c954'
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=False),
sa.Column('description', sa.String(), nullable=False),
sa.Column('has_moon', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('planet')
# ### end Alembic commands ###
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ itsdangerous==1.1.0
Jinja2==2.11.3
Mako==1.1.4
MarkupSafe==1.1.1
psycopg2-binary==2.8.6
psycopg2-binary==2.9.3
pycodestyle==2.6.0
pytest==6.2.3
pytest-cov==2.12.1
Expand Down
Empty file added tests/__init__.py
Empty file.
Loading