From 27f447f12ce6301d4c586a15e612b5e8e7371c6f Mon Sep 17 00:00:00 2001 From: Makhabat Date: Mon, 18 Oct 2021 14:14:29 -0700 Subject: [PATCH 01/11] routes for the list of the planets and iindividual planet with id done --- app/__init__.py | 10 ++++++++++ app/routes.py | 44 +++++++++++++++++++++++++++++++++++++++++++- requirements.txt | 8 ++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..138cf8a30 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,4 +4,14 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import solar_systems_bp + app.register_blueprint(solar_systems_bp) + + + return app + + + + + diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..41c7cc117 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,44 @@ -from flask import Blueprint +from flask import Blueprint, jsonify +class Planet: + def __init__(self, id, name, description, color): + self.id = id + self.name = name + self.description = description + self.color = color + + def return_planets(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + "color": self.color + } + + +planets = [ + Planet(1,"Mercury", "hot", "brown"), + Planet(2, "Venus", "pretty", "redish brown"), + Planet(3, "Earth", "wet", "greenis blue"), + Planet(6, "Saturn", "rings", "purple and yellow" ) + +] + + +solar_systems_bp = Blueprint("planets", __name__, url_prefix="/planets") + +@solar_systems_bp.route("", methods=["GET"]) +def get_planet_json(): + planet_response = [] + for planet in planets: + planet_response.append( + planet.return_planets() + ) + return jsonify(planet_response) + +@solar_systems_bp.route("/", methods=["GET"]) +def get_each_planet_with_id(planet_id): + planet_id = int(planet_id) + for planet in planets: + if planet.id == planet_id: + return jsonify(planet.return_planets()) diff --git a/requirements.txt b/requirements.txt index fd90fffa8..cfdf74050 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ alembic==1.5.4 +attrs==20.3.0 autopep8==1.5.5 certifi==2020.12.5 chardet==4.0.0 @@ -6,13 +7,20 @@ 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 +iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +packaging==20.9 +pluggy==0.13.1 psycopg2-binary==2.8.6 +py==1.10.0 pycodestyle==2.6.0 +pyparsing==2.4.7 +pytest==6.2.3 python-dateutil==2.8.1 python-dotenv==0.15.0 python-editor==1.0.4 From f48f9291c6aa844274e397916d06dc9727b6a89d Mon Sep 17 00:00:00 2001 From: Makhabat Date: Mon, 18 Oct 2021 14:33:02 -0700 Subject: [PATCH 02/11] retuns an error if id is not found --- app/routes.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/routes.py b/app/routes.py index 41c7cc117..45326029c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -39,6 +39,15 @@ def get_planet_json(): @solar_systems_bp.route("/", methods=["GET"]) def get_each_planet_with_id(planet_id): planet_id = int(planet_id) + + for planet in planets: if planet.id == planet_id: return jsonify(planet.return_planets()) + + return { + "error": (f"ID {planet_id} not exists"), + "status": "404" + },404 + + From b95cbfb64ba166e210ee1e12c314a18fdac39681 Mon Sep 17 00:00:00 2001 From: Makhabat Date: Mon, 25 Oct 2021 13:55:29 -0700 Subject: [PATCH 03/11] planet model was created --- app/__init__.py | 25 +++++++++- app/models/__init__.py | 0 app/models/planet.py | 7 +++ migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++ migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++++ 7 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako diff --git a/app/__init__.py b/app/__init__.py index 138cf8a30..a0abc1f1d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,17 +1,38 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +db = SQLAlchemy() +migrate = Migrate() + + +# def create_app(test_config=None): +# app = Flask(__name__) + +# from .routes import solar_systems_bp +# app.register_blueprint(solar_systems_bp) + + + +# return app def create_app(test_config=None): app = Flask(__name__) + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + + db.init_app(app) + migrate.init_app(app, db) + + from .routes import solar_systems_bp app.register_blueprint(solar_systems_bp) - + # from app.models.planet import Planet 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..9104f23ff --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,7 @@ +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) + color = db.Column(db.String) \ 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"} From 87b6e09b2359274b1e100e81f6d875370bd1eaf8 Mon Sep 17 00:00:00 2001 From: Makhabat Date: Mon, 25 Oct 2021 14:42:46 -0700 Subject: [PATCH 04/11] posting new planet --- app/__init__.py | 13 +--- app/models/planet.py | 13 +++- app/routes.py | 95 ++++++++++++++++------------ migrations/versions/0ea287c6ef5c_.py | 34 ++++++++++ 4 files changed, 102 insertions(+), 53 deletions(-) create mode 100644 migrations/versions/0ea287c6ef5c_.py diff --git a/app/__init__.py b/app/__init__.py index a0abc1f1d..77bb5beae 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,17 +5,6 @@ db = SQLAlchemy() migrate = Migrate() - -# def create_app(test_config=None): -# app = Flask(__name__) - -# from .routes import solar_systems_bp -# app.register_blueprint(solar_systems_bp) - - - -# return app - def create_app(test_config=None): app = Flask(__name__) @@ -29,7 +18,7 @@ def create_app(test_config=None): from .routes import solar_systems_bp app.register_blueprint(solar_systems_bp) - # from app.models.planet import Planet + from app.models.planet import Planet return app diff --git a/app/models/planet.py b/app/models/planet.py index 9104f23ff..bc084acf0 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -4,4 +4,15 @@ class Planet(db.Model): 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) \ No newline at end of file + color = db.Column(db.String) + + + + +def return_planets(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + "color": self.color + } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 45326029c..4d179b008 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,53 +1,68 @@ -from flask import Blueprint, jsonify - -class Planet: - def __init__(self, id, name, description, color): - self.id = id - self.name = name - self.description = description - self.color = color + +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, make_response, request + +# class Planet: +# def __init__(self, id, name, description, color): +# self.id = id +# self.name = name +# self.description = description +# self.color = color - def return_planets(self): - return { - "id": self.id, - "name": self.name, - "description": self.description, - "color": self.color - } +# def return_planets(self): +# return { +# "id": self.id, +# "name": self.name, +# "description": self.description, +# "color": self.color +# } -planets = [ - Planet(1,"Mercury", "hot", "brown"), - Planet(2, "Venus", "pretty", "redish brown"), - Planet(3, "Earth", "wet", "greenis blue"), - Planet(6, "Saturn", "rings", "purple and yellow" ) +# planets = [ +# Planet(1,"Mercury", "hot", "brown"), +# Planet(2, "Venus", "pretty", "redish brown"), +# Planet(3, "Earth", "wet", "greenis blue"), +# Planet(6, "Saturn", "rings", "purple and yellow" ) -] +# ] solar_systems_bp = Blueprint("planets", __name__, url_prefix="/planets") -@solar_systems_bp.route("", methods=["GET"]) -def get_planet_json(): - planet_response = [] - for planet in planets: - planet_response.append( - planet.return_planets() - ) - return jsonify(planet_response) - -@solar_systems_bp.route("/", methods=["GET"]) -def get_each_planet_with_id(planet_id): - planet_id = int(planet_id) + +@solar_systems_bp.route("", methods=["POST"]) +def handle_planets(): + 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(f"Planet {new_planet.name} successfully created", 201) +# @solar_systems_bp.route("", methods=["GET", "POST"]) +# def get_planet_json(): +# planet_response = [] +# for planet in planets: +# planet_response.append( +# planet.return_planets() +# ) +# return jsonify(planet_response) + +# @solar_systems_bp.route("/", methods=["GET"]) +# def get_each_planet_with_id(planet_id): +# planet_id = int(planet_id) - for planet in planets: - if planet.id == planet_id: - return jsonify(planet.return_planets()) +# for planet in planets: +# if planet.id == planet_id: +# return jsonify(planet.return_planets()) - return { - "error": (f"ID {planet_id} not exists"), - "status": "404" - },404 +# return { +# "error": (f"ID {planet_id} not exists"), +# "status": "404" +# },404 diff --git a/migrations/versions/0ea287c6ef5c_.py b/migrations/versions/0ea287c6ef5c_.py new file mode 100644 index 000000000..a7ba23c41 --- /dev/null +++ b/migrations/versions/0ea287c6ef5c_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 0ea287c6ef5c +Revises: +Create Date: 2021-10-25 14:05:24.798398 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0ea287c6ef5c' +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('color', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 6054410538dea369553e350f746c26ab5e7a544d Mon Sep 17 00:00:00 2001 From: Makhabat Date: Mon, 25 Oct 2021 15:57:23 -0700 Subject: [PATCH 05/11] Read one planet --- app/routes.py | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4d179b008..f3dccf7ac 100644 --- a/app/routes.py +++ b/app/routes.py @@ -31,10 +31,22 @@ solar_systems_bp = Blueprint("planets", __name__, url_prefix="/planets") -@solar_systems_bp.route("", methods=["POST"]) +@solar_systems_bp.route("", methods=["GET", "POST"]) def handle_planets(): - request_body = request.get_json() - new_planet = Planet(name=request_body["name"], + if request.method == "GET": + planets = Planet.query.all() + planets_response = [] + for planet in planets: + planets_response.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "color": planet.color, + }) + return jsonify(planets_response) + elif request.method == "POST": + request_body = request.get_json() + new_planet = Planet(name=request_body["name"], description=request_body["description"], color=request_body["color"]) @@ -42,6 +54,17 @@ def handle_planets(): db.session.commit() return make_response(f"Planet {new_planet.name} successfully created", 201) + + +@solar_systems_bp.route("/", methods=["GET"]) +def handle_planet(planet_id): + planet = Planet.query.get(planet_id) + + return { + "id":planet.id, + "name": planet.name, + "description": planet.description + } # @solar_systems_bp.route("", methods=["GET", "POST"]) # def get_planet_json(): # planet_response = [] From e0a739cb07427386a9dda4662c17c7ee0c9f9f25 Mon Sep 17 00:00:00 2001 From: Makhabat Date: Mon, 25 Oct 2021 23:15:41 -0700 Subject: [PATCH 06/11] error handling was added --- app/__init__.py | 2 +- app/routes.py | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 77bb5beae..0385946eb 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,7 +2,7 @@ from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate -db = SQLAlchemy() +db = SQLAlchemy() migrate = Migrate() def create_app(test_config=None): diff --git a/app/routes.py b/app/routes.py index f3dccf7ac..626f963d6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -44,27 +44,29 @@ def handle_planets(): "color": planet.color, }) return jsonify(planets_response) + elif request.method == "POST": 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() + db.session.add(new_planet) + db.session.commit() - return make_response(f"Planet {new_planet.name} successfully created", 201) + return make_response(f"Planet {new_planet.name} successfully created", 201) @solar_systems_bp.route("/", methods=["GET"]) def handle_planet(planet_id): + try: + planet_id = int(planet_id) + except: + return {"error": "dog_id must be an integer"},400 + planet = Planet.query.get(planet_id) - return { - "id":planet.id, - "name": planet.name, - "description": planet.description - } + return planet.to_dict() # @solar_systems_bp.route("", methods=["GET", "POST"]) # def get_planet_json(): # planet_response = [] From f634896ec64bfe1cf3449563f97309e55290620e Mon Sep 17 00:00:00 2001 From: Makhabat Date: Tue, 26 Oct 2021 11:46:06 -0700 Subject: [PATCH 07/11] Update and Delete were added --- app/models/planet.py | 5 +-- app/routes.py | 83 +++++++++++++++++--------------------------- 2 files changed, 32 insertions(+), 56 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index bc084acf0..5c63b21d0 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -6,10 +6,7 @@ class Planet(db.Model): description = db.Column(db.String) color = db.Column(db.String) - - - -def return_planets(self): + def to_dict(self): return { "id": self.id, "name": self.name, diff --git a/app/routes.py b/app/routes.py index 626f963d6..9d9eeb335 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,36 +1,10 @@ from app import db from app.models.planet import Planet -from flask import Blueprint, jsonify, make_response, request - -# class Planet: -# def __init__(self, id, name, description, color): -# self.id = id -# self.name = name -# self.description = description -# self.color = color +from flask import Blueprint, jsonify, make_response, request, abort -# def return_planets(self): -# return { -# "id": self.id, -# "name": self.name, -# "description": self.description, -# "color": self.color -# } - - -# planets = [ -# Planet(1,"Mercury", "hot", "brown"), -# Planet(2, "Venus", "pretty", "redish brown"), -# Planet(3, "Earth", "wet", "greenis blue"), -# Planet(6, "Saturn", "rings", "purple and yellow" ) - -# ] - - solar_systems_bp = Blueprint("planets", __name__, url_prefix="/planets") - @solar_systems_bp.route("", methods=["GET", "POST"]) def handle_planets(): if request.method == "GET": @@ -57,37 +31,42 @@ def handle_planets(): return make_response(f"Planet {new_planet.name} successfully created", 201) -@solar_systems_bp.route("/", methods=["GET"]) -def handle_planet(planet_id): + +def get_planet_from_id(planet_id): try: planet_id = int(planet_id) except: - return {"error": "dog_id must be an integer"},400 - - planet = Planet.query.get(planet_id) + abort(make_response({"error": "planet_id must be an integer"},400)) + return Planet.query.get_or_404(planet_id, description = "{planet not found}") + + +@solar_systems_bp.route("/", methods=["GET"]) +def read_planet(planet_id): + planet = get_planet_from_id(planet_id) return planet.to_dict() -# @solar_systems_bp.route("", methods=["GET", "POST"]) -# def get_planet_json(): -# planet_response = [] -# for planet in planets: -# planet_response.append( -# planet.return_planets() -# ) -# return jsonify(planet_response) - -# @solar_systems_bp.route("/", methods=["GET"]) -# def get_each_planet_with_id(planet_id): -# planet_id = int(planet_id) - -# for planet in planets: -# if planet.id == planet_id: -# return jsonify(planet.return_planets()) -# return { -# "error": (f"ID {planet_id} not exists"), -# "status": "404" -# },404 +@solar_systems_bp.route("/", methods=["PATCH"]) +def update_planet(planet_id): + planet = get_planet_from_id(planet_id) + request_body = request.get_json() + + + if "name" in request_body: + planet.name = request_body["name"] + if "color" in request_body: + planet.color = request_body["color"] + + db.session.commit() + return jsonify(planet.to_dict()) + + +@solar_systems_bp.route("/", methods=["DELETE"]) +def delete_planet(planet_id): + planet = get_planet_from_id(planet_id) + db.session.delete(planet) + db.session.commit() + return jsonify(planet.to_dict()) From 54ac0c5df0a25ddf3ae3a4e7266faa9993007d52 Mon Sep 17 00:00:00 2001 From: Makhabat Date: Wed, 27 Oct 2021 12:03:00 -0700 Subject: [PATCH 08/11] distance column and sorting queries were added --- app/models/planet.py | 4 +- app/routes.py | 83 ++++++++++++++------ migrations/versions/6282beecfa6d_distance.py | 28 +++++++ 3 files changed, 88 insertions(+), 27 deletions(-) create mode 100644 migrations/versions/6282beecfa6d_distance.py diff --git a/app/models/planet.py b/app/models/planet.py index 5c63b21d0..05800d758 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -5,11 +5,13 @@ class Planet(db.Model): name = db.Column(db.String) description = db.Column(db.String) color = db.Column(db.String) + distance = db.Column(db.String) def to_dict(self): return { "id": self.id, "name": self.name, "description": self.description, - "color": self.color + "color": self.color, + "distance":self.distance } \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 9d9eeb335..72faeb8f0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -5,25 +5,61 @@ solar_systems_bp = Blueprint("planets", __name__, url_prefix="/planets") -@solar_systems_bp.route("", methods=["GET", "POST"]) -def handle_planets(): - if request.method == "GET": - planets = Planet.query.all() + +def valid_int(number,parameter_type): + try: + int(number) + except: + abort(make_response({"error": f"{parameter_type} must be an integer"},400)) + +def get_planet_from_id(planet_id): + valid_int(planet_id, "planet_id") + return Planet.query.get_or_404(planet_id, description = "{planet not found}") + +#Routes +@solar_systems_bp.route("", methods=["GET"]) +def read_all_planets(): + + distance_query = request.args.get("distance") + further_query = request.args.get("further") + sort_query = request.args.get("sort") + + + if distance_query: + valid_int(distance_query, "distance") + planets = Planet.query.filter_by(distance = distance_query) + elif further_query: + valid_int(further_query, "further") + planets = Planet.query.filter(Planet.distance > further_query) + elif sort_query == "asc": + planets = Planet.query.order_by(Planet.distance.asc()) + elif sort_query == "desc": + planets = Planet.query.order_by(Planet.distance.desc()) + else: + planets = Planet.query.all() + + planets_response = [] for planet in planets: - planets_response.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "color": planet.color, - }) + planets_response.append( + planet.to_dict() + ) return jsonify(planets_response) - - elif request.method == "POST": + + +@solar_systems_bp.route("", methods=["POST"]) +def create_planets(): request_body = request.get_json() - new_planet = Planet(name=request_body["name"], - description=request_body["description"], - color=request_body["color"]) + if "name" not in request_body or "color" not in request_body or "description" not in request_body or "distance" not in request_body: + return {"error": "incomplete request body"}, 400 + + + new_planet = Planet( + name=request_body["name"], + description=request_body["description"], + color=request_body["color"], + distance=request_body["distance"] + ) db.session.add(new_planet) db.session.commit() @@ -31,15 +67,6 @@ def handle_planets(): return make_response(f"Planet {new_planet.name} successfully created", 201) - -def get_planet_from_id(planet_id): - try: - planet_id = int(planet_id) - except: - abort(make_response({"error": "planet_id must be an integer"},400)) - return Planet.query.get_or_404(planet_id, description = "{planet not found}") - - @solar_systems_bp.route("/", methods=["GET"]) def read_planet(planet_id): planet = get_planet_from_id(planet_id) @@ -52,11 +79,15 @@ def update_planet(planet_id): planet = get_planet_from_id(planet_id) request_body = request.get_json() - if "name" in request_body: planet.name = request_body["name"] if "color" in request_body: planet.color = request_body["color"] + if "description" in request_body: + planet.description = request_body["description"] + if "distance" in request_body: + planet.distance = request_body["distance"] + db.session.commit() return jsonify(planet.to_dict()) @@ -69,4 +100,4 @@ def delete_planet(planet_id): db.session.delete(planet) db.session.commit() - return jsonify(planet.to_dict()) + return make_response(f"Planet {jsonify(planet.to_dict())} successfully deleted") diff --git a/migrations/versions/6282beecfa6d_distance.py b/migrations/versions/6282beecfa6d_distance.py new file mode 100644 index 000000000..938906ed2 --- /dev/null +++ b/migrations/versions/6282beecfa6d_distance.py @@ -0,0 +1,28 @@ +"""distance + +Revision ID: 6282beecfa6d +Revises: 0ea287c6ef5c +Create Date: 2021-10-27 11:36:54.771525 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6282beecfa6d' +down_revision = '0ea287c6ef5c' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('planet', sa.Column('distance', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('planet', 'distance') + # ### end Alembic commands ### From 0b209c7628cba717d311b7955285807794a89ed6 Mon Sep 17 00:00:00 2001 From: Makhabat Date: Thu, 28 Oct 2021 12:20:45 -0700 Subject: [PATCH 09/11] test to get one planet --- app/__init__.py | 12 +++++++++++- tests/__init__.py | 0 tests/conftest.py | 29 +++++++++++++++++++++++++++++ tests/test_planet_routes.py | 28 ++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_planet_routes.py diff --git a/app/__init__.py b/app/__init__.py index 0385946eb..5b09ac089 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,11 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate +from dotenv import load_dotenv + +import os + +load_dotenv() db = SQLAlchemy() migrate = Migrate() @@ -9,7 +14,12 @@ def create_app(test_config=None): app = Flask(__name__) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + + if test_config is None: + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('DEV_DB') + else: + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('TEST_DB') + db.init_app(app) migrate.init_app(app, db) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 000000000..90e68965f --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,29 @@ +import pytest +from app import create_app, db +from app.models.planet import Planet + + +@pytest.fixture +def app(): + app = create_app({"Testing": True}) + + 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 one_planet(app): + new_planet = Planet( + color="light brown", description = "in betwen Mars and Saturn",distance = "5", name= "Jupiter") + db.session.add(new_planet) + db.session.commit() \ No newline at end of file diff --git a/tests/test_planet_routes.py b/tests/test_planet_routes.py new file mode 100644 index 000000000..353b997fa --- /dev/null +++ b/tests/test_planet_routes.py @@ -0,0 +1,28 @@ +from app.models.planet import Planet + + +def test_get_all_planets_returns_empty_list_when_db_is_empty(client): + #act + response = client.get("/planets") + + #assert + assert response.status_code == 200 + assert response.get_json() == [] + + +def test_get_one_planet_retuns_one_planet(client, one_planet): + response = client.get("/planets/1") + response_body = response.get_json() + + #assert + + assert response.status_code == 200 + # assert "planet" in response_body + assert response_body == { + "color": "light brown", + "description": "in betwen Mars and Saturn", + "distance": "5", + "id": 1, + "name": "Jupiter" + + } \ No newline at end of file From eb4acbe649e6c7e49d305bf219396b58f23c39a1 Mon Sep 17 00:00:00 2001 From: Makhabat Date: Wed, 3 Nov 2021 10:51:30 -0700 Subject: [PATCH 10/11] Procfile was created --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile 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 From 82355e2e679678d03f04e875c4add50974aefed0 Mon Sep 17 00:00:00 2001 From: Makhabat Date: Wed, 3 Nov 2021 15:48:53 -0700 Subject: [PATCH 11/11] env file was modified --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 5b09ac089..1ce0506e9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,9 +16,9 @@ def create_app(test_config=None): app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False if test_config is None: - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('DEV_DB') + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI') else: - app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('TEST_DB') + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_TEST_DATABASE_URI') db.init_app(app)