diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..7bb63acf9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,24 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +import os +from dotenv import load_dotenv - +db = SQLAlchemy() +migrate = Migrate() +load_dotenv() def create_app(test_config=None): app = Flask(__name__) + + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get("SQLALCHEMY_DATABASE_URI") + + from app.models.planet import Planet + + from .routes import solarsystem_bp + app.register_blueprint(solarsystem_bp) + + db.init_app(app) + migrate.init_app(app,db) return app diff --git a/app/models/__init__.py b/app/models/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/planet.py b/app/models/planet.py new file mode 100644 index 000000000..224c7fa5f --- /dev/null +++ b/app/models/planet.py @@ -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(64)) + surface_area= db.Column(db.Integer) + orbital_period = db.Column(db.Integer) + distance_from_sun = db.Column(db.Integer) + radius = db.Column(db.Integer) + + def to_dict(self): + return { + 'id':self.id, + 'name':self.name, + 'surface_area':self.surface_area, + 'orbital_period':self.orbital_period, + 'distance_from_sun':self.distance_from_sun, + 'radius':self.radius + } + + + + + + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..fe3d21421 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,114 @@ -from flask import Blueprint +from app import db +from flask import Blueprint, jsonify, request,make_response +from app.models.planet import Planet +solarsystem_bp = Blueprint("solarsystem", __name__, url_prefix="/solarsystem") + + +@solarsystem_bp.route("", methods=["GET"]) +def handle_solarsystem(): + requested_name = request.args.get('name') + shorter_orbital_period=request.args.get("shorter_orbital_period") + if requested_name: + requested_name = requested_name.capitalize() + planets=Planet.query.filter_by(name=requested_name) + elif shorter_orbital_period: + try: + shorter_orbital_period = int(shorter_orbital_period) + except ValueError: + return {"Error": "Orbital period must be numeric"}, 400 + planets=Planet.query.filter(Planet.orbital_period < request.args.get("shorter/orbital_period")) + elif request.args.get("order_by") == "name": + planets = Planet.query.order_by(Planet.name.desc()) + else: + planets = Planet.query.all() + solarsystem_response = [] + for planet in planets: + solarsystem_response.append(planet.to_dict()) + + return jsonify(solarsystem_response) + +@solarsystem_bp.route("", methods=["POST"]) +def create_solarsystem(): + request_data = request.get_json() + if 'name' not in request_data or 'surface_area' not in request_data or 'orbital_period' not in request_data \ + or 'distance_from_sun' not in request_data or 'radius' not in request_data: + return jsonify({'message': "missing data"}),400 + if type(request_data['name']) != str or type(request_data['surface_area']) != int or\ + type(request_data['orbital_period']) != int or type(request_data['distance_from_sun']) != int\ + or type(request_data['radius']) != int : + return jsonify({'message': "Unsupported data type"}),400 + + + + new_planet = Planet( + name= request_data['name'], + surface_area = request_data['surface_area'], + orbital_period = request_data['orbital_period'], + distance_from_sun = request_data['distance_from_sun'], + radius = request_data['radius'] + ) + db.session.add(new_planet) + db.session.commit() + return f" Planet {new_planet.name} created", 201 + + +@solarsystem_bp.route("/", methods=["GET"]) +def get_planet(planet_id): + try: + planet_id = int(planet_id) + except ValueError: + return {"Error": "Id must be numeric"}, 400 + planet = Planet.query.get(planet_id) + if not planet: + return {"Error": f"Planet with id number {planet_id} was not found"}, 404 + + return jsonify(planet.to_dict()), 200 + +@solarsystem_bp.route("/", methods=["PUT"]) +def update_planet(planet_id): + try: + planet_id = int(planet_id) + except ValueError: + return {"Error": "Id must be numeric"}, 400 + planet = Planet.query.get(planet_id) + + form_data = request.get_json() + + if 'name' not in form_data or 'surface_area' not in form_data or 'orbital_period' not in form_data \ + or 'distance_from_sun' not in form_data or 'radius' not in form_data: + return jsonify({'message': "missing data"}),400 + + if type(form_data['name']) != str or type(form_data['surface_area']) != int or\ + type(form_data['orbital_period']) != int or type(form_data['distance_from_sun']) != int\ + or type(form_data['radius']) != int : + return jsonify({'message': "Unsupported data type"}),400 + + planet.name = form_data["name"], + planet.surface_area = form_data["surface_area"] + planet.orbital_period = form_data["orbital_period"] + planet.distance_from_sun = form_data["distance_from_sun"] + planet.radius = form_data["radius"] + + db.session.commit() + + return jsonify(planet.to_dict()), 200 + +@solarsystem_bp.route("/", methods=["DELETE"]) +def delete_planet(planet_id): + try: + planet_id = int(planet_id) + except ValueError: + return {"Error": "Id must be numeric"}, 400 + planet = Planet.query.get(planet_id) + if planet: + db.session.delete(planet) + db.session.commit() + return {"Message": f"Planet with id number {planet_id} deleted."}, 200 + + else: + return {"Message": f"Planet with id number {planet_id} not found"}, 404 + + + + \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -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 diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -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() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -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"} diff --git a/migrations/versions/96feded2ee65_adds_planet_model.py b/migrations/versions/96feded2ee65_adds_planet_model.py new file mode 100644 index 000000000..14bf18fa2 --- /dev/null +++ b/migrations/versions/96feded2ee65_adds_planet_model.py @@ -0,0 +1,36 @@ +"""adds planet model + +Revision ID: 96feded2ee65 +Revises: +Create Date: 2021-10-25 14:02:44.108898 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '96feded2ee65' +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(length=64), nullable=True), + sa.Column('surface_area', sa.Integer(), nullable=True), + sa.Column('orbital_period', sa.Integer(), nullable=True), + sa.Column('distance_from_sun', sa.Integer(), nullable=True), + sa.Column('radius', 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 ### diff --git a/requirements.txt b/requirements.txt index fd90fffa8..d2f045e58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,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