Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ffd12c0
created Planet class and instances of Planet class
rzuick Oct 15, 2021
e54025d
created endpoint for planets_bp
rzuick Oct 15, 2021
be4bc0a
created endpoint to get one planet specifically
rzuick Oct 15, 2021
688dabf
Added more planet instances
sjolivas Oct 18, 2021
4a98a9c
imported bodies_bp and registered bodies_bp blueprint
rzuick Oct 19, 2021
c06f7f2
wrote blueprint to access bodies from le system solaire api. created …
rzuick Oct 19, 2021
1fc01fe
Merge pull request #1 from rzuick/testing
rzuick Oct 19, 2021
e662f46
Refactored app/__init__.py
sjolivas Oct 22, 2021
7c3ca0b
Created model folder with init and planet files
sjolivas Oct 22, 2021
3fc45e4
Initialized changes to routes.py
sjolivas Oct 22, 2021
08dc36c
Refactored __init__.py, routes.py, and planet.py
sjolivas Oct 22, 2021
60407a3
Added migrations folder and files
sjolivas Oct 22, 2021
5465ac2
refactored handle_planets function; deleted commented out code
rzuick Oct 23, 2021
eb84a30
updated endpoints for PUT and DELETE. added ECHO command from SQLAlchemy
rzuick Oct 25, 2021
662a924
created PATCH request method/response
rzuick Oct 25, 2021
906c1c9
Added query params to "" endpoint in routes.py
sjolivas Oct 26, 2021
8575a05
Set up configuration for API testing
sjolivas Oct 27, 2021
05fbee2
configured two tests
rzuick Oct 27, 2021
5584d9f
added one test
sjolivas Oct 27, 2021
4d2a369
Added test and refactored routes.py
sjolivas Oct 27, 2021
699b57a
formatted all files with python formatting
rzuick Oct 27, 2021
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
31 changes: 31 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,38 @@
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__)

app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False

if not test_config:
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get(
"SQLALCHEMY_DATABASE_URI")
app.config['SQLALCHEMY_ECHO'] = True

else:
app.config["TESTING"] = True
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get(
"SQLALCHEMY_TEST_DATABASE_URI")
app.config['SQLALCHEMY_ECHO'] = True

# import models here
from app.models.planet import Planet

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The blueprints already import the models so we don't actually need the model import in this file anymore.


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

# register blueprints here
from .routes import planets_bp
app.register_blueprint(planets_bp)

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

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Careful! Using the class as it currently is, we'd be able to make a planet with a null name, description, and color. I do see in the POST request that y'all checked for falsy values for name, description, and color, however, null values can still be inserted manually using SQL. When making classes in the future, consider which columns are required (non-nullable).


def planet_dict(self):

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Yay!! Nice helper method :D

return {
"id": self.id,
"name": self.name,
"description": self.description,
"distance": self.distance
}
68 changes: 67 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,68 @@
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_bp", __name__, url_prefix="/planets")
bodies_bp = Blueprint("bodies", __name__, url_prefix="/bodies")


@planets_bp.route("", methods=["POST", "GET"])
def handle_planets():
if request.method == "POST":
request_body = request.get_json()
if ("name" or "description" or "distance") not in request_body:
return jsonify("Invalid Request"), 404

new_planet = Planet(
name=request_body["name"],
description=request_body["description"],
distance=request_body["distance"]
)
db.session.add(new_planet)
db.session.commit()
return jsonify(new_planet.planet_dict()), 201
Comment on lines +11 to +23

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

👍

elif request.method == "GET":
planet_name_query = request.args.get("name")
if planet_name_query:
planets = Planet.query.filter_by(name=planet_name_query)
else:
planets = Planet.query.all()

planets_response = [
planet.planet_dict() for planet in planets
]
return jsonify(planets_response)
Comment on lines +24 to +34

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

👍 great use of a nested dictionary!



@planets_bp.route("/<planet_id>", methods=["GET", "PUT", "PATCH", "DELETE"])

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Comment about separating request methods into different functions can also apply to this route.

def get_one_planet(planet_id):
planet = Planet.query.get(planet_id)
if planet is None:
return jsonify(f"Planet {planet_id} not found"), 404

if request.method == "GET":
return jsonify(planet.planet_dict())
Comment on lines +43 to +44

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Nice! One line :D 👍


elif request.method == "PUT":
response_body = request.get_json()
planet.name = response_body["name"]
planet.description = response_body["description"]
planet.distance = response_body["distance"]
db.session.commit()
return jsonify(f"{planet.name} was successfully updated"), 200
Comment on lines +46 to +52

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Adding a check for an empty response_body can be handy here


elif request.method == "PATCH":
response_body = request.get_json()

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Adding a check for an empty response_body can also be handy here

if "name" in response_body:
planet.name = response_body["name"]
elif "description" in response_body:
planet.description = response_body["description"]
elif "distance" in response_body:
planet.distance = response_body["distance"]
db.session.commit()
return jsonify(f"{planet.name} was successfully updated"), 200

elif request.method == "DELETE":

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

👍

db.session.delete(planet)
db.session.commit()
return jsonify(f"{planet.name} was 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/78da57da46d7_adds_planet_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""adds Planet model

Revision ID: 78da57da46d7
Revises:
Create Date: 2021-10-22 15:48:29.048143

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '78da57da46d7'
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.Column('distance', 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 ###
7 changes: 7 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
alembic==1.5.4
attrs==21.2.0
autopep8==1.5.5
certifi==2020.12.5
chardet==4.0.0
Expand All @@ -7,12 +8,18 @@ Flask==1.1.2
Flask-Migrate==2.6.0
Flask-SQLAlchemy==2.4.4
idna==2.10
iniconfig==1.1.1
itsdangerous==1.1.0
Jinja2==2.11.3
Mako==1.1.4
MarkupSafe==1.1.1
packaging==21.0
pluggy==1.0.0
psycopg2-binary==2.8.6
py==1.10.0
pycodestyle==2.6.0
pyparsing==3.0.2
pytest==6.2.5
python-dateutil==2.8.1
python-dotenv==0.15.0
python-editor==1.0.4
Expand Down
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 @@
import pytest
from app import create_app
from app import db
from app.models.planet import Planet


@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):
planet1 = Planet(
name="Earth", description="Blue green marble", distance="Right here")
planet2 = Planet(name="Mars", description="red", distance="next door")
db.session.add_all([planet1, planet2])
db.session.commit()

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Consider returning [planet1, planet2] after this line, so that tests can make use of the attributes of the records (like the id or name of planet)

Loading