Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5f09c26
created planet class and a list of planet instances
mhayes2019 Oct 18, 2021
db2cfa9
Created an end point to read all planets
mac6551 Oct 18, 2021
74e422c
refactored code with vars() and list comprehension
mac6551 Oct 18, 2021
3f8e5e7
created endpoint for one planet request
mhayes2019 Oct 18, 2021
5d43de4
Adds Planet model and connects to psql database through flask
mac6551 Oct 25, 2021
72e08e8
adds route for planet post request
mac6551 Oct 25, 2021
00da8f9
Adds end point that returns a list of all the planets with their info…
mac6551 Oct 25, 2021
fcc5ec2
Adds endpoint that returns info of one planet that matches requested id
mac6551 Oct 25, 2021
83579b4
refactors get_one_planet to use get(planet_id) and removes for loop
mac6551 Oct 25, 2021
2ce8e0f
Returns 404 not found if planet with no id in table is input
mac6551 Oct 25, 2021
0eebaab
Creates end point for put request and updates a planet's info
mac6551 Oct 26, 2021
1aa1922
Adds endpoint for deleting a planet and deletes the planet
mac6551 Oct 26, 2021
d927b67
Adds function to_dict in planet model that converts planet data into …
mac6551 Oct 26, 2021
043312c
Adds code that returns 400 error if name, description, or moons are n…
mac6551 Oct 26, 2021
b23f7c2
Adds doc strings to handle_planets and handle_one_planet
mac6551 Oct 26, 2021
1bbabe4
add test database and connects to create app
mhayes2019 Oct 28, 2021
6f07d4e
add conftest.py file with necessary code
mhayes2019 Oct 28, 2021
221a4e3
create tetst for handle planets and passes
mhayes2019 Oct 28, 2021
82124d8
Refactors code to make consistent throughout
mac6551 Oct 29, 2021
3a0809c
added gunicorn
mhayes2019 Nov 3, 2021
e62b46a
made Procfile
mhayes2019 Nov 3, 2021
11b0a5b
updated database link
mhayes2019 Nov 3, 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
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: gunicorn 'app:create_app()'
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.
18 changes: 18 additions & 0 deletions app/models/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
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)
moons = db.Column(db.String)

def to_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.

Great helper

"""Returns planet id, name, description, and moons \
formatted into a python dictionary"""

return({
"id": self.id,
"name": self.name,
"description": self.description,
"moons": self.moons
})
64 changes: 63 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,64 @@
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("planet", __name__, url_prefix="/planets")

@planets_bp.route("", methods=["POST", "GET"])
def handle_planets():
"""Handles POST and GET requests for /planets.
Returns success message if planet successfully created with POST request.
Returns data on all planets in JSON with GET request."""

if request.method == "POST":
request_body = request.get_json()

if "name" not in request_body or "description" not in request_body \
or "moons" not in request_body:
return make_response("Missing data", 400)

new_planet = Planet(name=request_body["name"],
description=request_body["description"],
moons=request_body["moons"])

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

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

elif request.method == "GET":
planets = Planet.query.all()
planets_response = {}
for planet in planets:
planets_response[planet.name] = planet.to_dict()
return make_response(planets_response, 200)

@planets_bp.route("/<planet_id>", methods=["GET", "PUT", "DELETE"])
def handle_one_planet(planet_id):
"""Handles GET, PUT, and DELETE requests for one planet entry.
Reads and returns planet info for GET request with valid ID input or 404 for invalid ID input.
Updates planet entry and returns success message for PUT request.
Deletes specified planet entry and return success message for DELETE request."""

planet_id = int(planet_id)
planet = Planet.query.get_or_404(planet_id)

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Neat!


if request.method == "GET":
return make_response(planet.to_dict(), 200)

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

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

db.session.commit()

return make_response(f"Planet {planet.name} successfully updated", 200)

elif request.method == "DELETE":
db.session.delete(planet)
db.session.commit()

return make_response(f"Planet {planet.name} 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/0ad3b52109c1_adds_planet_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""adds Planet model

Revision ID: 0ad3b52109c1
Revises:
Create Date: 2021-10-25 13:54:32.121690

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '0ad3b52109c1'
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('moons', 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 ###
8 changes: 8 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
alembic==1.5.4
attrs==21.2.0
autopep8==1.5.5
certifi==2020.12.5
chardet==4.0.0
click==7.1.2
Flask==1.1.2
Flask-Migrate==2.6.0
Flask-SQLAlchemy==2.4.4
gunicorn==20.1.0
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.3
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.
20 changes: 20 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
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()
6 changes: 6 additions & 0 deletions tests/test_routes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
def test_handle_planets_returns_200_and_empty_array(client):

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Awesome a test!

response = client.get("/planets")
response_body = response.get_json()

assert response.status_code == 200
assert response_body == {}