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

Zoisite- Katherine G and Madi J #20

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7e37962
Complete wave 1
Kguarnizo Apr 24, 2023
008e563
configuring wave 2 code
dawnsoapp Apr 24, 2023
fb0b10c
fix TypeError from wave 2
Kguarnizo Apr 25, 2023
405a3fc
Refactor wave 2
Kguarnizo Apr 25, 2023
5eca8d1
Refactor wave 1
Kguarnizo Apr 25, 2023
1e43869
fixing import error
dawnsoapp Apr 28, 2023
cea2ec6
adding migrations
dawnsoapp Apr 28, 2023
ab5a2ad
update config str
dawnsoapp Apr 28, 2023
2f7d6ec
resolved version issue on migration
dawnsoapp May 1, 2023
252bc3d
uninstall requirements and reinstall
Kguarnizo May 1, 2023
b64a8e7
Merge branch 'main' of https://github.com/Kguarnizo/solar-system-api
Kguarnizo May 1, 2023
d0a3c2f
Create post method
Kguarnizo May 1, 2023
7959c97
finished wave 3; setting up for wave 4
dawnsoapp May 1, 2023
c82da1b
Complete wave 4
Kguarnizo May 2, 2023
8760fd5
will fix merge
dawnsoapp May 2, 2023
0c44c2c
Merge branch 'main' of https://github.com/Kguarnizo/solar-system-api
dawnsoapp May 2, 2023
57894cd
fixing merge conflict x2
dawnsoapp May 2, 2023
b46750a
started wave 6: setup
dawnsoapp May 3, 2023
3507377
create tests for get/post one planet
Kguarnizo May 3, 2023
89226e2
Complete wave 6 and create tests for 404 error/array of planets
Kguarnizo May 3, 2023
026110a
refactoring; update model with classmethod
dawnsoapp May 4, 2023
d048936
updated model; started new test for null error
dawnsoapp May 4, 2023
0a5bac2
finished 400 error test
dawnsoapp May 5, 2023
7e5c9dc
commit to pull latest changes
Kguarnizo May 5, 2023
9e7d0bb
Merge branch 'main' of https://github.com/Kguarnizo/solar-system-api
Kguarnizo May 5, 2023
cb2c059
Complete wave 4
Kguarnizo May 5, 2023
10b6971
completed solar system
dawnsoapp May 5, 2023
5f823b4
Create star class and register blueprint
Kguarnizo May 8, 2023
8b951a5
fixed changes from star practice
dawnsoapp May 8, 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
29 changes: 29 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,36 @@
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

Choose a reason for hiding this comment

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

The line app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False is duplicated in both parts of the if/else. We could move that line to either above or below the if/else, so it only needs to be written once.

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 .planet_routes import planets_bp
app.register_blueprint(planets_bp)



return app
16 changes: 16 additions & 0 deletions app/helper.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
from app import db

Choose a reason for hiding this comment

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

Nice use of helper.py for organization ^_^

from app.models.planet import Planet
from flask import Blueprint, jsonify, abort, make_response, request

def validate_model(cls,model_id):

Choose a reason for hiding this comment

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

Tiny style best practices note: we should add a space between each parameter to a function to give readers a visual separation, this helps people read and parse lines easier & faster.

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

Choose a reason for hiding this comment

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

These lines are a little long for PEP8 best practices, how could we rearrange things over a couple lines to stay under 79 characters?


model = cls.query.get(model_id)

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

return model
Empty file added app/models/__init__.py
Empty file.
23 changes: 23 additions & 0 deletions app/models/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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)

Choose a reason for hiding this comment

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

Nice use of nullable, it'd be hard to know what planet we're working with if it doesn't have a name!

description = db.Column(db.String, nullable=False)
num_moons = db.Column(db.Integer, nullable=False)

def to_dict(self):
return {
"id": self.id,
"name": self.name,
"description": self.description,
"num_moons": self.num_moons
}

@classmethod
def from_dict(cls, data_dict):
return cls(
name = data_dict["name"],
description = data_dict["description"],
num_moons = data_dict["num_moons"]
)
67 changes: 67 additions & 0 deletions app/planet_routes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
from app import db
from app.models.planet import Planet
from app.helper import validate_model
from flask import Blueprint, jsonify, abort, make_response, request


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

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

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

except KeyError as error:
abort(make_response({"error message": f"missing required value: {error}"}, 400))

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

if num_moons_query:
planets = Planet.query.filter_by(num_moons = num_moons_query)

else:
planets = Planet.query.all()

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


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

return jsonify(planet.to_dict())


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

request_body = request.get_json()
planet.name = request_body["name"]
planet.description = request_body["description"]
planet.num_moons = request_body["num_moons"]

db.session.commit()

return make_response(f"Planet {planet.id} successfully updated")

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

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

return make_response(f"Planet {planet.id} successfully deleted")
2 changes: 0 additions & 2 deletions app/routes.py

This file was deleted.

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/6f10d35aed47_adds_planet_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""adds Planet model

Revision ID: 6f10d35aed47
Revises:
Create Date: 2023-04-28 19:09:55.071118

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '6f10d35aed47'
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('num_moons', sa.Integer(), nullable=True),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('planet')
# ### end Alembic commands ###
34 changes: 34 additions & 0 deletions migrations/versions/c2db3d6bd34d_adds_planet_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""adds Planet model

Revision ID: c2db3d6bd34d
Revises:
Create Date: 2023-04-30 17:09:28.989027

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'c2db3d6bd34d'
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('num_moons', sa.Integer(), nullable=True),
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.
Loading