Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9a44757
Create Planet class and start planets endpoint
anika-sw Oct 21, 2022
1c49aa9
Register planets_bp
anika-sw Oct 21, 2022
90963d7
Built out planets_endpoint
anika-sw Oct 21, 2022
b3eabbc
fixed bug on line 17 - url_default -> url_prefix
anniegallagher Oct 21, 2022
d72019b
Pushing to pull
anika-sw Oct 21, 2022
4c5f6c9
Merge branch 'main' of https://github.com/anniegallagher/solar-system…
anika-sw Oct 21, 2022
f7af766
updated planets_endpoint to use list comprehension
anniegallagher Oct 24, 2022
799e620
added single planet endpoint
anniegallagher Oct 24, 2022
a2489d9
fixed bug that didn't allow for planets to return
anniegallagher Oct 24, 2022
c9edea6
added to_json() method in Planet class and updated responses in endpo…
anniegallagher Oct 24, 2022
cf97af1
Anika completes wave 02
anika-sw Oct 25, 2022
b3cc128
Merges Annie and Anika's Wave 02
anika-sw Oct 25, 2022
210f544
Creates planet model, updates app to link to db, creates POST endpoin…
anika-sw Oct 28, 2022
91f71d3
creates GET endpoint
anika-sw Oct 28, 2022
a4ff6dc
Anika adds migrations to newly created solar_system_development db
anika-sw Oct 28, 2022
9a52393
updated formatting to multiple lines for new_planet
anniegallagher Oct 28, 2022
8025e68
Adds PUT and DELETE methods
anika-sw Nov 1, 2022
062d523
added query params to GET all planets endpoint
anniegallagher Nov 3, 2022
2ce92d1
Adds query params to routes.py
anika-sw Nov 3, 2022
3db6ebd
Merged routes.py
anika-sw Nov 3, 2022
948d8ba
Adds test configuration flag
anika-sw Nov 3, 2022
f0fa591
Adds test directory and three test files
anika-sw Nov 3, 2022
b903ac9
Updates conftest.py to remove unneeded test and add one test to test_…
anika-sw Nov 3, 2022
2647fe1
added new fixture to populate 2 planets for testing
anniegallagher Nov 3, 2022
9e344e4
wrote test to get a planet
anniegallagher Nov 3, 2022
53aa8dc
added jsonify to allow tests to run correctly
anniegallagher Nov 3, 2022
07ad213
added tests to get planet with no data, get multiple planets, and pos…
anniegallagher Nov 3, 2022
df19563
removed unnecessary comments
anniegallagher Nov 3, 2022
eef413f
updated validate_planet function to be broader for any model validation
anniegallagher Nov 3, 2022
7b8a16b
updated validate_planet function to be broader for any model validation
anniegallagher Nov 3, 2022
eb4ee10
fixed bug that was causing test to fail when we changed validate_model
anniegallagher Nov 3, 2022
00b5452
added is_complete as a boolean to
anniegallagher Nov 6, 2022
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
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.
22 changes: 22 additions & 0 deletions app/models/planet.py
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, nullable=False)
description = db.Column(db.String, nullable=False)
moons = db.Column(db.Integer, nullable=False)

Choose a reason for hiding this comment

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

Is the idea here that even if some planet has no moons, we're still requiring 0 be added to the database? Totally fine decision! Someone might also say "let it be nullable and then querying the db for planets with no moons can check for null instead of 0". I could see either being compelling. If you think about what kinda of application might submit this data, say, from a "add a new planet" form on a web site, if you make the db field non-nullable, then the client would have to account for adding the 0 to the form data for planets with no moons, or, the server-side code would have to check for a moons value and add the 0 if there isn't such a value. Interesting food for thought.


@classmethod
def from_dict(cls, planet_data):
new_planet = cls(name=planet_data["name"],
description=planet_data["description"],
moons=planet_data["moons"])
return new_planet

def to_dict(self):
return dict(
id = self.id,
name = self.name,
description = self.description,
moons = self.moons
)
77 changes: 76 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,77 @@
from flask import Blueprint
from flask import Blueprint, jsonify, abort, make_response, request
from app import db
from app.models.planet import Planet

# planets = [
# Planet(1, "Mercury", "solid", 0),
# Planet(2, "Venus", "bright and volcanic", 0),
# Planet(3, "Earth", "half and half", 1)
# ]

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

@planets_bp.route("", methods=["POST"])
def create_planet():
request_body = request.get_json()
new_planet = Planet.from_dict(request_body)
db.session.add(new_planet)
db.session.commit()
return make_response(jsonify(f"Planet {new_planet.name} has been created successfully"), 201)

@planets_bp.route("", methods=["GET"])
def read_all_planets():
name_query = request.args.get("name")
moons_query = request.args.get("moons")
description_query = request.args.get("description")
planet_query = Planet.query
if name_query:
planet_query = planet_query.filter_by(name=name_query)
if moons_query:
planet_query = planet_query.filter_by(moons=moons_query)
if description_query:
planet_query = planet_query.filter_by(description=description_query)

planets = planet_query.all()

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

Choose a reason for hiding this comment

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

👍🏽


return jsonify(planets_response)

@planets_bp.route("/<planet_id>", methods=["GET"])
def planet_endpoint(planet_id):
planet = validate_model(Planet, planet_id)

return jsonify(planet.to_dict())

@planets_bp.route("/<planet_id>", methods=["PUT"])
def planet_update(planet_id):
planet = validate_model(Planet, planet_id)
request_body = request.get_json()
planet.name = request_body["name"]
planet.description = request_body["description"]
planet.moons = request_body["moons"]

db.session.commit()
return make_response(jsonify(f"Planet {planet.name} has been updated successfully"), 200)

@planets_bp.route("/<planet_id>", methods=["DELETE"])
def planet_delete(planet_id):
planet = validate_model(Planet, planet_id)

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

return make_response(jsonify(f"Planet {planet.name} has been deleted successfully"), 200)

def validate_model(cls, model_id):
try:
model_id = int(model_id)
except:
abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} invalid"}), 400))

model = cls.query.get(model_id)

if not model:
abort(make_response(jsonify({"message":f"{cls.__name__} {model_id} not found"}), 404))

return model
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/33b260a3e13d_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""empty message

Revision ID: 33b260a3e13d
Revises:
Create Date: 2022-10-28 10:51:13.569118

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '33b260a3e13d'
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('moons', sa.Integer(), nullable=False),
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.
39 changes: 39 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import pytest
from app import create_app
from app import db
from flask.signals import request_finished
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()

# planets = [
# Planet(1, "Mercury", "solid", 0),
# Planet(2, "Venus", "bright and volcanic", 0),
# Planet(3, "Earth", "half and half", 1)
# ]

@pytest.fixture
def two_saved_planets(app):
mercury = Planet(name="Mercury", description="solid", moons=0)
venus = Planet(name="Venus", description="bright and volcanic", moons=0)

db.session.add_all([mercury, venus])
db.session.commit()
Loading