Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
871339d
wave-01 complete
tigistlina Apr 22, 2023
70d78c0
[WIP] - Wave 1
valerie-valentine Apr 22, 2023
25ecd77
Merge branch 'main' of https://github.com/tigistlina/solar-system-api
valerie-valentine Apr 22, 2023
789c169
RESOLVED MERGE CONFLICT
valerie-valentine Apr 22, 2023
69c7a10
Wave 02 - Refactoring
valerie-valentine Apr 22, 2023
3918b02
Finished Wave 2
valerie-valentine Apr 22, 2023
70352de
refactor wave 2
tigistlina Apr 22, 2023
f7c4666
Finished wave 1 & Wave 2
valerie-valentine Apr 24, 2023
1dad0e8
Merge branch 'main' of https://github.com/tigistlina/solar-system-api
valerie-valentine Apr 24, 2023
9dccaaa
adds more attributes
tigistlina Apr 28, 2023
130caac
create Planet model table
tigistlina Apr 28, 2023
ef68c3d
Finished handle planet endpoint
valerie-valentine Apr 29, 2023
8ec0f0d
resolves conflict
tigistlina Apr 29, 2023
5533430
Changed planet table column datatypes
valerie-valentine Apr 29, 2023
a6810cf
removed white space
tigistlina Apr 29, 2023
a0f5a97
Merge branch 'main' of https://github.com/tigistlina/solar-system-api
tigistlina Apr 29, 2023
3a93d5d
Finished Wave 3 Complete
valerie-valentine Apr 29, 2023
d2572b5
solves merge conflict
tigistlina Apr 29, 2023
981e916
Merge branch 'main' of https://github.com/tigistlina/solar-system-api
tigistlina Apr 29, 2023
51ff409
changed parent_planet column to mmon_of_planet
tigistlina May 2, 2023
e7663b4
creates validate_planet and get_one_planet end point
tigistlina May 2, 2023
6112ac7
defines update_planet end point
tigistlina May 2, 2023
00e54c5
Finished Wave 4
valerie-valentine May 2, 2023
8f6c798
Create env file and setup databases
valerie-valentine May 3, 2023
a252622
WIP creating test checks empty db returns empty list
valerie-valentine May 3, 2023
1c20053
Finished wave 6 - implemented tests
valerie-valentine May 4, 2023
adecf6d
setup .env file
tigistlina May 4, 2023
5df9359
Merge branch 'main' of https://github.com/tigistlina/solar-system-api
tigistlina May 4, 2023
847f3ef
refactors code, creates helper function
tigistlina May 4, 2023
0e57c3c
Finished refactoring project
valerie-valentine May 5, 2023
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
26 changes: 25 additions & 1 deletion app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
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

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

👍


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

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

from app.models.planet import Planet

from .routes import planets_bp
app.register_blueprint(planets_bp)

return app
Empty file added app/models/__init__.py
Empty file.
35 changes: 35 additions & 0 deletions app/models/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
from app import db

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Nicely done 🪐


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)
size = db.Column(db.String, nullable=False)
moon_of_planet = db.Column(db.String, nullable=True)
habitable = db.Column(db.Boolean)
gravity = db.Column(db.String)
nickname = db.Column(db.String, nullable=True)

def to_dict(self):
return dict(
name=self.name,
description=self.description,
size=self.size,
moon_of_planet=self.moon_of_planet,
habitable=self.habitable,
id=self.id,
gravity=self.gravity,
nickname=self.nickname
)

@classmethod
def from_dict(cls, planet_data):
return cls(
name = planet_data["name"],
description = planet_data["description"],
size = planet_data["size"],
moon_of_planet = planet_data["moon_of_planet"],
habitable = planet_data["habitable"],
gravity = planet_data["gravity"],
nickname = planet_data["nickname"]
)
81 changes: 80 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,81 @@
from flask import Blueprint
from app import db
from app.models.planet import Planet
from flask import Blueprint, jsonify, make_response, request , abort

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

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

model = cls.query.get(model_id)

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

return model

@planets_bp.route("", methods=["POST"])
def create_planet():
request_body = request.get_json()
try:
new_planet = Planet.from_dict(request_body)
db.session.add(new_planet)
db.session.commit()

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

except KeyError as e:

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 job using try/except to add in error handling for a request that relies on (possibly incorrect) client data.

abort(make_response({"message": f"missing required value: {e}"}, 400))

@planets_bp.route("", methods=["GET"])
def get_all_planets():
name_query = request.args.get("name")
nickname_query = request.args.get("nickname")
if name_query:
planets = Planet.query.filter_by(name = name_query)

if nickname_query:
planets = Planet.query.filter_by(nickname = nickname_query)
Comment on lines +40 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.

👍


planets = Planet.query.all()

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

return jsonify(results)

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

@planets_bp.route("/<planet_id>", methods=["PUT"])
def update_planet(planet_id):
planet_to_update= validate_model(Planet, planet_id)
planet_data= request.get_json()

planet_to_update.name = planet_data["name"]
planet_to_update.description = planet_data["description"]
planet_to_update.size= planet_data["size"]
planet_to_update.moon_of_planet = planet_data["moon_of_planet"]
planet_to_update.habitable = planet_data["habitable"]
planet_to_update.gravity = planet_data["gravity"]
planet_to_update.nickname = planet_data["nickname"]

db.session.commit()

return make_response(jsonify(f"Planet { planet_to_update.name} updated"), 200)
Comment on lines +61 to +72

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Just like your POST request had error handling, your PUT request also needs it too. If a client sends a PUT req, but the request body had "planet_size" instead of "size", line 64 will throw an error (500 status code), but what we want our route to do is respond with an error message that gives the client feedback about what went wrong.


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

db.session.delete(planet_to_delete)
db.session.commit()

return make_response(jsonify(f"Planet {planet_to_delete.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"}
30 changes: 30 additions & 0 deletions migrations/versions/d12b70d81f7f_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
"""empty message

Revision ID: d12b70d81f7f
Revises: f6f9b34297e7
Create Date: 2023-05-02 12:53:46.210669

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('planet', sa.Column('moon_of_planet', sa.String(), nullable=True))
op.drop_column('planet', 'parent_planet')
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('planet', sa.Column('parent_planet', sa.VARCHAR(), autoincrement=False, nullable=True))
op.drop_column('planet', 'moon_of_planet')
# ### end Alembic commands ###
38 changes: 38 additions & 0 deletions migrations/versions/f6f9b34297e7_adds_planet_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
"""adds Planet model

Revision ID: f6f9b34297e7
Revises:
Create Date: 2023-04-28 14:38:53.218761

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'f6f9b34297e7'
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('size', sa.String(), nullable=False),
sa.Column('parent_planet', sa.String(), nullable=True),
sa.Column('habitable', sa.Boolean(), nullable=True),
sa.Column('gravity', sa.String(), nullable=True),
sa.Column('nickname', 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 ###
1 change: 1 addition & 0 deletions test_fixtures.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file added tests/__init__.py
Empty file.
Loading