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
66db8ad
Define planet in routes.py
kiraksi Apr 20, 2023
4b55ed2
created planet endpoint with id, name, description for planet data
limaryg11 Apr 20, 2023
916e83b
Accidental Edits
kiraksi Apr 20, 2023
de0c99b
Create endpoint to retrieve planet data with planet id
kiraksi Apr 21, 2023
9d11b1a
Fixed error in routes.py
kiraksi Apr 21, 2023
fd9a032
corrected errors in planet numbers and return messages
limaryg11 Apr 21, 2023
37eb802
Edited __init__.py
kiraksi Apr 27, 2023
112d017
Added migrations
kiraksi Apr 27, 2023
4574636
Edited models/planet.py and migrated and upgraded
kiraksi Apr 27, 2023
4920dba
Created post method in routes.py
kiraksi Apr 27, 2023
0177940
posted planets in postman
limaryg11 Apr 27, 2023
974080a
Added class method to models/planet.py and refactored app/routes.py
kiraksi Apr 27, 2023
be520b6
Added validate_planet and get_one_planet functions to routes.py
kiraksi May 1, 2023
815a187
update, and delete routes added to routes.py and validate helper func…
limaryg11 May 1, 2023
f002be8
added name_query to get_planet route
limaryg11 May 2, 2023
e1a2a0b
Added testing check to create_app function in __init__.py
kiraksi May 2, 2023
525628a
Merge branch 'main' of https://github.com/limaryg11/limary_kira_solar…
kiraksi May 2, 2023
13f2b06
Created tests folder and files, in conftest.py defined app, client an…
kiraksi May 3, 2023
d11b761
added tests to test_routes, passed with pytest
limaryg11 May 3, 2023
8b1f774
refactored routes.py and planets.py and added test
limaryg11 May 5, 2023
e92da37
added gunicorn to requirements
limaryg11 May 9, 2023
f7cba6a
added render database
limaryg11 May 9, 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()

def create_app(test_config=None):
load_dotenv()

def create_app(testing=None):
app = Flask(__name__)

app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False

if testing is None:
# app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI")
app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("RENDER_DATABASE_URI")
else:
app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI")

from .models.planet import Planet

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

from .routes import planet_bp
app.register_blueprint(planet_bp)

return app
25 changes: 25 additions & 0 deletions app/models/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
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)
num_moons = db.Column(db.Integer)

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

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


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 flask import Blueprint, jsonify, request, abort, make_response
from app import db
from app.models.planet import Planet

planet_bp = Blueprint("planet", __name__, url_prefix="/planet")

@planet_bp.route("", methods=["POST"])
def add_planet():
request_body = request.get_json()
new_planet = Planet.from_dict(request_body)

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

return {"id": new_planet.id}, 201

@planet_bp.route("", methods=["GET"])
def get_planets():
response = []
name_query = request.args.get("name")
if name_query is None:
all_planets = Planet.query.all()
else:
all_planets = Planet.query.filter_by(name=name_query)

for planet in all_planets:
response.append(planet.to_dict())

return jsonify(response), 200

@planet_bp.route("/<p_id>", methods=["GET"])
def get_one_planet(p_id):
planet = validate_item(Planet, p_id)

return planet.to_dict(), 200


def validate_item(model, item_id):
try:
item_id = int(item_id)
except ValueError:
return abort(make_response({"message": f"invalid id: {item_id}"}, 400))

return model.query.get_or_404(item_id)

@planet_bp.route("/<p_id>", methods=["PUT"])
def update_planet(p_id):
planet = validate_item(Planet, p_id)

request_data = request.get_json()

planet.name = request_data["name"]
planet.description = request_data["description"]
planet.num_moons = request_data["num_moons"]

db.session.commit()

return {"msg": f"planet {p_id} successfully updated"}, 200

@planet_bp.route("/<p_id>", methods=["DELETE"])
def delete_planet(p_id):
planet = validate_item(Planet, p_id)

db.session.delete(planet)

db.session.commit()

return {"msg": f"planet {p_id} 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/4500beae0686_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""empty message

Revision ID: 4500beae0686
Revises:
Create Date: 2023-04-27 11:57:37.732216

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '4500beae0686'
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 ###
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ 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
itsdangerous==1.1.0
Jinja2==2.11.3
Expand Down
Empty file added tests/__init__.py
Empty file.
29 changes: 29 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import pytest
from app import create_app, db
from app.models.planet import Planet
from flask.signals import request_finished

@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
db.drop_all()

@pytest.fixture
def client(app):
return app.test_client()

@pytest.fixture
def two_planets():
earth = Planet(name="earth", description="in danger", num_moons=1)
mars = Planet(name="mars", description="red", num_moons=2)

db.session.add_all([earth, mars])
db.session.commit()
Loading