-
Notifications
You must be signed in to change notification settings - Fork 61
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
Sharks- Bahareh & Chinazo #22
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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_DATABASE_TESTING_URI") | ||
|
||
# Import models | ||
db.init_app(app) | ||
migrate.init_app(app, db) | ||
|
||
from app.models.Planet import Planet | ||
|
||
#Import blueprints | ||
from .routes import planet_bp | ||
app.register_blueprint(planet_bp) | ||
|
||
return app |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
from app import db | ||
|
||
class Planet(db.Model): | ||
planet_id = db.Column(db.Integer, primary_key=True, autoincrement=True) | ||
name = db.Column(db.String) | ||
description = db.Column(db.String) | ||
color = db.Column(db.String) |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,2 +1,92 @@ | ||||||
from flask import Blueprint | ||||||
import re | ||||||
from flask import Blueprint, jsonify, abort, make_response, request | ||||||
from app import db | ||||||
from app.models.Planet import Planet | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. something to consider: the file itself should be lowercase as in |
||||||
|
||||||
planet_bp = Blueprint("planet", __name__, url_prefix="/planets") | ||||||
|
||||||
#Validate planet data | ||||||
def validate_planet(planet_id): | ||||||
try: | ||||||
planet_id = int(planet_id) | ||||||
except: | ||||||
return abort(make_response({"message": f"Planet {planet_id} is invalid"}, 400)) | ||||||
|
||||||
planet = Planet.query.get(planet_id) | ||||||
|
||||||
if not planet: | ||||||
return abort(make_response({"message": f"Planet {planet_id} is not found"}, 404)) | ||||||
return planet | ||||||
Comment on lines
+9
to
+19
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could move this out of the routes file into its own helper function file, so that the routes are cleaner |
||||||
|
||||||
#GET all planets or GET by NAME query | ||||||
@planet_bp.route("", methods=["GET"]) | ||||||
def get_all_planets(): | ||||||
|
||||||
name_query = request.args.get("name") | ||||||
if name_query: | ||||||
planets = Planet.query.filter_by(name=name_query.title()) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. hmm why are we filtering by |
||||||
else: | ||||||
planets = Planet.query.all() | ||||||
|
||||||
planet_response = [] | ||||||
for planet in planets: | ||||||
planet_response.append({ | ||||||
"id" : planet.planet_id, | ||||||
"name" : planet.name, | ||||||
"description" : planet.description, | ||||||
"color" : planet.color | ||||||
}) | ||||||
Comment on lines
+33
to
+38
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this would make a good instance method to define in the Planet class |
||||||
|
||||||
return jsonify(planet_response) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't forget your status code!
Suggested change
|
||||||
|
||||||
#POST new planet | ||||||
@planet_bp.route("", methods=["POST"]) | ||||||
def add_new_planet(): | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||||||
request_body = request.get_json() | ||||||
new_planet = Planet( | ||||||
name=request_body["name"], | ||||||
description=request_body["description"], | ||||||
color=request_body["color"]) | ||||||
|
||||||
db.session.add(new_planet) | ||||||
db.session.commit() | ||||||
|
||||||
return make_response(jsonify(f"Planet {new_planet.name} was successfully created"), 201) | ||||||
|
||||||
|
||||||
#GET one planet by id | ||||||
@planet_bp.route("<planet_id>", methods=["GET"]) | ||||||
def get_one_planet(planet_id): | ||||||
planet = validate_planet(planet_id) | ||||||
return { | ||||||
"id" : planet.planet_id, | ||||||
"name" : planet.name, | ||||||
"description" : planet.description, | ||||||
"color" : planet.color | ||||||
} | ||||||
Comment on lines
+61
to
+66
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. another good reason to make this an instance method! we won't need to duplicate this code again |
||||||
|
||||||
|
||||||
#UPDATE one planet by id with PUT | ||||||
@planet_bp.route("<planet_id>", methods=["PUT"]) | ||||||
def update_one_planet(planet_id): | ||||||
planet = validate_planet(planet_id) | ||||||
request_body = request.get_json() | ||||||
|
||||||
planet.name = request_body["name"] | ||||||
planet.description = request_body["description"] | ||||||
planet.color = request_body["color"] | ||||||
Comment on lines
+75
to
+77
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This could also make a good instance method inside the Planet class |
||||||
|
||||||
db.session.commit() | ||||||
|
||||||
return make_response(jsonify(f"Planet #{planet.planet_id}, '{planet.name}', successfully updated."), 200) | ||||||
|
||||||
|
||||||
#DELETE one planet by id | ||||||
@planet_bp.route("<planet_id>", methods=["DELETE"]) | ||||||
def delete_one_planet(planet_id): | ||||||
planet = validate_planet(planet_id) | ||||||
|
||||||
db.session.delete(planet) | ||||||
db.session.commit() | ||||||
|
||||||
return make_response(jsonify(f"Planet #{planet.planet_id}, '{planet.name}', successfully deleted."), 200) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Generic single-database configuration. |
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 |
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() |
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"} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
"""adds Planet model | ||
|
||
Revision ID: 57f03e966f57 | ||
Revises: | ||
Create Date: 2022-04-29 13:21:20.111514 | ||
|
||
""" | ||
from alembic import op | ||
import sqlalchemy as sa | ||
|
||
|
||
# revision identifiers, used by Alembic. | ||
revision = '57f03e966f57' | ||
down_revision = None | ||
branch_labels = None | ||
depends_on = None | ||
|
||
|
||
def upgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.create_table('planet', | ||
sa.Column('planet_id', sa.Integer(), autoincrement=True, nullable=False), | ||
sa.Column('title', sa.String(), nullable=True), | ||
sa.Column('description', sa.String(), nullable=True), | ||
sa.Column('color', sa.String(), nullable=True), | ||
sa.PrimaryKeyConstraint('planet_id') | ||
) | ||
# ### end Alembic commands ### | ||
|
||
|
||
def downgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_table('planet') | ||
# ### end Alembic commands ### |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
import pytest | ||
from app import create_app | ||
from app import db | ||
from flask.signals import request_finished | ||
from app.models.Planet import Planet | ||
|
||
|
||
@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 | ||
|
||
with app.app_context(): | ||
db.drop_all() | ||
|
||
|
||
@pytest.fixture | ||
def client(app): | ||
return app.test_client() | ||
|
||
@pytest.fixture | ||
def two_saved_planets(app): | ||
# Arrange | ||
chi_planet = Planet(name="Chiland", | ||
description="The coolest place ever", | ||
color="lavender and blue") | ||
bahareh_planet = Planet(name="Baharehland", | ||
description="No, the coolest place ever. More than Chiland", | ||
color="rainbow awesomeness") | ||
|
||
db.session.add_all([chi_planet, bahareh_planet]) | ||
db.session.commit() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are you using
re
for anything? I didn't see any regular expressions