diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..09bb2fd71 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,28 @@ 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_TEST_DATABASE_URI") + + db.init_app(app) + migrate.init_app(app, db) + from app.models.planet import Planet + from.routes import planets_bp + app.register_blueprint(planets_bp) + 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..6f13c618a --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,21 @@ +from app import db + + +class Planet(db.Model): # The class Planet inherits from db.Model from SQLAlchemy + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + temperature = db.Column(db.Integer, nullable=False) + + @classmethod + def from_dict(cls, data_dict): + return cls(name=data_dict["name"], description=data_dict["description"], temperature=data_dict["temperature"]) + + def to_dict(self): + return dict( + id=self.id, + name=self.name, + description=self.description, + temperature=self.temperature + ) + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..912ffcdae 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,88 @@ -from flask import Blueprint +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, abort, make_response, request +# INSTANIATE BLUEPRINT FOR ROUTES +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + + +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response( + {"message": f"{cls.__name__} {model_id} invalid"}, 400)) + + planet = cls.query.get(model_id) + + if not planet: + abort(make_response( + {"message": f"{cls.__name__} {model_id} can't be found"}, 404)) + + return planet + + +@planets_bp.route("/", strict_slashes=False, 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(jsonify(f"Planet {new_planet.name} successfully created"), 201) + + +@planets_bp.route("/", strict_slashes=False, methods=["GET"]) +def read_all_planets(): + name_query = request.args.get("name") + description_query = request.args.get("description") + temperature_query = request.args.get("temperature") + + planet_query = Planet.query # like SELECT * from planets + + if name_query: + planet_query = planet_query.filter_by(name=name_query) # ask Isabella + + if description_query: + planet_query = planet_query.filter_by(description=description_query) + + if temperature_query: + planet_query = planet_query.filter_by(temperature=temperature_query) + + planets = planet_query.all() + + planet_response = [planet.to_dict() for planet in planets] + + return jsonify(planet_response) + + +@planets_bp.route("/", strict_slashes=False, methods=["GET"]) +def read_one_planet(id): + + planet = validate_model(Planet, id) + return planet.to_dict(), 200 + + +@planets_bp.route("/", strict_slashes=False, methods=["PUT"]) +def update_planet(id): + + planet = validate_model(Planet, id) + request_body = request.get_json() + + planet.name = request_body["name"] + planet.description = request_body["description"] + planet.temperature = request_body["temperature"] + + db.session.commit() + return make_response(jsonify(f"Planet #{planet.id} successfully updated"), 200) + + +@planets_bp.route("/", methods=["DELETE"]) +def delete_planet(id): + + planet = validate_model(Planet, id) + db.session.delete(planet) + db.session.commit() + return make_response(jsonify(f"Planet #{planet.id} successfully deleted"), 200) 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/e28a44e90eb7_adds_planet_model.py b/migrations/versions/e28a44e90eb7_adds_planet_model.py new file mode 100644 index 000000000..06c6db9ca --- /dev/null +++ b/migrations/versions/e28a44e90eb7_adds_planet_model.py @@ -0,0 +1,34 @@ +"""adds Planet model + +Revision ID: e28a44e90eb7 +Revises: +Create Date: 2022-10-28 15:40:07.924958 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e28a44e90eb7' +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('temperature', 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 ### diff --git a/requirements.txt b/requirements.txt index fba2b3e38..1eeabccdc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,26 @@ alembic==1.5.4 +attrs==22.1.0 autopep8==1.5.5 blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==6.5.0 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 idna==2.10 +iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +packaging==21.3 +pluggy==1.0.0 psycopg2-binary==2.9.4 +py==1.11.0 pycodestyle==2.6.0 +pyparsing==3.0.9 pytest==7.1.1 pytest-cov==2.12.1 python-dateutil==2.8.1 @@ -23,5 +30,6 @@ requests==2.25.1 six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.4 Werkzeug==1.0.1 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..dc078bc52 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,37 @@ +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 + ocean_planet = Planet(name="Ocean Planet", description="watr 4evr planet", temperature = 1000) + mountain_planet = Planet(name="Mountain Planet", description="i luv 2 climb rocks planet", temperature = 500) + + db.session.add_all([ocean_planet, mountain_planet]) + # Alternatively, we could do + # db.session.add(ocean_book) + # db.session.add(mountain_book) + db.session.commit() diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..6db66064c --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,51 @@ +def test_get_all_planets_with_no_records(client): + # Act + response = client.get("/planets") + response_body = response.get_json() + # Assert + assert response.status_code == 200 + assert response_body == [] + +def test_get_all_planets(client,two_saved_planets): + # Act + response = client.get("/planets") + response_body = response.get_json() + # Assert + assert response.status_code == 200 + assert len(response_body) == 2 + + +def test_get_one_planet(client,two_saved_planets): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == { + "id": 1, + "name":"Ocean Planet", + "description": "watr 4evr planet", + "temperature" : 1000} + +def test_get_one_planet_no_fixture(client): + # Act + response = client.get("/planets/1") + + # Assert + assert response.status_code == 404 + +def test_create_one_planet(client): + # Act + response = client.post("/planets", json={ + "name":"Ocean Planet", + "description": "watr 4evr planet", + "temperature" : 1000} + ) + response_body = response.get_json() + + # Assert + assert response.status_code == 201 + assert response_body == "Planet Ocean Planet successfully created" + +# def test_update_one_planet