From 5d176b5d1d5a0f789b560e88d0db4d572a21bc68 Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Fri, 21 Apr 2023 14:57:12 -0400 Subject: [PATCH 01/17] Wave 1 --- app/routes.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..fc9c0bc7e 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,34 @@ -from flask import Blueprint +from flask import Blueprint,jsonify + +class Planet: + def __init__(self, id, name, description, moons): + id = self.id + name = self.name + description = self.description + moons = self.moons + + +planets = [ + Planet(1, "Earth", "our planet", 1), + Planet(2, "Mars", "red", 2) +] + +bp= Blueprint ("planets", __name__, url_prefix="/planets") + +@bp.route( "", methods=["GET"]) + +def get_list_of_planets(): + results_list= [] + + for planet in planets: + results_list.append (dict( + id = planet.id, + name = planet.name, + description = planet.description, + moons = planet.moons, + + )) + + return jsonify(results_list) + From a6c36a034a65c6c293629876622103e67a85bb03 Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Mon, 24 Apr 2023 15:14:39 -0400 Subject: [PATCH 02/17] Wave 1 Revised --- app/__init__.py | 3 +++ app/routes.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..6cb7d96cd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,5 +3,8 @@ def create_app(test_config=None): app = Flask(__name__) + + from .routes import bp + app.register_blueprint(bp) return app diff --git a/app/routes.py b/app/routes.py index fc9c0bc7e..86aa54212 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,10 +2,10 @@ class Planet: def __init__(self, id, name, description, moons): - id = self.id - name = self.name - description = self.description - moons = self.moons + self.id = id + self.name = name + self.description = description + self.moons = moons planets = [ From 0f7c59399048ab9b382cce7a3ebd9fc5ec7e2105 Mon Sep 17 00:00:00 2001 From: Angelica Date: Mon, 24 Apr 2023 14:30:52 -0500 Subject: [PATCH 03/17] wave 2 --- app/__init__.py | 3 +++ app/routes.py | 54 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..1123a559e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,4 +4,7 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import bp + app.register_blueprint(bp) + return app diff --git a/app/routes.py b/app/routes.py index fc9c0bc7e..159163667 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,11 +1,11 @@ -from flask import Blueprint,jsonify +from flask import Blueprint,jsonify,abort, make_response class Planet: def __init__(self, id, name, description, moons): - id = self.id - name = self.name - description = self.description - moons = self.moons + self.id = id + self.name = name + self.description = description + self.moons = moons planets = [ @@ -30,5 +30,49 @@ def get_list_of_planets(): )) return jsonify(results_list) +""" +@bp.route("/",methods=["GET"]) +def get_one_planet(id): + id = validate_planet(id) + + for planet in planets: + if id == planet.id: + return { + "id" : planet.id, + "name" : planet.name, + "description" : planet.description, + "moons" : planet.moons + } + + abort(make_response({"message”:f”planet {id} not found"}, 404)) + +def validate_planet(id): + try: + id = int(id) + except: + abort(make_response({"message”:f”planet {id} invalid"}, 400)) + return id +""" +@bp.route("/",methods=["GET"]) +def get_one_planet(id): + planet = validate_planet(id) + return { + "id" : planet.id, + "name" : planet.name, + "description" : planet.description, + "moons" : planet.moons + } + + +def validate_planet(id): + try: + id = int(id) + except: + abort(make_response({"message": f"planet {id} invalid"}, 400)) + for planet in planets: + if planet.id == id: + return planet + + abort(make_response({"message": f"planet {id} not found"}, 404)) From f347cd0b459803a7e2fb48287999508b7066254f Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Fri, 28 Apr 2023 14:56:31 -0400 Subject: [PATCH 04/17] Wave 3 Not Working --- app/__init__.py | 18 +++++++++++++----- app/models/__init__.py | 0 app/models/planet.py | 16 ++++++++++++++++ app/routes/planet_routes.py | 27 +++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py create mode 100644 app/routes/planet_routes.py diff --git a/app/__init__.py b/app/__init__.py index 08cc5be8b..7f047452a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,13 +1,21 @@ 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 bp - app.register_blueprint(bp) - from .routes import bp - app.register_blueprint(bp) + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system' + + db.init_app(app) + migrate.init_app(app, db) + + from .routes.planet_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..096651a09 --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,16 @@ +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) + moons = db.Column(db.Integer) + + def make_planet_dict(self): + return dict( + id=self.id, + name=self.name, + description=self.description, + moons=self.moons + ) \ No newline at end of file diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py new file mode 100644 index 000000000..596cbc900 --- /dev/null +++ b/app/routes/planet_routes.py @@ -0,0 +1,27 @@ +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, make_response, request + + +planets_bp = Blueprint("books", __name__, url_prefix="/planets") + +@planets_bp.route("", methods=["POST"]) +def add_new_planet(): + request_body = request.get_json() + new_planet = Planet(name=request_body["name"], + description=request_body["description"], + moons=request_body["moons"] + ) + + 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 get_all_planets(): + planets = Planet.query.all() + planets_list=[] + for planet in planets: + planets_list.append(planet.make_planet_dict()) + return jsonify(planets_list), 200 \ No newline at end of file From ec7a18848e7ef46f6c9b0d731c60e6827c94cfbd Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Fri, 28 Apr 2023 22:44:03 -0400 Subject: [PATCH 05/17] migrations and init.py added --- app/routes/__init__.py | 0 migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../e6280fd69a02_adds_planet_model.py | 34 +++++++ 6 files changed, 200 insertions(+) create mode 100644 app/routes/__init__.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 create mode 100644 migrations/versions/e6280fd69a02_adds_planet_model.py diff --git a/app/routes/__init__.py b/app/routes/__init__.py new file mode 100644 index 000000000..e69de29bb 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/e6280fd69a02_adds_planet_model.py b/migrations/versions/e6280fd69a02_adds_planet_model.py new file mode 100644 index 000000000..3a39132d7 --- /dev/null +++ b/migrations/versions/e6280fd69a02_adds_planet_model.py @@ -0,0 +1,34 @@ +"""adds Planet model + +Revision ID: e6280fd69a02 +Revises: +Create Date: 2023-04-28 22:43:06.707509 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e6280fd69a02' +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('moons', 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 ### From a3daf9dfc0c8984494427f5bdfe4b0e05badcd54 Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Sat, 29 Apr 2023 13:41:48 -0400 Subject: [PATCH 06/17] Wave 3 Fixed --- app/__init__.py | 3 ++ app/routes.py | 78 ------------------------------------------------- 2 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 app/routes.py diff --git a/app/__init__.py b/app/__init__.py index 7f047452a..b47da6930 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,7 +15,10 @@ def create_app(test_config=None): db.init_app(app) migrate.init_app(app, db) + from app.models.planet import Planet + from .routes.planet_routes import planets_bp app.register_blueprint(planets_bp) + return app diff --git a/app/routes.py b/app/routes.py deleted file mode 100644 index 159163667..000000000 --- a/app/routes.py +++ /dev/null @@ -1,78 +0,0 @@ -from flask import Blueprint,jsonify,abort, make_response - -class Planet: - def __init__(self, id, name, description, moons): - self.id = id - self.name = name - self.description = description - self.moons = moons - - -planets = [ - Planet(1, "Earth", "our planet", 1), - Planet(2, "Mars", "red", 2) -] - -bp= Blueprint ("planets", __name__, url_prefix="/planets") - -@bp.route( "", methods=["GET"]) - -def get_list_of_planets(): - results_list= [] - - for planet in planets: - results_list.append (dict( - id = planet.id, - name = planet.name, - description = planet.description, - moons = planet.moons, - - )) - - return jsonify(results_list) -""" -@bp.route("/",methods=["GET"]) -def get_one_planet(id): - id = validate_planet(id) - - for planet in planets: - if id == planet.id: - return { - "id" : planet.id, - "name" : planet.name, - "description" : planet.description, - "moons" : planet.moons - } - - abort(make_response({"message”:f”planet {id} not found"}, 404)) - -def validate_planet(id): - try: - id = int(id) - except: - abort(make_response({"message”:f”planet {id} invalid"}, 400)) - - return id -""" -@bp.route("/",methods=["GET"]) -def get_one_planet(id): - planet = validate_planet(id) - return { - "id" : planet.id, - "name" : planet.name, - "description" : planet.description, - "moons" : planet.moons - } - - -def validate_planet(id): - try: - id = int(id) - except: - abort(make_response({"message": f"planet {id} invalid"}, 400)) - - for planet in planets: - if planet.id == id: - return planet - - abort(make_response({"message": f"planet {id} not found"}, 404)) From ce617875d92b9d3e51c650252169a089b0701098 Mon Sep 17 00:00:00 2001 From: Angelica Date: Tue, 2 May 2023 13:30:08 -0500 Subject: [PATCH 07/17] wave 4 running correctly --- app/routes/planet_routes.py | 57 +++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index 596cbc900..6e3814b52 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -1,16 +1,16 @@ from app import db from app.models.planet import Planet -from flask import Blueprint, jsonify, make_response, request +from flask import Blueprint, jsonify, make_response, request, abort -planets_bp = Blueprint("books", __name__, url_prefix="/planets") +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") @planets_bp.route("", methods=["POST"]) def add_new_planet(): request_body = request.get_json() - new_planet = Planet(name=request_body["name"], - description=request_body["description"], - moons=request_body["moons"] + new_planet = Planet(name=request_body['name'], + description=request_body['description'], + moons=request_body['moons'] ) db.session.add(new_planet) @@ -24,4 +24,49 @@ def get_all_planets(): planets_list=[] for planet in planets: planets_list.append(planet.make_planet_dict()) - return jsonify(planets_list), 200 \ No newline at end of file + return jsonify(planets_list), 200 + +@planets_bp.route("/", methods=["GET"]) +def get_one_planet(planet_id): + + planet= validate_planet(planet_id) + + return planet.make_planet_dict() + + +@planets_bp.route("/", methods=["DELETE"]) +def delete_planet(planet_id): + planet = validate_planet(planet_id) + + db.session.delete(planet) + db.session.commit() + + return make_response(f"Planet#{planet.id} successfully deleted") + +@planets_bp.route("/", methods=["PUT"]) +def update_planet(planet_id): + planet=validate_planet(planet_id) + request_body=request.get_json() + + if request_body.get("name") is None or request_body.get("description") is None or request_body.get("moons") is None: + return make_response(f"some additional information needed to update planet {planet.name}",400) + + planet.name=request_body["name"] + planet.description=request_body["description"] + planet.moons=request_body["moons"] + + db.session.commit() + + return make_response(f"planet {planet.name} succesfully updated",200) + +def validate_planet(id): + try: + id = int(id) + except: + abort(make_response({"message":f"planet {id} invalid"}, 400)) + + planet = Planet.query.get(id) + + if not planet: + abort(make_response({"message":f"planet {id} not found"}, 404)) + return planet \ No newline at end of file From 9fcaca144f57b41b6d0c5dfecc9e4f1b482e0a26 Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Wed, 3 May 2023 19:06:40 -0400 Subject: [PATCH 08/17] working on get all planets test --- app/__init__.py | 14 ++++++++++++-- app/routes/planet_routes.py | 5 +++++ tests/__init__.py | 0 tests/conftest.py | 33 +++++++++++++++++++++++++++++++++ tests/test_routes.py | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_routes.py diff --git a/app/__init__.py b/app/__init__.py index b47da6930..70031bc91 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,16 +1,26 @@ 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__) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system' + + if not test_config: + + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "SQLALCHEMY_DATABASE_URI") + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI") db.init_app(app) migrate.init_app(app, db) diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index 6e3814b52..89792d7cf 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -5,6 +5,11 @@ planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + +# @planets_bp.route("", methods=["GET", "POST"]) +# def handle_planetssss(): +# return make_response("I'm a teapot!", 418) + @planets_bp.route("", methods=["POST"]) def add_new_planet(): request_body = request.get_json() 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..84e6f1046 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,33 @@ +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): + pluto = Planet(name= "pluto", description= "not a planet", moons= 79) + mercury = Planet(name="mercury", description=" is a planet", moons =5) + + db.session.add_all([pluto, mercury]) + db.session.commit() \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..6f30a1286 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,37 @@ +from flask import jsonify + +def test_get_empty_all_planets(client): + response = client.get("/planets") + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == [] + + + +def test_get_one_planet(client, two_saved_planets): + response = client.get("/planets/1") + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == {"name": "pluto", "description":"not a planet", "moons":79, "id":1} + +def test_get_non_existent_planet(client, two_saved_planets): + response = client.get("/planets/100") + response_body = response.get_json() + + assert response.status_code == 404 + +def test_invalid_planet_route(client, two_saved_planets): + response = client.get("/planets/ADA") + response_body = response.get_json() + + assert response.status_code == 400 + +def test_get_all_planets(client, two_saved_planets): + response = client.get("/planets") + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == {{"name": "pluto", "description": "not a planet", "moons": 79, "id": 1}, + {"name": "mercury", "description": "is a planet", "moons" : 5, "id": 2}} \ No newline at end of file From 83068cb6c35f4abda9f04ce133f789e88e5e701b Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Wed, 3 May 2023 19:37:54 -0400 Subject: [PATCH 09/17] All tests work --- tests/conftest.py | 2 +- tests/test_routes.py | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 84e6f1046..256b063ab 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -27,7 +27,7 @@ def client(app): @pytest.fixture def two_saved_planets(app): pluto = Planet(name= "pluto", description= "not a planet", moons= 79) - mercury = Planet(name="mercury", description=" is a planet", moons =5) + mercury = Planet(name="mercury", description= "is a planet", moons =5) db.session.add_all([pluto, mercury]) db.session.commit() \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py index 6f30a1286..db215ae85 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -31,7 +31,17 @@ def test_invalid_planet_route(client, two_saved_planets): def test_get_all_planets(client, two_saved_planets): response = client.get("/planets") response_body = response.get_json() + print(response_body) assert response.status_code == 200 - assert response_body == {{"name": "pluto", "description": "not a planet", "moons": 79, "id": 1}, - {"name": "mercury", "description": "is a planet", "moons" : 5, "id": 2}} \ No newline at end of file + assert response_body == [{"name": "pluto", "description": "not a planet", "moons": 79, "id": 1}, + {"name": "mercury", "description": "is a planet", "moons" : 5, "id": 2}] + +def test_post_one_planet(client): + response =client.post ("/planets", json= {"name": "New Planet", + "description": "it's a new planet", + "moons": 0}) + response_body = response.get_data(as_text=True) + assert response.status_code == 201 + assert response_body == "Planet New Planet successfully created" + From eb76a2586af8a4d962fe8b4846211942d20a2e0c Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Thu, 4 May 2023 14:53:14 -0400 Subject: [PATCH 10/17] Wave 7 --- app/models/planet.py | 6 ++++++ app/routes/planet_routes.py | 37 +++++++++++------------------------- app/routes/routes_helpers.py | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 app/routes/routes_helpers.py diff --git a/app/models/planet.py b/app/models/planet.py index 096651a09..afd2f329b 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -7,6 +7,12 @@ class Planet(db.Model): description = db.Column(db.String) moons = db.Column(db.Integer) + @classmethod + def dict_to_model(cls, data_dict): + return cls(name = data_dict["name"], + description = data_dict["description"], + moons = data_dict["moons"]) + def make_planet_dict(self): return dict( id=self.id, diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index 89792d7cf..9552dcce6 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -1,22 +1,19 @@ from app import db from app.models.planet import Planet from flask import Blueprint, jsonify, make_response, request, abort +from .routes_helpers import validate_model -planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -# @planets_bp.route("", methods=["GET", "POST"]) -# def handle_planetssss(): -# return make_response("I'm a teapot!", 418) @planets_bp.route("", methods=["POST"]) def add_new_planet(): request_body = request.get_json() - new_planet = Planet(name=request_body['name'], - description=request_body['description'], - moons=request_body['moons'] - ) + + new_planet = Planet.dict_to_model(request_body) + db.session.add(new_planet) db.session.commit() @@ -26,22 +23,21 @@ def add_new_planet(): @planets_bp.route("", methods=["GET"]) def get_all_planets(): planets = Planet.query.all() - planets_list=[] - for planet in planets: - planets_list.append(planet.make_planet_dict()) + planets_list=[planet.make_planet_dict()for planet in planets] + return jsonify(planets_list), 200 @planets_bp.route("/", methods=["GET"]) def get_one_planet(planet_id): - planet= validate_planet(planet_id) + planet = validate_model(Planet, planet_id) - return planet.make_planet_dict() + return planet.make_planet_dict(), 200 @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_model(Planet, planet_id) db.session.delete(planet) db.session.commit() @@ -50,7 +46,7 @@ def delete_planet(planet_id): @planets_bp.route("/", methods=["PUT"]) def update_planet(planet_id): - planet=validate_planet(planet_id) + planet=validate_model(Planet, planet_id) request_body=request.get_json() if request_body.get("name") is None or request_body.get("description") is None or request_body.get("moons") is None: @@ -64,14 +60,3 @@ def update_planet(planet_id): return make_response(f"planet {planet.name} succesfully updated",200) -def validate_planet(id): - try: - id = int(id) - except: - abort(make_response({"message":f"planet {id} invalid"}, 400)) - - planet = Planet.query.get(id) - - if not planet: - abort(make_response({"message":f"planet {id} not found"}, 404)) - return planet \ No newline at end of file diff --git a/app/routes/routes_helpers.py b/app/routes/routes_helpers.py new file mode 100644 index 000000000..9a19e3c6f --- /dev/null +++ b/app/routes/routes_helpers.py @@ -0,0 +1,15 @@ +from flask import make_response, abort + +def validate_model(cls, id): + try: + id = int(id) + except: + abort(make_response({"message": f"{id} was invalid"}, 400)) + + model = cls.query.get(id) + + if not model: + abort(make_response( + {"message": f"{cls.__name__} with id {id} was not found"}, 404)) + + return model \ No newline at end of file From 57b30874ac8b34268de2edf2303e97a391915c88 Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Thu, 4 May 2023 15:05:18 -0400 Subject: [PATCH 11/17] Wave 5 --- app/routes/planet_routes.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index 9552dcce6..d02a2079a 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -22,7 +22,19 @@ def add_new_planet(): @planets_bp.route("", methods=["GET"]) def get_all_planets(): + + name_param = request.args.get("name") + + if name_param: + planets = Planet.query.filter_by(name=name_param) + + # else: + # make_response(f"Planet not found", 404) + + planets = Planet.query.all() + + planets_list=[planet.make_planet_dict()for planet in planets] return jsonify(planets_list), 200 From 142690a28ad3ecf1ab451756b9d0295f2867a04e Mon Sep 17 00:00:00 2001 From: Angelica Date: Thu, 4 May 2023 14:32:34 -0500 Subject: [PATCH 12/17] entered the query for all planets inside an else in de GET all planets route --- app/routes/planet_routes.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index d02a2079a..8ff133f1b 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -27,13 +27,8 @@ def get_all_planets(): if name_param: planets = Planet.query.filter_by(name=name_param) - - # else: - # make_response(f"Planet not found", 404) - - - planets = Planet.query.all() - + else: + planets = Planet.query.all() planets_list=[planet.make_planet_dict()for planet in planets] From da30cbfe7e9e6e2bfcf6a6e6565de2ef5535667e Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Sun, 7 May 2023 19:02:07 -0400 Subject: [PATCH 13/17] added gunicorn to requirements --- requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/requirements.txt b/requirements.txt index ae59e7b55..b93d3b924 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,14 +4,19 @@ blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==7.2.4 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 +gunicorn==20.1.0 idna==2.10 +iniconfig==2.0.0 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +packaging==23.1 +pluggy==1.0.0 psycopg2-binary==2.9.5 pycodestyle==2.6.0 pytest==7.3.1 From ba9da666bd70e8fde13e08fcecfe9108d7d993b3 Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Mon, 8 May 2023 15:16:23 -0400 Subject: [PATCH 14/17] created moon model and moons routes --- app/__init__.py | 3 +++ app/models/moon.py | 18 ++++++++++++++++++ app/models/planet.py | 2 +- app/routes/moon_routes.py | 22 ++++++++++++++++++++++ app/routes/planet_routes.py | 13 +++++++++++++ 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 app/models/moon.py create mode 100644 app/routes/moon_routes.py diff --git a/app/__init__.py b/app/__init__.py index 70031bc91..1989f0b4c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -26,9 +26,12 @@ def create_app(test_config=None): migrate.init_app(app, db) from app.models.planet import Planet + from app.models.moon import Moon from .routes.planet_routes import planets_bp app.register_blueprint(planets_bp) + from .routes.moon_routes import moons_bp + app.register_blueprint(moons_bp) return app diff --git a/app/models/moon.py b/app/models/moon.py new file mode 100644 index 000000000..1590e4586 --- /dev/null +++ b/app/models/moon.py @@ -0,0 +1,18 @@ +from app import db + +class Moon(db.Model): + + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String) + planet= db.relationship("Planet", back_populates="moon") + planet_id= db.Column(db.Integer, db.ForeignKey('planet.id')) + + @classmethod + def dict_to_model(cls, data_dict): + return cls(name = data_dict["name"]) + + def make_moon_dict(self): + return dict( + id=self.id, + name=self.name + ) \ No newline at end of file diff --git a/app/models/planet.py b/app/models/planet.py index afd2f329b..ffcafdc66 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -5,7 +5,7 @@ class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String) description = db.Column(db.String) - moons = db.Column(db.Integer) + moons = db.relationship("Moon", back_populates="planet") @classmethod def dict_to_model(cls, data_dict): diff --git a/app/routes/moon_routes.py b/app/routes/moon_routes.py new file mode 100644 index 000000000..a0701ee1a --- /dev/null +++ b/app/routes/moon_routes.py @@ -0,0 +1,22 @@ +from app import db +from app.models.planet import Planet +from app.models.moon import Moon +from flask import Blueprint, jsonify, make_response, request, abort +from .routes_helpers import validate_model + +moons_bp = Blueprint("moons", __name__, url_prefix="/moons") + + +@moons_bp.route("", methods=["POST"]) +def make_new_moon(): + request_body = request.get_json() + + new_moon = Moon(name=request_body["name"]) + + db.session.add(new_moon) + db.session.commit() + + return make_response(f"Planet {new_moon.name} successfully created", 201) + +# @moons_bp.route("", methods=["GET"]) +# def get_moon(): diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index 8ff133f1b..8a3b143a3 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -1,5 +1,6 @@ from app import db from app.models.planet import Planet +from app.models.moon import Moon from flask import Blueprint, jsonify, make_response, request, abort from .routes_helpers import validate_model @@ -67,3 +68,15 @@ def update_planet(planet_id): return make_response(f"planet {planet.name} succesfully updated",200) +@planets_bp.route("//moons", methods=["POST"]) +def create_moon(planet_id): + planet = validate_model(planet_id) + request_body = request.get_json() + + new_moon = Moon.dict_to_model(request_body,planet) + + db.session.add(new_moon) + db.session.commit() + + return make_response(f"Cat {new_moon.name} successfully created with Caretaker {planet.name}", 201) + From e28c289ba941b7f002a9e40f81ed4c7eeb96829e Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Mon, 8 May 2023 21:32:56 -0400 Subject: [PATCH 15/17] Added Nested Routes --- app/models/moon.py | 3 +- app/models/planet.py | 4 +-- app/routes/moon_routes.py | 29 +++++++++++++-- app/routes/planet_routes.py | 24 ++++++++++--- .../versions/4c464e011370_changed_models.py | 30 ++++++++++++++++ .../c22dd8feb99f_created_moon_model.py | 36 +++++++++++++++++++ ...6e0fca0d96_added_relationship_to_planet.py | 30 ++++++++++++++++ 7 files changed, 145 insertions(+), 11 deletions(-) create mode 100644 migrations/versions/4c464e011370_changed_models.py create mode 100644 migrations/versions/c22dd8feb99f_created_moon_model.py create mode 100644 migrations/versions/ed6e0fca0d96_added_relationship_to_planet.py diff --git a/app/models/moon.py b/app/models/moon.py index 1590e4586..67e6f3538 100644 --- a/app/models/moon.py +++ b/app/models/moon.py @@ -4,7 +4,7 @@ class Moon(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String) - planet= db.relationship("Planet", back_populates="moon") + planet= db.relationship("Planet", back_populates="moons") planet_id= db.Column(db.Integer, db.ForeignKey('planet.id')) @classmethod @@ -13,6 +13,5 @@ def dict_to_model(cls, data_dict): def make_moon_dict(self): return dict( - id=self.id, name=self.name ) \ No newline at end of file diff --git a/app/models/planet.py b/app/models/planet.py index ffcafdc66..7283ea2b5 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -5,7 +5,8 @@ class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String) description = db.Column(db.String) - moons = db.relationship("Moon", back_populates="planet") + moons= db.relationship("Moon", back_populates="planet") + @classmethod def dict_to_model(cls, data_dict): @@ -18,5 +19,4 @@ def make_planet_dict(self): id=self.id, name=self.name, description=self.description, - moons=self.moons ) \ No newline at end of file diff --git a/app/routes/moon_routes.py b/app/routes/moon_routes.py index a0701ee1a..d7f9bb819 100644 --- a/app/routes/moon_routes.py +++ b/app/routes/moon_routes.py @@ -16,7 +16,30 @@ def make_new_moon(): db.session.add(new_moon) db.session.commit() - return make_response(f"Planet {new_moon.name} successfully created", 201) + return make_response(f"Moon {new_moon.name} successfully created", 201) -# @moons_bp.route("", methods=["GET"]) -# def get_moon(): +@moons_bp.route("", methods=["GET"]) +def get_all_moons(): + + name_param = request.args.get("name") + + if name_param: + moons = Moon.query.filter_by(name=name_param) + else: + moons = Moon.query.all() + + moons_list=[moon.make_moon_dict()for moon in moons] + + return jsonify(moons_list), 200 + +@moons_bp.route("//planets", methods=["GET"]) +def handle_moon_from_planets(planet_id): + planet = validate_model(planet_id) + + moons = Moon.query.filter_by(planet_id) + + # moons_response = [] + # for planet in planet.moons: + # moons_response.append(planet.to_dict()) + + return jsonify(moons), 200 \ No newline at end of file diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index 8a3b143a3..2de344d07 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -70,13 +70,29 @@ def update_planet(planet_id): @planets_bp.route("//moons", methods=["POST"]) def create_moon(planet_id): - planet = validate_model(planet_id) + planet = validate_model(Planet, planet_id) request_body = request.get_json() - new_moon = Moon.dict_to_model(request_body,planet) - + new_moon = Moon( + name=request_body["name"], + planet = planet + ) db.session.add(new_moon) db.session.commit() + return make_response(jsonify(f"Moon {new_moon.name} successfully created with Planet {planet.name}", 201)) + + # new_moon_model = Moon.dict_to_model(request_body) + # db.session.add(new_moon_model) + # db.session.commit() + + # return make_response (f"Moon {new_moon_model.name} successfully created with Planet {planet.name}", 201) + +@planets_bp.route("//moons", methods=["GET"]) +def get_moons_from_planets(planet_id): + planet = validate_model(Planet, planet_id) - return make_response(f"Cat {new_moon.name} successfully created with Caretaker {planet.name}", 201) + moons_response = [] + for moon in planet.moons: + moons_response.append(moon.make_moon_dict()) + return jsonify(moons_response), 200 diff --git a/migrations/versions/4c464e011370_changed_models.py b/migrations/versions/4c464e011370_changed_models.py new file mode 100644 index 000000000..3d6bf2d46 --- /dev/null +++ b/migrations/versions/4c464e011370_changed_models.py @@ -0,0 +1,30 @@ +"""changed models + +Revision ID: 4c464e011370 +Revises: c22dd8feb99f +Create Date: 2023-05-08 20:24:40.057545 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4c464e011370' +down_revision = 'c22dd8feb99f' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('planet', sa.Column('moon_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'planet', 'moon', ['moon_id'], ['id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'planet', type_='foreignkey') + op.drop_column('planet', 'moon_id') + # ### end Alembic commands ### diff --git a/migrations/versions/c22dd8feb99f_created_moon_model.py b/migrations/versions/c22dd8feb99f_created_moon_model.py new file mode 100644 index 000000000..a62a0fed1 --- /dev/null +++ b/migrations/versions/c22dd8feb99f_created_moon_model.py @@ -0,0 +1,36 @@ +"""created Moon model + +Revision ID: c22dd8feb99f +Revises: e6280fd69a02 +Create Date: 2023-05-08 15:17:02.930584 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c22dd8feb99f' +down_revision = 'e6280fd69a02' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('moon', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('planet_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['planet_id'], ['planet.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.drop_column('planet', 'moons') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('planet', sa.Column('moons', sa.INTEGER(), autoincrement=False, nullable=True)) + op.drop_table('moon') + # ### end Alembic commands ### diff --git a/migrations/versions/ed6e0fca0d96_added_relationship_to_planet.py b/migrations/versions/ed6e0fca0d96_added_relationship_to_planet.py new file mode 100644 index 000000000..ad6f89dfe --- /dev/null +++ b/migrations/versions/ed6e0fca0d96_added_relationship_to_planet.py @@ -0,0 +1,30 @@ +"""added relationship to Planet + +Revision ID: ed6e0fca0d96 +Revises: 4c464e011370 +Create Date: 2023-05-08 20:33:44.207698 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ed6e0fca0d96' +down_revision = '4c464e011370' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint('planet_moon_id_fkey', 'planet', type_='foreignkey') + op.drop_column('planet', 'moon_id') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('planet', sa.Column('moon_id', sa.INTEGER(), autoincrement=False, nullable=True)) + op.create_foreign_key('planet_moon_id_fkey', 'planet', 'moon', ['moon_id'], ['id']) + # ### end Alembic commands ### From 3d3d8ae69c00b6d6cd70e6acf9badfc718496c76 Mon Sep 17 00:00:00 2001 From: Genesis Quinn Date: Mon, 8 May 2023 21:33:48 -0400 Subject: [PATCH 16/17] Removed commented code and other junk --- app/routes/moon_routes.py | 14 +------------- app/routes/planet_routes.py | 6 ------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/app/routes/moon_routes.py b/app/routes/moon_routes.py index d7f9bb819..a9cb1b08e 100644 --- a/app/routes/moon_routes.py +++ b/app/routes/moon_routes.py @@ -30,16 +30,4 @@ def get_all_moons(): moons_list=[moon.make_moon_dict()for moon in moons] - return jsonify(moons_list), 200 - -@moons_bp.route("//planets", methods=["GET"]) -def handle_moon_from_planets(planet_id): - planet = validate_model(planet_id) - - moons = Moon.query.filter_by(planet_id) - - # moons_response = [] - # for planet in planet.moons: - # moons_response.append(planet.to_dict()) - - return jsonify(moons), 200 \ No newline at end of file + return jsonify(moons_list), 200 \ No newline at end of file diff --git a/app/routes/planet_routes.py b/app/routes/planet_routes.py index 2de344d07..31cd50a67 100644 --- a/app/routes/planet_routes.py +++ b/app/routes/planet_routes.py @@ -81,12 +81,6 @@ def create_moon(planet_id): db.session.commit() return make_response(jsonify(f"Moon {new_moon.name} successfully created with Planet {planet.name}", 201)) - # new_moon_model = Moon.dict_to_model(request_body) - # db.session.add(new_moon_model) - # db.session.commit() - - # return make_response (f"Moon {new_moon_model.name} successfully created with Planet {planet.name}", 201) - @planets_bp.route("//moons", methods=["GET"]) def get_moons_from_planets(planet_id): planet = validate_model(Planet, planet_id) From 1ead1a55a330d41ce817572315e67870d1c3bc05 Mon Sep 17 00:00:00 2001 From: Angelica Date: Tue, 9 May 2023 13:33:11 -0500 Subject: [PATCH 17/17] changed the env --- app/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 1989f0b4c..9a110b148 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,8 +15,10 @@ def create_app(test_config=None): if not test_config: + #app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + # "SQLALCHEMY_DATABASE_URI") app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( - "SQLALCHEMY_DATABASE_URI") + "RENDER_DATABASE_URI") else: app.config["TESTING"] = True app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(