From 0d6e418047dc84e866a26dab380b12e137cba893 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Fri, 22 Apr 2022 12:59:38 -0500 Subject: [PATCH 01/26] Created Planet class --- app/routes.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..c2662a983 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,8 @@ from flask import Blueprint +class Planet: + def __init__(self, id, name, description, dist_from_sun): + self.id = id + self.name = name + self.description = description + self.dist_from_sun = dist_from_sun From d3635a2034c1f4fd1caac39ff6f598c6e63e92c4 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Fri, 22 Apr 2022 13:01:58 -0500 Subject: [PATCH 02/26] Started to create planets array --- app/routes.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/routes.py b/app/routes.py index c2662a983..66cf089bf 100644 --- a/app/routes.py +++ b/app/routes.py @@ -6,3 +6,8 @@ def __init__(self, id, name, description, dist_from_sun): self.name = name self.description = description self.dist_from_sun = dist_from_sun + +planets = [ + Planet(1, "Mercury", "rocky", 1), + Planet(2, "Venus", "gaseous", 2) +] \ No newline at end of file From 0d8bbec68a3de3d3862db1882ddb9be0a3ec2d29 Mon Sep 17 00:00:00 2001 From: Celina Date: Fri, 22 Apr 2022 13:13:53 -0700 Subject: [PATCH 03/26] Wave 1 Complete --- app/routes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 66cf089bf..3b0d781af 100644 --- a/app/routes.py +++ b/app/routes.py @@ -9,5 +9,12 @@ def __init__(self, id, name, description, dist_from_sun): planets = [ Planet(1, "Mercury", "rocky", 1), - Planet(2, "Venus", "gaseous", 2) + Planet(2, "Venus", "gaseous", 2), + Planet(3, "Earth", "water", 3), + Planet(4, "Mars", "red", 4), + Planet(5, "Jupiter", "big", 5), + Planet(6, "Saturn", "rings", 6), + Planet(7, "Uranus", "butt", 7), + Planet(8, "Neptune", "blue", 8), + Planet(9, "Pluto", "dwarf", 9) ] \ No newline at end of file From c59cbbd83120001ef9e142c77b5a46eeec6e018e Mon Sep 17 00:00:00 2001 From: shelby Date: Fri, 22 Apr 2022 14:48:12 -0700 Subject: [PATCH 04/26] added blueprint to __init__.py, added planet GET method to return planet list on routes.py --- app/__init__.py | 3 ++- app/routes.py | 25 +++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..e40af4355 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,5 +3,6 @@ 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 3b0d781af..ea33208be 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,6 @@ -from flask import Blueprint +import json +from unicodedata import name +from flask import Blueprint, jsonify class Planet: def __init__(self, id, name, description, dist_from_sun): @@ -9,12 +11,27 @@ def __init__(self, id, name, description, dist_from_sun): planets = [ Planet(1, "Mercury", "rocky", 1), - Planet(2, "Venus", "gaseous", 2), + Planet(2, "Venus", "rocky", 2), Planet(3, "Earth", "water", 3), Planet(4, "Mars", "red", 4), Planet(5, "Jupiter", "big", 5), Planet(6, "Saturn", "rings", 6), Planet(7, "Uranus", "butt", 7), - Planet(8, "Neptune", "blue", 8), + Planet(8, "Neptune", "ice", 8), Planet(9, "Pluto", "dwarf", 9) -] \ No newline at end of file +] + +planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") + +@planets_bp.route("", methods = ["GET"]) +def planet_data(): + planet_list = [] + for planet in planets: + planet_list.append({ + "id" : planet.id, + "name" : planet.name, + "description" : planet.description, + "distance from sun" : planet.dist_from_sun + } + ) + return jsonify(planet_list) \ No newline at end of file From b9e3617d4832b0fa71e505d9a0c6a5e6746d3873 Mon Sep 17 00:00:00 2001 From: Celina Date: Mon, 25 Apr 2022 12:00:29 -0700 Subject: [PATCH 05/26] created validate_planet helper function to check for valid planet id. --- app/routes.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index ea33208be..416c7a674 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ import json from unicodedata import name -from flask import Blueprint, jsonify +from flask import Blueprint, jsonify, abort, make_response + class Planet: def __init__(self, id, name, description, dist_from_sun): @@ -34,4 +35,20 @@ def planet_data(): "distance from sun" : planet.dist_from_sun } ) - return jsonify(planet_list) \ No newline at end of file + return jsonify(planet_list) + +# @planets_bp.route("<") +# def + +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message": f"planet {planet_id} is invalid"}, 400)) + + for planet in planets: + if planet.id == planet_id: + return planet + + abort(make_response({"message": f"planet {planet_id} not found"}, 404)) + From 174a4179e65cb5eaa227a551a120ef4bd0fea110 Mon Sep 17 00:00:00 2001 From: shelby Date: Mon, 25 Apr 2022 12:10:49 -0700 Subject: [PATCH 06/26] added function to_dict to Planet class --- app/routes.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 416c7a674..4a39d343c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -10,6 +10,14 @@ def __init__(self, id, name, description, dist_from_sun): self.description = description self.dist_from_sun = dist_from_sun + def to_dict(self): + return { + "id" : self.id, + "name" : self.name, + "description" : self.description, + "distance from sun" : self.dist_from_sun + } + planets = [ Planet(1, "Mercury", "rocky", 1), Planet(2, "Venus", "rocky", 2), @@ -37,8 +45,10 @@ def planet_data(): ) return jsonify(planet_list) -# @planets_bp.route("<") -# def +# @planets_bp.route("/", methods = ["GET"]) +# def get_planet_by_id(planet_id): +# planet = validate_planet(planet_id) + def validate_planet(planet_id): try: From 4c96a0d30ba75eab57fd63c4829e9fdbb2d8a0ad Mon Sep 17 00:00:00 2001 From: shelby Date: Mon, 25 Apr 2022 12:12:12 -0700 Subject: [PATCH 07/26] created route for planet_id with function get_planet_by_id --- app/routes.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4a39d343c..16af20018 100644 --- a/app/routes.py +++ b/app/routes.py @@ -45,9 +45,10 @@ def planet_data(): ) return jsonify(planet_list) -# @planets_bp.route("/", methods = ["GET"]) -# def get_planet_by_id(planet_id): -# planet = validate_planet(planet_id) +@planets_bp.route("/", methods = ["GET"]) +def get_planet_by_id(planet_id): + planet = validate_planet(planet_id) + return planet.to_dict() def validate_planet(planet_id): From aef21910fdc2d6739ea488d471f622bccc5bc6f7 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Fri, 29 Apr 2022 12:58:34 -0500 Subject: [PATCH 08/26] Set up SQLAlchemy --- app/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index e40af4355..2fb1caa99 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,8 +1,20 @@ 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 .routes import planets_bp app.register_blueprint(planets_bp) return app From e4ae7ad51affd91e2710733625aa7bc6cbf32c5d Mon Sep 17 00:00:00 2001 From: Celina Date: Fri, 29 Apr 2022 11:19:27 -0700 Subject: [PATCH 09/26] added planet model --- app/__init__.py | 2 ++ app/models/moon.py | 0 app/models/planet.py | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 app/models/moon.py create mode 100644 app/models/planet.py diff --git a/app/__init__.py b/app/__init__.py index 2fb1caa99..e587fc8b0 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,6 +15,8 @@ def create_app(test_config=None): 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/moon.py b/app/models/moon.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..4913a2205 --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,8 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + distance_from_sun = db.Column(db.Integer, nullable=False) + \ No newline at end of file From dfe40650cc45db7392e9ffc6c9eb13f899d0e54b Mon Sep 17 00:00:00 2001 From: shelby Date: Fri, 29 Apr 2022 11:47:21 -0700 Subject: [PATCH 10/26] added create planet endpoint --- app/routes.py | 70 ++++++++------ migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../1d660ff870ae_adds_planet_model.py | 34 +++++++ 6 files changed, 243 insertions(+), 27 deletions(-) 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/1d660ff870ae_adds_planet_model.py diff --git a/app/routes.py b/app/routes.py index 16af20018..c43d72019 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,37 +1,53 @@ -import json -from unicodedata import name -from flask import Blueprint, jsonify, abort, make_response +import json # maybe don't need +from unicodedata import name # maybe don't need +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, description, dist_from_sun): - self.id = id - self.name = name - self.description = description - self.dist_from_sun = dist_from_sun +# class Planet: +# # def __init__(self, id, name, description, dist_from_sun): +# # self.id = id +# # self.name = name +# # self.description = description +# # self.dist_from_sun = dist_from_sun - def to_dict(self): - return { - "id" : self.id, - "name" : self.name, - "description" : self.description, - "distance from sun" : self.dist_from_sun - } +# def to_dict(self): +# return { +# "id" : self.id, +# "name" : self.name, +# "description" : self.description, +# "distance from sun" : self.dist_from_sun +# } -planets = [ - Planet(1, "Mercury", "rocky", 1), - Planet(2, "Venus", "rocky", 2), - Planet(3, "Earth", "water", 3), - Planet(4, "Mars", "red", 4), - Planet(5, "Jupiter", "big", 5), - Planet(6, "Saturn", "rings", 6), - Planet(7, "Uranus", "butt", 7), - Planet(8, "Neptune", "ice", 8), - Planet(9, "Pluto", "dwarf", 9) -] +# planets = [ +# Planet(1, "Mercury", "rocky", 1), +# Planet(2, "Venus", "rocky", 2), +# Planet(3, "Earth", "water", 3), +# Planet(4, "Mars", "red", 4), +# Planet(5, "Jupiter", "big", 5), +# Planet(6, "Saturn", "rings", 6), +# Planet(7, "Uranus", "butt", 7), +# Planet(8, "Neptune", "ice", 8), +# Planet(9, "Pluto", "dwarf", 9) +# ] planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") +@planets_bp.route("", methods = ["POST"]) +def handle_planets(): + request_body = request.get_json() + new_planet = Planet( + name = request_body["name"], + description = request_body["description"], + distance_from_sun = request_body["distance from sun"] + ) + + 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 planet_data(): planet_list = [] 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/1d660ff870ae_adds_planet_model.py b/migrations/versions/1d660ff870ae_adds_planet_model.py new file mode 100644 index 000000000..1695daf0b --- /dev/null +++ b/migrations/versions/1d660ff870ae_adds_planet_model.py @@ -0,0 +1,34 @@ +"""adds Planet model + +Revision ID: 1d660ff870ae +Revises: +Create Date: 2022-04-29 11:27:07.136352 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1d660ff870ae' +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=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('distance_from_sun', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 7f2ed549085d9dcd1f3eb85e196fc7b3b2f7a78f Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Fri, 29 Apr 2022 14:10:15 -0500 Subject: [PATCH 11/26] Added read all planets GET endpoint --- app/routes.py | 57 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/app/routes.py b/app/routes.py index c43d72019..b33b9f5e6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -50,32 +50,45 @@ def handle_planets(): @planets_bp.route("", methods = ["GET"]) def planet_data(): - planet_list = [] + planets = Planet.query.all() + planets_response = [] + for planet in planets: - planet_list.append({ - "id" : planet.id, - "name" : planet.name, - "description" : planet.description, - "distance from sun" : planet.dist_from_sun - } - ) - return jsonify(planet_list) + planets_response.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "distance from sun": planet.distance_from_sun + }) + + return jsonify(planets_response) -@planets_bp.route("/", methods = ["GET"]) -def get_planet_by_id(planet_id): - planet = validate_planet(planet_id) - return planet.to_dict() + # planet_list = [] + # for planet in planets: + # planet_list.append({ + # "id" : planet.id, + # "name" : planet.name, + # "description" : planet.description, + # "distance from sun" : planet.dist_from_sun + # } + # ) + # return jsonify(planet_list) +# @planets_bp.route("/", methods = ["GET"]) +# def get_planet_by_id(planet_id): +# planet = validate_planet(planet_id) +# return planet.to_dict() -def validate_planet(planet_id): - try: - planet_id = int(planet_id) - except: - abort(make_response({"message": f"planet {planet_id} is invalid"}, 400)) - for planet in planets: - if planet.id == planet_id: - return planet +# def validate_planet(planet_id): +# try: +# planet_id = int(planet_id) +# except: +# abort(make_response({"message": f"planet {planet_id} is invalid"}, 400)) + +# for planet in planets: +# if planet.id == planet_id: +# return planet - abort(make_response({"message": f"planet {planet_id} not found"}, 404)) +# abort(make_response({"message": f"planet {planet_id} not found"}, 404)) From 0b3a9c74f537fd2eae162d78c13caca7137c02fc Mon Sep 17 00:00:00 2001 From: shelby Date: Tue, 3 May 2022 10:55:05 -0700 Subject: [PATCH 12/26] updated validate_planet function --- app/routes.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/app/routes.py b/app/routes.py index b33b9f5e6..6fb52d442 100644 --- a/app/routes.py +++ b/app/routes.py @@ -63,6 +63,12 @@ def planet_data(): return jsonify(planets_response) +@planets_bp.route("/", methods = ["GET"]) +def get_planet_by_id(planet_id): + + + pass + # planet_list = [] # for planet in planets: # planet_list.append({ @@ -80,15 +86,20 @@ def planet_data(): # return planet.to_dict() -# def validate_planet(planet_id): -# try: -# planet_id = int(planet_id) -# except: -# abort(make_response({"message": f"planet {planet_id} is invalid"}, 400)) +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message": f"planet {planet_id} is invalid"}, 400)) -# for planet in planets: -# if planet.id == planet_id: -# return planet + 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)) From c58002c269dea46ba8ed83963b26c93bf8c4c10d Mon Sep 17 00:00:00 2001 From: shelby Date: Tue, 3 May 2022 10:59:49 -0700 Subject: [PATCH 13/26] added get_planet_by_id function with GET method --- app/routes.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6fb52d442..f4e3d3642 100644 --- a/app/routes.py +++ b/app/routes.py @@ -65,10 +65,14 @@ def planet_data(): @planets_bp.route("/", methods = ["GET"]) def get_planet_by_id(planet_id): + planet = validate_planet(planet_id) + return { + "name": planet.name, + "description": planet.description, + "distance from sun": planet.distance_from_sun + } - pass - # planet_list = [] # for planet in planets: # planet_list.append({ From 43e4d2dfe87e2c59be506cee8382e205a4fe386a Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Tue, 3 May 2022 13:12:01 -0500 Subject: [PATCH 14/26] Created update_planet endpoint --- app/routes.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/routes.py b/app/routes.py index f4e3d3642..97905b54c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -72,6 +72,20 @@ def get_planet_by_id(planet_id): "distance from sun": planet.distance_from_sun } +@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.description = request_body["description"] + planet.distance_from_sun = request_body["distance from sun"] + + db.session.commit() + + return make_response(f"Planet {planet.name} successfully updated.") + # planet_list = [] # for planet in planets: From 8d6d02d4b3a64ff2fc80c56dd866d51aa5de2cc4 Mon Sep 17 00:00:00 2001 From: Celina Date: Tue, 3 May 2022 13:38:59 -0500 Subject: [PATCH 15/26] created DELETE endpoint --- app/routes.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/routes.py b/app/routes.py index 97905b54c..4b26716bc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -86,6 +86,14 @@ def update_planet(planet_id): return make_response(f"Planet {planet.name} successfully updated.") +@planets_bp.route("/", methods=["DELETE"]) +def delete_planet_by_id(planet_id): + planet = validate_planet(planet_id) + + db.session.delete(planet) + db.session.commit() + + return make_response(f"Planet {planet.name} successfully deleted.") # planet_list = [] # for planet in planets: From 9c957977ccc75118e6df288860a62bc34b41d449 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Wed, 4 May 2022 12:57:37 -0500 Subject: [PATCH 16/26] Removed old code and created scratch.py file --- app/routes.py | 53 --------------------------------------------------- scratch.py | 0 2 files changed, 53 deletions(-) create mode 100644 scratch.py diff --git a/app/routes.py b/app/routes.py index 4b26716bc..76a826aef 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,37 +1,7 @@ -import json # maybe don't need -from unicodedata import name # maybe don't need 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, description, dist_from_sun): -# # self.id = id -# # self.name = name -# # self.description = description -# # self.dist_from_sun = dist_from_sun - -# def to_dict(self): -# return { -# "id" : self.id, -# "name" : self.name, -# "description" : self.description, -# "distance from sun" : self.dist_from_sun -# } - -# planets = [ -# Planet(1, "Mercury", "rocky", 1), -# Planet(2, "Venus", "rocky", 2), -# Planet(3, "Earth", "water", 3), -# Planet(4, "Mars", "red", 4), -# Planet(5, "Jupiter", "big", 5), -# Planet(6, "Saturn", "rings", 6), -# Planet(7, "Uranus", "butt", 7), -# Planet(8, "Neptune", "ice", 8), -# Planet(9, "Pluto", "dwarf", 9) -# ] - planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") @planets_bp.route("", methods = ["POST"]) @@ -95,23 +65,6 @@ def delete_planet_by_id(planet_id): return make_response(f"Planet {planet.name} successfully deleted.") - # planet_list = [] - # for planet in planets: - # planet_list.append({ - # "id" : planet.id, - # "name" : planet.name, - # "description" : planet.description, - # "distance from sun" : planet.dist_from_sun - # } - # ) - # return jsonify(planet_list) - -# @planets_bp.route("/", methods = ["GET"]) -# def get_planet_by_id(planet_id): -# planet = validate_planet(planet_id) -# return planet.to_dict() - - def validate_planet(planet_id): try: planet_id = int(planet_id) @@ -123,9 +76,3 @@ def validate_planet(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 - - diff --git a/scratch.py b/scratch.py new file mode 100644 index 000000000..e69de29bb From f3c2a7450a2b34ead5b66cc43391758fa84f66d7 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Wed, 4 May 2022 13:05:43 -0500 Subject: [PATCH 17/26] Created to_dictionary Class method and refactored endpoints to use to_dictionary --- app/models/planet.py | 9 ++++++++- app/routes.py | 13 ++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 4913a2205..8ef5d03e0 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -5,4 +5,11 @@ class Planet(db.Model): name = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) distance_from_sun = db.Column(db.Integer, nullable=False) - \ No newline at end of file + + def to_dictionary(self): + return dict( + id=self.id, + name=self.name, + description=self.description, + distance_from_sun=self.distance_from_sun + ) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 76a826aef..b84d79eb3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -24,23 +24,14 @@ def planet_data(): planets_response = [] for planet in planets: - planets_response.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "distance from sun": planet.distance_from_sun - }) + planets_response.append(planet.to_dictionary()) return jsonify(planets_response) @planets_bp.route("/", methods = ["GET"]) def get_planet_by_id(planet_id): planet = validate_planet(planet_id) - return { - "name": planet.name, - "description": planet.description, - "distance from sun": planet.distance_from_sun - } + return jsonify(planet.to_dictionary()) @planets_bp.route("/", methods=["PUT"]) def update_planet(planet_id): From bd3ba7990b1bcde9c89f2b1f834b72a5f7004f3f Mon Sep 17 00:00:00 2001 From: Celina Date: Thu, 5 May 2022 13:09:08 -0500 Subject: [PATCH 18/26] refactored create_app method --- app/__init__.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index e587fc8b0..ad42fe8e7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,16 +1,23 @@ 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_development' + if not test_config: + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + else: + app.config["TESTING"] = True + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_test' db.init_app(app) migrate.init_app(app, db) From 7473c590882c5bf105db745fcc4f57f132a09fc6 Mon Sep 17 00:00:00 2001 From: shelby Date: Thu, 5 May 2022 11:22:09 -0700 Subject: [PATCH 19/26] created tests folder and made pytest fixtures --- tests/__init__.py | 0 tests/conftest.py | 26 ++++++++++++++++++++++++++ tests/test_routes.py | 0 3 files changed, 26 insertions(+) create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_routes.py 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..5291ddc42 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,26 @@ +import pytest +from app import create_app +from app import db +from flask.signals import request_finished + + +@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() + \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..e69de29bb From 72fd43a1039ab4891e21368bed349d9065a600b2 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Thu, 5 May 2022 13:26:22 -0500 Subject: [PATCH 20/26] Updated scratch file --- scratch.py | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/scratch.py b/scratch.py index e69de29bb..6abd587d9 100644 --- a/scratch.py +++ b/scratch.py @@ -0,0 +1,71 @@ +########################### +########################### +########planet.py########## +########################### +#########__init__.py####### +########################### +#########routes.py######### +########################### +# import json # maybe don't need +# from unicodedata import name # maybe don't need + +# planets = [ +# Planet(1, "Mercury", "rocky", 1), +# Planet(2, "Venus", "rocky", 2), +# Planet(3, "Earth", "water", 3), +# Planet(4, "Mars", "red", 4), +# Planet(5, "Jupiter", "big", 5), +# Planet(6, "Saturn", "rings", 6), +# Planet(7, "Uranus", "butt", 7), +# Planet(8, "Neptune", "ice", 8), +# Planet(9, "Pluto", "dwarf", 9) +# ] + +# class Planet: +# # def __init__(self, id, name, description, dist_from_sun): +# # self.id = id +# # self.name = name +# # self.description = description +# # self.dist_from_sun = dist_from_sun + +# def to_dict(self): +# return { +# "id" : self.id, +# "name" : self.name, +# "description" : self.description, +# "distance from sun" : self.dist_from_sun +# } + +# from delete_planet_by_id endpoint +# planet_list = [] + # for planet in planets: + # planet_list.append({ + # "id" : planet.id, + # "name" : planet.name, + # "description" : planet.description, + # "distance from sun" : planet.dist_from_sun + # } + # ) + # return jsonify(planet_list) + +# @planets_bp.route("/", methods = ["GET"]) +# def get_planet_by_id(planet_id): +# planet = validate_planet(planet_id) +# return planet.to_dict() + +# from validate_planet() helper function + # for planet in planets: + # if planet.id == planet_id: + # return planet + + + + + + + + + + + +########################### From 0509329b6135f9316ded9a3b9d785be61b78ebca Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Thu, 5 May 2022 13:33:59 -0500 Subject: [PATCH 21/26] Created test_get_all_planets_with_no_records --- tests/test_routes.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/test_routes.py b/tests/test_routes.py index e69de29bb..1db1dcc4b 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -0,0 +1,10 @@ + + +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 == [] \ No newline at end of file From 2df8138d155e8b37eb9c55b1709172a8edb86214 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Thu, 5 May 2022 14:06:51 -0500 Subject: [PATCH 22/26] Created two_saved_planets for test configurations --- tests/conftest.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 5291ddc42..2c5539125 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,6 +2,7 @@ from app import create_app from app import db from flask.signals import request_finished +from app.models.planet import Planet @pytest.fixture @@ -23,4 +24,12 @@ def expire_session(sender, response, **extra): @pytest.fixture def client(app): return app.test_client() - \ No newline at end of file + +@pytest.fixture +def two_saved_planets(app): + # arrange + neptune = Planet(id=1, name="Neptune", description="ice", distance_from_sun=9) + earth = Planet(id=2, name="Earth", description="water", distance_from_sun=3) + + db.session.add_all([neptune, earth]) + db.session.commit() \ No newline at end of file From de695d48bdc0a1aff6909d84838b490ea9777db6 Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Thu, 5 May 2022 14:07:16 -0500 Subject: [PATCH 23/26] Created and passed test_get_one_planet --- tests/test_routes.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index 1db1dcc4b..fbce74194 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -7,4 +7,18 @@ def test_get_all_planets_with_no_records(client): # assert assert response.status_code == 200 - assert response_body == [] \ No newline at end of file + assert response_body == [] + +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": "Neptune", + "description": "ice", + "distance_from_sun": 9 + } \ No newline at end of file From 71ae69dd90f6ec4ab5f17796df1c1ee9370188d7 Mon Sep 17 00:00:00 2001 From: shelby Date: Fri, 6 May 2022 10:31:49 -0700 Subject: [PATCH 24/26] Made test for planet id not found, 404 --- tests/test_routes.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index fbce74194..22f8776af 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -21,4 +21,14 @@ def test_get_one_planet(client, two_saved_planets): "name": "Neptune", "description": "ice", "distance_from_sun": 9 - } \ No newline at end of file + } + + +def test_get_one_planet_with_no_records(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"} \ No newline at end of file From 6ac2887345d87041c40c426961cfa5df75571fa9 Mon Sep 17 00:00:00 2001 From: Celina Date: Fri, 6 May 2022 12:46:48 -0500 Subject: [PATCH 25/26] created get all planets test --- tests/test_routes.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index 22f8776af..b176f0072 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -31,4 +31,25 @@ def test_get_one_planet_with_no_records(client): # assert assert response.status_code == 404 - assert response_body == {"message": "planet 1 not found"} \ No newline at end of file + assert response_body == {"message": "planet 1 not found"} + + +def test_get_all_planets_return_array(client, two_saved_planets): + # act + response = client.get("/planets") + response_body = response.get_json() + + # assert + assert response.status_code == 200 + assert response_body == [{ + "id": 1, + "name": "Neptune", + "description": "ice", + "distance_from_sun": 9 + }, + {"id": 2, + "name": "Earth", + "description": "water", + "distance_from_sun": 3 + } + ] \ No newline at end of file From 48837ce774c267d082423e135d5645ba8b737f4b Mon Sep 17 00:00:00 2001 From: Tiffini Hyatt Date: Fri, 6 May 2022 13:09:09 -0500 Subject: [PATCH 26/26] Create test_post_planet_returns_201 and refactored routes to include jsonify --- app/routes.py | 6 +++--- tests/test_routes.py | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/routes.py b/app/routes.py index b84d79eb3..97ac224f1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,7 +16,7 @@ def handle_planets(): 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 planet_data(): @@ -45,7 +45,7 @@ def update_planet(planet_id): db.session.commit() - return make_response(f"Planet {planet.name} successfully updated.") + return make_response(jsonify(f"Planet {planet.name} successfully updated.")) @planets_bp.route("/", methods=["DELETE"]) def delete_planet_by_id(planet_id): @@ -54,7 +54,7 @@ def delete_planet_by_id(planet_id): db.session.delete(planet) db.session.commit() - return make_response(f"Planet {planet.name} successfully deleted.") + return make_response(jsonify(f"Planet {planet.name} successfully deleted.")) def validate_planet(planet_id): try: diff --git a/tests/test_routes.py b/tests/test_routes.py index b176f0072..f79ff17dc 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,5 +1,3 @@ - - def test_get_all_planets_with_no_records(client): # act response = client.get("/planets") @@ -52,4 +50,17 @@ def test_get_all_planets_return_array(client, two_saved_planets): "description": "water", "distance_from_sun": 3 } - ] \ No newline at end of file + ] + +def test_post_planet_returns_201(client): + # act + response = client.post("/planets", json={ + "name": "Mercury", + "description": "fast", + "distance from sun": 1 + }) + response_body = response.get_json() + + # assert + assert response.status_code == 201 + assert response_body == "planet Mercury successfully created!" \ No newline at end of file