Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
b2dd532
create __init__.py in package model
anjing0921 Jan 7, 2023
95f28bc
create model moon with 4 attributes method to_dict and from_dict
anjing0921 Jan 7, 2023
d637c49
add planet_bp
anjing0921 Jan 7, 2023
ba508c3
import bd
anjing0921 Jan 7, 2023
d15a881
fix parentheses
anjing0921 Jan 7, 2023
8b26e62
create migration
anjing0921 Jan 7, 2023
a8d6b59
connect to db
anjing0921 Jan 7, 2023
c34f02b
migration new version 55fe3c99246d
anjing0921 Jan 7, 2023
962666c
register planets_bp
anjing0921 Jan 7, 2023
d7ce155
register planet_bp
anjing0921 Jan 7, 2023
f273da9
add SQLALCHEMY_TRACK_MODIFICATIONS = False
anjing0921 Jan 7, 2023
27a59e6
set ['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
anjing0921 Jan 7, 2023
22dc401
change the right value
anjing0921 Jan 7, 2023
1684fdc
finish the get planet
anjing0921 Jan 7, 2023
61c1c8b
add validate id
anjing0921 Jan 7, 2023
32a73f3
endpoint get planet by id and put planet by id
anjing0921 Jan 8, 2023
15d86c1
add delete planet by id wave 4 done
anjing0921 Jan 8, 2023
17c3d73
set conftest
anjing0921 Jan 8, 2023
e23fec8
rename conftest
anjing0921 Jan 8, 2023
35bd052
correct conftest file name
anjing0921 Jan 8, 2023
bd6c03a
add tests folder
anjing0921 Jan 8, 2023
41c4d66
add get planets return empty list
anjing0921 Jan 8, 2023
992d8dc
add get planet by not exist id return 404
anjing0921 Jan 8, 2023
e0a14eb
modify import path
anjing0921 Jan 8, 2023
6dd1227
add test get planets with desc_sort
anjing0921 Jan 8, 2023
207823e
get planet by id
anjing0921 Jan 8, 2023
aa228e3
add test create a planet
anjing0921 Jan 8, 2023
0584e7b
add delete planet by id
anjing0921 Jan 8, 2023
60b6933
add test put planet with invalid id
anjing0921 Jan 8, 2023
f7444fd
add test put planet with not exist id
anjing0921 Jan 8, 2023
fd59b3b
make change in conftest
anjing0921 Jan 8, 2023
e724423
wave 6 done
anjing0921 Jan 8, 2023
80fe307
add relation with Moon
anjing0921 Jan 8, 2023
7ef92fa
create Moon model
anjing0921 Jan 8, 2023
9343616
add from_dict
anjing0921 Jan 8, 2023
ebaa715
delete Migration folder
anjing0921 Jan 8, 2023
54fcec1
import Moon db
anjing0921 Jan 8, 2023
4a33dc9
add planet and moon
anjing0921 Jan 8, 2023
1ce70e4
import model Moon
anjing0921 Jan 8, 2023
c75f605
add test moon model to dict
anjing0921 Jan 8, 2023
39d9902
add test planet model from dict
anjing0921 Jan 8, 2023
cf471b1
add test moon from dict
anjing0921 Jan 8, 2023
06a9618
add moons_bp
anjing0921 Jan 8, 2023
ae241fc
register planet_bp
anjing0921 Jan 8, 2023
0a96a8d
endpoint post moon
anjing0921 Jan 8, 2023
51772ce
post planet/1/moons
anjing0921 Jan 8, 2023
ba2540d
modify model
anjing0921 Jan 8, 2023
85d8625
register moon_bp
anjing0921 Jan 8, 2023
9baa667
add get moon by id
anjing0921 Jan 8, 2023
f445c67
add
anjing0921 Jan 8, 2023
91dd7ca
modify test model
anjing0921 Jan 8, 2023
671a0c0
modify planet to dict test
anjing0921 Jan 8, 2023
ee1f802
add test get moon by id
anjing0921 Jan 8, 2023
23031db
test not pass
anjing0921 Jan 8, 2023
b75ecc1
wave 8 done
anjing0921 Jan 8, 2023
a9ae32a
create procfile
anjing0921 Jan 8, 2023
9eda7fd
add
anjing0921 Jan 9, 2023
5ff6b40
add delete moon by id
anjing0921 Jan 9, 2023
e81cae5
add put moon by id
anjing0921 Jan 9, 2023
2a9f97e
model change
anjing0921 Jan 9, 2023
4da4ae2
pass wave 9
anjing0921 Jan 10, 2023
13dd682
wave 9
anjing0921 Jan 10, 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
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()'
26 changes: 26 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,33 @@
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()
migrate = Migrate(compare_type=True)
load_dotenv()


def create_app(test_config=None):
app = Flask(__name__)
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
if test_config:
app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI")
app.config["Testing"] = True
else:
app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI")

from app.model.planet import Planet
from app.model.moon import Moon

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

from .routes import planets_bp
app.register_blueprint(planets_bp)

from .routes import moons_bp
app.register_blueprint(moons_bp)
return app
Empty file added app/model/__init__.py
Empty file.
26 changes: 26 additions & 0 deletions app/model/moon.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
from app import db
class Moon(db.Model):
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
name = db.Column(db.String)
size = db.Column(db.Float)
description = db.Column(db.String)
planet_id = db.Column(db.Integer, db.ForeignKey("planet.id"))
planet = db.relationship("Planet", back_populates="moons")


def to_dict(self):
moon_dict = {}
moon_dict["id"] = self.id
moon_dict["name"] = self.name
moon_dict["size"] = self.size
moon_dict["description"] = self.description

return moon_dict

@classmethod
def from_dict(cls, moon_data):
new_moon = Moon(name=moon_data["name"],
size=moon_data["size"],
description=moon_data["description"])

return new_moon
28 changes: 28 additions & 0 deletions app/model/planet.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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)
radius = db.Column(db.Float)
moons = db.relationship("Moon", back_populates="planet")

def to_dict(self):
planet_dict = {}
planet_dict["id"] = self.id
planet_dict["name"] = self.name
planet_dict["description"] = self.description
planet_dict["radius"] = self.radius

moon_names = []
for moon in self.moons:
moon_names.append(moon.name)
planet_dict["moons"] = moon_names
return planet_dict


@classmethod
def from_dict(cls, planet_data):
new_planet = Planet(name=planet_data["name"],
description=planet_data["description"],
radius=planet_data["radius"])
return new_planet
154 changes: 153 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,154 @@
from flask import Blueprint
from app import db
from flask import Blueprint, jsonify, abort, make_response, request
from app.model.planet import Planet
from app.model.moon import Moon

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

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

model = cls.query.get(model_id)

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

return model
#============================== planets_bp.route =============================
#============================================================================
@planets_bp.route("", methods=["POST"])
def create_planet():
request_body = request.get_json()
new_planet = Planet.from_dict(request_body)

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

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

@planets_bp.route("", methods=["GET"])
def read_all_planets():
planet_query = Planet.query
name_query = request.args.get("name")
if name_query:
planet_query = planet_query.filter(Planet.name.ilike(f"%{name_query}%"))

sort_query = request.args.get("sort")
if sort_query:
if sort_query == "desc":
planet_query = planet_query.order_by(Planet.name.desc())
else:
planet_query = planet_query.order_by(Planet.name.asc())

planets = planet_query.all()
planets_response = []
for planet in planets:
planets_response.append(planet.to_dict())
return jsonify(planets_response)


@planets_bp.route("/<planet_id>", methods=["GET"])
def read_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 = validate_model(Planet, planet_id)

request_body = request.get_json()

planet.name = request_body["name"]
planet.description = request_body["description"]
planet.radius = request_body["radius"]

db.session.commit()
return make_response(f"Planet #{planet.id} successfully updated")

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

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

return make_response(f"Planet #{planet.id} successfully deleted")
#============================== "/<planet_id>/moons" =============================
#============================================================================

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

request_body = request.get_json()
new_moon = Moon.from_dict(request_body)
new_moon.planet = planet

db.session.add(new_moon)
db.session.commit()

message = f"Moon {new_moon.name} created with Planet {planet.name}"
return make_response(jsonify(message), 201)

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

moons_response = []
for moon in planet.moons:
moons_response.append(moon.to_dict())

return jsonify(moons_response)

#============================== moons_bp.route =============================
#============================================================================


@moons_bp.route("", methods=["POST"])
def create_moon():
moon_data = request.get_json()
new_moon = Moon.from_dict(moon_data)

db.session.add(new_moon)
db.session.commit()

return make_response(f"Moon {new_moon.name} created", 201)

@moons_bp.route("", methods=["GET"])
def read_all_moons():
moons = Moon.query.all()
moons_response = []
for moon in moons:
moons_response.append(moon.to_dict())
return jsonify(moons_response)

@moons_bp.route("<moon_id>", methods=["GET"])
def read_one_moon(moon_id):
moon = validate_model(Moon, moon_id)
return moon.to_dict()

@moons_bp.route("<moon_id>", methods=["DELETE"])
def delete_one_moon(moon_id):
moon = validate_model(Moon, moon_id)

db.session.delete(moon)
db.session.commit()

return make_response(f"Moon #{moon.id} successfully deleted")

@moons_bp.route("<moon_id>", methods=["PUT"])
def update_moon(moon_id):
moon = validate_model(Moon, moon_id)

request_body = request.get_json()

moon.name = request_body["name"]
moon.description = request_body["description"]
moon.size = request_body["size"]

db.session.commit()
return make_response(f"Moon #{moon.id} successfully updated")
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()
Loading