From 86ebc7b724cb156b68382d51564fae7692744fa0 Mon Sep 17 00:00:00 2001 From: Hope Olaide Date: Fri, 22 Apr 2022 14:20:56 -0400 Subject: [PATCH 01/10] Wave 1 complete. --- app/__init__.py | 2 ++ app/routes.py | 31 ++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..6596942bd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,5 +3,7 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import planets_bp + app.register_blueprint(planets_bp) return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..0d0ad14b8 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,31 @@ -from flask import Blueprint +from flask import Blueprint, jsonify +class Planet: + def __init__(self, id, name, moons, description): + self.id = id + self.name = name + self.moons = moons + self.description = description + + +planets = [ + Planet(1, "Mercury", None, "The first planet."), + Planet(2, "Venus", None, "The second planet."), + Planet(3, "Earth", 1, "The third planet.") + +] + +planets_bp = Blueprint("planets", __name__, url_prefix = "/planets") + + +@planets_bp.route("", methods=["GET"]) +def handle_planets(): + planets_response = [] + for planet in planets: + planets_response.append({ + "id": planet.id, + "name": planet.name, + "moons": planet.moons, + "description": planet.description + }) + return jsonify(planets_response) \ No newline at end of file From be815fae8e7594e3b992379b0ea4f91bbc605ff9 Mon Sep 17 00:00:00 2001 From: Natalia Date: Tue, 26 Apr 2022 16:41:28 -0400 Subject: [PATCH 02/10] completed wave 1 --- app/routes.py | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0d0ad14b8..8703d2ddc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint, jsonify +from flask import Blueprint, jsonify, abort, make_response class Planet: def __init__(self, id, name, moons, description): @@ -9,8 +9,8 @@ def __init__(self, id, name, moons, description): planets = [ - Planet(1, "Mercury", None, "The first planet."), - Planet(2, "Venus", None, "The second planet."), + Planet(1, "Mercury", 0, "The first planet."), + Planet(2, "Venus", 0, "The second planet."), Planet(3, "Earth", 1, "The third planet.") ] @@ -28,4 +28,27 @@ def handle_planets(): "moons": planet.moons, "description": planet.description }) - return jsonify(planets_response) \ No newline at end of file + return jsonify(planets_response) + +@planets_bp.route("", methods=["GET"]) +def handle_planet(planet_id): + planet = validate_planet(planet_id) + + return { + "id": planet.id, + "name": planet.name, + "moons": planet.moons, + "description": planet.description + } + +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + + for planet in planets: + if planet.id == planet_id: + return planet + + abort(make_response({"message": f"planet {planet_id} not found"}, 404)) \ No newline at end of file From 5e3d4547c62b6cc982b86ad5e83149e4ddc03222 Mon Sep 17 00:00:00 2001 From: Hope Olaide Date: Tue, 3 May 2022 14:01:36 -0400 Subject: [PATCH 03/10] "Planet model and database migration set up." --- app/__init__.py | 13 +++++++++++++ requirements.txt | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 6596942bd..3cf3b1d83 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +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__) + + 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 app.models.planet import Planet + from .routes import planets_bp app.register_blueprint(planets_bp) diff --git a/requirements.txt b/requirements.txt index a506b4d12..a9fd28712 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,4 +24,4 @@ six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 urllib3==1.26.4 -Werkzeug==1.0.1 +Werkzeug==1.0.1 \ No newline at end of file From da1da612359f4104c46e39b3202ef6a2a95b0b01 Mon Sep 17 00:00:00 2001 From: Hope Olaide Date: Tue, 3 May 2022 14:05:04 -0400 Subject: [PATCH 04/10] Planet Model and migration. --- 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 +++++ .../4687c299998d_adds_planet_model.py | 34 +++++++ 7 files changed, 207 insertions(+) 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 create mode 100644 migrations/versions/4687c299998d_adds_planet_model.py 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..b5b896335 --- /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) + moons = db.Column(db.Integer) + description = 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"} diff --git a/migrations/versions/4687c299998d_adds_planet_model.py b/migrations/versions/4687c299998d_adds_planet_model.py new file mode 100644 index 000000000..7237486f2 --- /dev/null +++ b/migrations/versions/4687c299998d_adds_planet_model.py @@ -0,0 +1,34 @@ +"""adds Planet model + +Revision ID: 4687c299998d +Revises: +Create Date: 2022-05-03 13:59:37.864415 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4687c299998d' +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('moons', sa.Integer(), nullable=True), + sa.Column('description', 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 0baf4b3a738ac8590121f4967ff083ff7c7cd26e Mon Sep 17 00:00:00 2001 From: Hope Olaide Date: Tue, 3 May 2022 20:15:18 -0400 Subject: [PATCH 05/10] "Wave 3 complete. Db connected. Enpoints created." --- app/routes.py | 83 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/app/routes.py b/app/routes.py index 8703d2ddc..08ce20f86 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,26 +1,41 @@ -from flask import Blueprint, jsonify, abort, make_response +from flask import Blueprint, jsonify, abort, make_response, request +from app import db +from app.models.planet import Planet +# class Planet: +# def __init__(self, id, name, moons, description): +# self.id = id +# self.name = name +# self.moons = moons +# self.description = description -class Planet: - def __init__(self, id, name, moons, description): - self.id = id - self.name = name - self.moons = moons - self.description = description +# planets = [ +# Planet(1, "Mercury", 0, "The first planet."), +# Planet(2, "Venus", 0, "The second planet."), +# Planet(3, "Earth", 1, "The third planet.") -planets = [ - Planet(1, "Mercury", 0, "The first planet."), - Planet(2, "Venus", 0, "The second planet."), - Planet(3, "Earth", 1, "The third planet.") - -] +# ] planets_bp = Blueprint("planets", __name__, url_prefix = "/planets") +@planets_bp.route("", methods=["POST"]) +def create_planet(): + request_body = request.get_json() + new_planet = Planet( + id=request_body["id"], + name=request_body["name"], + moons=request_body["moons"], + description=request_body["description"]) + + 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 handle_planets(): +def read_all_planets(): planets_response = [] + planets = Planet.query.all() for planet in planets: planets_response.append({ "id": planet.id, @@ -29,26 +44,26 @@ def handle_planets(): "description": planet.description }) return jsonify(planets_response) + +# @planets_bp.route("", methods=["GET"]) +# def handle_planet(planet_id): +# planet = validate_planet(planet_id) + +# return { +# "id": planet.id, +# "name": planet.name, +# "moons": planet.moons, +# "description": planet.description +# } -@planets_bp.route("", methods=["GET"]) -def handle_planet(planet_id): - planet = validate_planet(planet_id) - - return { - "id": planet.id, - "name": planet.name, - "moons": planet.moons, - "description": planet.description - } - -def validate_planet(planet_id): - try: - planet_id = int(planet_id) - except: - abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) +# def validate_planet(planet_id): +# try: +# planet_id = int(planet_id) +# except: +# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) - for planet in planets: - if planet.id == planet_id: - return planet +# for planet in planets: +# if planet.id == planet_id: +# return planet - abort(make_response({"message": f"planet {planet_id} not found"}, 404)) \ No newline at end of file +# abort(make_response({"message": f"planet {planet_id} not found"}, 404)) \ No newline at end of file From 12425495e2439131ed04ad33c00a614b112784cf Mon Sep 17 00:00:00 2001 From: Natalia Date: Tue, 3 May 2022 21:10:23 -0400 Subject: [PATCH 06/10] Completed wave 4: read, update, delete one planet --- app/routes.py | 70 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/app/routes.py b/app/routes.py index 08ce20f86..012c86dcf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,3 +1,4 @@ +import re from flask import Blueprint, jsonify, abort, make_response, request from app import db from app.models.planet import Planet @@ -16,6 +17,7 @@ # ] + planets_bp = Blueprint("planets", __name__, url_prefix = "/planets") @planets_bp.route("", methods=["POST"]) @@ -45,25 +47,53 @@ def read_all_planets(): }) return jsonify(planets_response) -# @planets_bp.route("", methods=["GET"]) -# def handle_planet(planet_id): -# planet = validate_planet(planet_id) - -# return { -# "id": planet.id, -# "name": planet.name, -# "moons": planet.moons, -# "description": planet.description -# } - -# def validate_planet(planet_id): -# try: -# planet_id = int(planet_id) -# except: -# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) +@planets_bp.route("", methods=["GET"]) +def handle_planet(planet_id): + planet = validate_planet(planet_id) + + return { + "id": planet.id, + "name": planet.name, + "moons": planet.moons, + "description": planet.description + } + +@planets_bp.route("/", methods=['PUT']) +def update_planet(planet_id): + planet = validate_planet(planet_id) + + request_body = request.get_json() + + planet.name = request_body["name"] + planet.moons = request_body["moons"] + planet.description = request_body["description"] + + db.session.commit() + + return make_response(f"Planet #{planet.id} successfully updated") + +@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"Book #{planet.id} successfully deleted") + +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + + planet = Planet.query.get(planet_id) + + if not planet: + abort(make_response({"message": f"planet {planet_id} not found"}, 404)) + + return planet -# for planet in planets: -# if planet.id == planet_id: -# return planet -# abort(make_response({"message": f"planet {planet_id} not found"}, 404)) \ No newline at end of file + + \ No newline at end of file From eb0fdf23a7ee5dca9d311e32c7d9baa627de566a Mon Sep 17 00:00:00 2001 From: Hope Olaide Date: Wed, 4 May 2022 13:51:21 -0400 Subject: [PATCH 07/10] Correction to imports in routes.py --- app/routes.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 012c86dcf..f2348a852 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,3 @@ -import re from flask import Blueprint, jsonify, abort, make_response, request from app import db from app.models.planet import Planet @@ -17,7 +16,6 @@ # ] - planets_bp = Blueprint("planets", __name__, url_prefix = "/planets") @planets_bp.route("", methods=["POST"]) From b7982d3e74a90f0b2af117af0ebeb4e49f3b9c16 Mon Sep 17 00:00:00 2001 From: Natalia Date: Wed, 4 May 2022 13:59:06 -0400 Subject: [PATCH 08/10] added query params in GET route --- app/routes.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index f2348a852..40ae35e57 100644 --- a/app/routes.py +++ b/app/routes.py @@ -34,8 +34,13 @@ def create_planet(): @planets_bp.route("", methods=["GET"]) def read_all_planets(): + name_query = request.args.get("name") + if name_query: + planets = Planet.query.filter_by(name=name_query) + else: + planets = Planet.query.all() + planets_response = [] - planets = Planet.query.all() for planet in planets: planets_response.append({ "id": planet.id, From e2fbfa79612d74acdf37365a54e7d5966e77046c Mon Sep 17 00:00:00 2001 From: Hope Olaide Date: Fri, 6 May 2022 12:25:54 -0400 Subject: [PATCH 09/10] "Wave 6 complete." --- app/__init__.py | 18 +++++++++++++-- app/routes.py | 5 ++--- tests/__init__.py | 0 tests/conftest.py | 53 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_routes.py | 48 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+), 5 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 3cf3b1d83..179762fb6 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,15 +1,29 @@ 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'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + if test_config is None: + 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_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI") + + + + + db.init_app(app) migrate.init_app(app, db) diff --git a/app/routes.py b/app/routes.py index 40ae35e57..97d76d9e3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -22,7 +22,7 @@ def create_planet(): request_body = request.get_json() new_planet = Planet( - id=request_body["id"], + # id=request_body["id"], name=request_body["name"], moons=request_body["moons"], description=request_body["description"]) @@ -30,7 +30,7 @@ def create_planet(): db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.name} successfully created", 201) + return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) @planets_bp.route("", methods=["GET"]) def read_all_planets(): @@ -98,5 +98,4 @@ def validate_planet(planet_id): return planet - \ No newline at end of file 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..0b1196394 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,53 @@ +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 two_saved_planets(app): + # Arrange + mercury = Planet( + name="Mercury", + moons=0, + description="The first planet.") + mars = Planet( + name="Mars", + moons =2, + description="The fourth planet.") + + db.session.add_all([mercury, mars]) + # Alternatively, we could do + # db.session.add(mercury) + # db.session.add(mars) + db.session.commit() + + +@pytest.fixture +def client(app): + return app.test_client() + +@pytest.fixture +def one_item(empty_list): + empty_list.append("item") + return empty_list + +def test_len_of_unary_list(one_item): + assert isinstance(one_item, list) + assert len(one_item) == 1 + assert one_item[0] == "item" \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..4bf248672 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,48 @@ +def test_get_all_books_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_one_planet(client): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 404 + assert response_body == response.get_json() + +def test_get_empty_database(client): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 404 + assert response_body == {'message': 'planet 1 not found'} + +def test_read_all_planets(client): + # Act + response = client.get("/planets") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == response.get_json() + +def test_create_new_planet(client): + # Act + response = client.post("/planets", json={ + "name": "Jupiter", + "moons": 53, + "description": "This is the 6th planet." + }) + response_body = response.get_json() + + # Assert + assert response.status_code == 201 + assert response_body == "Planet Jupiter successfully created" \ No newline at end of file From f53b5f0fcabb570efef9e4661ff148c6315b3d9e Mon Sep 17 00:00:00 2001 From: Hope Olaide Date: Fri, 6 May 2022 14:47:59 -0400 Subject: [PATCH 10/10] "Attempted refactoriny. Will revisit to complete." --- app/models/planet.py | 18 +++++++++++++++++- app/routes.py | 39 ++++++++++++++------------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index b5b896335..a8b150d7f 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -4,4 +4,20 @@ class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String) moons = db.Column(db.Integer) - description = db.Column(db.String) \ No newline at end of file + description = db.Column(db.String) + + def to_dict(self): + return dict( + id=self.id, + name=self.name, + moons=self.moons, + description=self.description + ) + +@classmethod +def from_dict(cls, data_dict): + return cls( + name=data_dict["name"], + moons=data_dict["moons"], + description=data_dict["description"]) + \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 97d76d9e3..36fb1215c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,40 +1,32 @@ from flask import Blueprint, jsonify, abort, make_response, request from app import db from app.models.planet import Planet -# class Planet: -# def __init__(self, id, name, moons, description): -# self.id = id -# self.name = name -# self.moons = moons -# self.description = description - - -# planets = [ -# Planet(1, "Mercury", 0, "The first planet."), -# Planet(2, "Venus", 0, "The second planet."), -# Planet(3, "Earth", 1, "The third planet.") - -# ] planets_bp = Blueprint("planets", __name__, url_prefix = "/planets") +def error_message(message, status_code): + abort(make_response(jsonify(dict(details=message)), status_code)) + @planets_bp.route("", methods=["POST"]) def create_planet(): request_body = request.get_json() - new_planet = Planet( - # id=request_body["id"], - name=request_body["name"], - moons=request_body["moons"], - description=request_body["description"]) + + try: + planet = Planet.from_dict(request_body) - db.session.add(new_planet) + except KeyError as err: + abort(make_response(jsonify(details=f"Missing key: {err} invalid"), 400)) + + db.session.add(planet) db.session.commit() - return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) + # return make_response(jsonify(f"Planet {planet.name} successfully created"), 201) + return jsonify(planet.to_dict()), 201 @planets_bp.route("", methods=["GET"]) def read_all_planets(): name_query = request.args.get("name") + if name_query: planets = Planet.query.filter_by(name=name_query) else: @@ -95,7 +87,4 @@ def validate_planet(planet_id): if not planet: abort(make_response({"message": f"planet {planet_id} not found"}, 404)) - return planet - - - \ No newline at end of file + return planet \ No newline at end of file