forked from AdaGold/solar-system-api
-
Notifications
You must be signed in to change notification settings - Fork 36
Pine Ainur and Tirhas #17
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
Open
tirhas20
wants to merge
13
commits into
Ada-C16:main
Choose a base branch
from
tirhas20:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
fd13777
Initial setup
tirhas20 1659cc7
add Get routes
adjayanbaeva b2831cf
add get method
tirhas20 7b881c5
Refactor exixting code and fixed the farest function
tirhas20 ca8b6f3
make changes on farest function and finalize
tirhas20 9a4f035
creates planet model, connects to DataBase and creates POST and GET r…
tirhas20 dab9393
adds PUT route
adjayanbaeva 943372e
adds DELETE route
adjayanbaeva 2eb1763
adds filter queries
tirhas20 6b83677
seperates GET and PUT routes logic
adjayanbaeva d437ce3
handles TypeErrors
tirhas20 25d753e
adds .env file
tirhas20 852db58
edited init.py
tirhas20 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| web: gunicorn 'app:create_app()' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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(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 | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -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) | ||||||
|
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. For readability I suggest using response codes, even for 200s
Suggested change
|
||||||
|
|
||||||
| @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 | ||||||
|
Comment on lines
+34
to
+40
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 might make a good helper function. |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
| 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("/<planet_id>", 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("/<planet_id>", 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("/<planet_id>", 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 | ||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Generic single-database configuration. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 ### |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
👍 Good helper function