From 3d0046af5b246d54ea7ee783523e48dcca655f17 Mon Sep 17 00:00:00 2001 From: Maria Silva Date: Mon, 24 Oct 2022 14:50:02 -0500 Subject: [PATCH 01/17] wave 1 and 2 completed --- app/__init__.py | 8 +++++-- app/routes.py | 2 -- app/routes/__init__.py | 0 app/routes/routes.py | 54 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 4 deletions(-) delete mode 100644 app/routes.py create mode 100644 app/routes/__init__.py create mode 100644 app/routes/routes.py diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..4896830b7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,7 +1,11 @@ from flask import Flask - -def create_app(test_config=None): +def create_app(): + # __name__ stores the name of the module we're in app = Flask(__name__) + from .routes.routes import bp + app.register_blueprint(bp) + return app + diff --git a/app/routes.py b/app/routes.py deleted file mode 100644 index 8e9dfe684..000000000 --- a/app/routes.py +++ /dev/null @@ -1,2 +0,0 @@ -from flask import Blueprint - diff --git a/app/routes/__init__.py b/app/routes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/routes/routes.py b/app/routes/routes.py new file mode 100644 index 000000000..f01b43633 --- /dev/null +++ b/app/routes/routes.py @@ -0,0 +1,54 @@ +from flask import Blueprint, jsonify, abort, make_response + +#created Planet class +class Planet: + def __init__(self, id, name, description, moons): + self.id = id + self.name = name + self.description = description + self.moons = moons + + + #method in class planet.to_planet + def to_planet_dict(self): + return dict( + id=self.id, + name=self.name, + description=self.description, + moons=self.moons + ) +#created planet instances +planets= [ + Planet(1, "fi", "red planet", 10), + Planet(2, "fie", "blue planet", 9), + Planet(3, "foo", "yellow planet", 8) +] +bp = Blueprint("planets", __name__, url_prefix="/planets") +#call method .to planets, return jsonified result from dictionary +@bp.route("", methods=["GET"]) +def handle_planets(): + results_list = [] + for planet in planets: + results_list.append(planet.to_planet_dict()) + return jsonify(results_list) + +#validate input for request +def validate_planet(planet_id): + #if string cannot cast to integer, return "bad request" + try: + planet_id= int(planet_id) + except: + abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + + #if planet.id not found, return 404 + for planet in planets: + if planet.id == planet_id: + return planet + + abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + +#create endpoint blueprint +@bp.route("/", methods=["GET"]) +def handle_planet(id): + planet = validate_planet(id) + return jsonify(planet.to_planet_dict()) \ No newline at end of file From 60009aaf3afe777b3d69db259333187e95575009 Mon Sep 17 00:00:00 2001 From: n2020h Date: Fri, 28 Oct 2022 16:01:49 -0700 Subject: [PATCH 02/17] passed wave 3 --- app/__init__.py | 21 +++++-- app/routes/routes.py | 143 +++++++++++++++++++++++++++---------------- 2 files changed, 106 insertions(+), 58 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4896830b7..8167bee94 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,11 +1,24 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate + +db = SQLAlchemy() +migrate = Migrate() def create_app(): - # __name__ stores the name of the module we're in - app = Flask(__name__) + app = Flask(__name__) # __name__ stores the name of the module we're in + + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + + # Import models here + from app.models.planet import Planet + + db.init_app(app) + migrate.init_app(app,db) - from .routes.routes import bp - app.register_blueprint(bp) + from app.routes.routes import planets_bp + app.register_blueprint(planets_bp) return app diff --git a/app/routes/routes.py b/app/routes/routes.py index f01b43633..a2f8bf6e0 100644 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -1,54 +1,89 @@ -from flask import Blueprint, jsonify, abort, make_response - -#created Planet class -class Planet: - def __init__(self, id, name, description, moons): - self.id = id - self.name = name - self.description = description - self.moons = moons - - - #method in class planet.to_planet - def to_planet_dict(self): - return dict( - id=self.id, - name=self.name, - description=self.description, - moons=self.moons - ) -#created planet instances -planets= [ - Planet(1, "fi", "red planet", 10), - Planet(2, "fie", "blue planet", 9), - Planet(3, "foo", "yellow planet", 8) -] -bp = Blueprint("planets", __name__, url_prefix="/planets") -#call method .to planets, return jsonified result from dictionary -@bp.route("", methods=["GET"]) -def handle_planets(): - results_list = [] - for planet in planets: - results_list.append(planet.to_planet_dict()) - return jsonify(results_list) - -#validate input for request -def validate_planet(planet_id): - #if string cannot cast to integer, return "bad request" - try: - planet_id= int(planet_id) - except: - abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) - - #if planet.id not found, return 404 - for planet in planets: - if planet.id == planet_id: - return planet - - abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - -#create endpoint blueprint -@bp.route("/", methods=["GET"]) -def handle_planet(id): - planet = validate_planet(id) - return jsonify(planet.to_planet_dict()) \ No newline at end of file +from app import db +from flask import Blueprint, jsonify, make_response, request +from app.models.planet import Planet + +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") + +@planets_bp.route("", methods=["POST"]) +def handle_planets(): + request_body = request.get_json() #converts request body into json object + 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 read_all_planets(): + planets_response = [] + planets = Planet.query.all() + for planet in planets: + planets_response.append( + { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "moons": planet.moons, + } + ) + return jsonify (planets_response) + +#"""""" #####learn to docstring +# #OLD CODE BELOW +# #created Planet class +# class Planet: +# def __init__(self, id, name, description, moons): +# self.id = id +# self.name = name +# self.description = description +# self.moons = moons + + +# #method in class planet.to_planet +# def to_planet_dict(self): +# return dict( +# id=self.id, +# name=self.name, +# description=self.description, +# moons=self.moons +# ) +# #created planet instances +# planets= [ +# Planet(1, "fi", "red planet", 10), +# Planet(2, "fie", "blue planet", 9), +# Planet(3, "foo", "yellow planet", 8) + +# bp = Blueprint("planets", __name__, url_prefix="/planets") +# #call method .to planets, return jsonified result from dictionary +# @bp.route("", methods=["GET"]) +# def handle_planets(): +# results_list = [] +# for planet in planets: +# results_list.append(planet.to_planet_dict()) +# return jsonify(results_list) + +# #validate input for request +# def validate_planet(planet_id): +# #if string cannot cast to integer, return "bad request" +# try: +# planet_id= int(planet_id) +# except: +# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + +# #if planet.id not found, return 404 +# for planet in planets: +# if planet.id == planet_id: +# return planet + +# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + +# #create endpoint blueprint +# @bp.route("/", methods=["GET"]) +# def handle_planet(id): +# planet = validate_planet(id) +# return jsonify(planet.to_planet_dict()) + +# """""" \ No newline at end of file From e1b17e3dd6b38a8aba034fce9d33f6beaddb2125 Mon Sep 17 00:00:00 2001 From: n2020h Date: Sun, 30 Oct 2022 15:55:53 -0700 Subject: [PATCH 03/17] added 200 response --- app/routes/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/routes.py b/app/routes/routes.py index a2f8bf6e0..a0d50ece8 100644 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -29,7 +29,7 @@ def read_all_planets(): "moons": planet.moons, } ) - return jsonify (planets_response) + return jsonify (planets_response), 200 #"""""" #####learn to docstring # #OLD CODE BELOW From 489f24b117480488f0d72f9537ede8950154a5b7 Mon Sep 17 00:00:00 2001 From: n2020h Date: Tue, 1 Nov 2022 10:44:13 -0700 Subject: [PATCH 04/17] removed old code from comments --- app/routes/routes.py | 59 +------------------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/app/routes/routes.py b/app/routes/routes.py index a0d50ece8..ea1071156 100644 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -29,61 +29,4 @@ def read_all_planets(): "moons": planet.moons, } ) - return jsonify (planets_response), 200 - -#"""""" #####learn to docstring -# #OLD CODE BELOW -# #created Planet class -# class Planet: -# def __init__(self, id, name, description, moons): -# self.id = id -# self.name = name -# self.description = description -# self.moons = moons - - -# #method in class planet.to_planet -# def to_planet_dict(self): -# return dict( -# id=self.id, -# name=self.name, -# description=self.description, -# moons=self.moons -# ) -# #created planet instances -# planets= [ -# Planet(1, "fi", "red planet", 10), -# Planet(2, "fie", "blue planet", 9), -# Planet(3, "foo", "yellow planet", 8) - -# bp = Blueprint("planets", __name__, url_prefix="/planets") -# #call method .to planets, return jsonified result from dictionary -# @bp.route("", methods=["GET"]) -# def handle_planets(): -# results_list = [] -# for planet in planets: -# results_list.append(planet.to_planet_dict()) -# return jsonify(results_list) - -# #validate input for request -# def validate_planet(planet_id): -# #if string cannot cast to integer, return "bad request" -# try: -# planet_id= int(planet_id) -# except: -# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) - -# #if planet.id not found, return 404 -# for planet in planets: -# if planet.id == planet_id: -# return planet - -# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - -# #create endpoint blueprint -# @bp.route("/", methods=["GET"]) -# def handle_planet(id): -# planet = validate_planet(id) -# return jsonify(planet.to_planet_dict()) - -# """""" \ No newline at end of file + return jsonify (planets_response), 200 \ No newline at end of file From fcac77ced2cae9c1de35be8bd0096fe298d2a678 Mon Sep 17 00:00:00 2001 From: Maria Silva Date: Tue, 1 Nov 2022 18:22:44 -0500 Subject: [PATCH 05/17] added pycache to git ignore file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4e9b18359..bfad270fc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,10 @@ .DS_Store # Byte-compiled / optimized / DLL files -__pycache__/ +**/__pycache__/ *.py[cod] *$py.class +venv/ # C extensions *.so From 7bbf487ae77545e400fa9c771c427d4f746fe964 Mon Sep 17 00:00:00 2001 From: Maria Silva Date: Tue, 1 Nov 2022 23:03:20 -0500 Subject: [PATCH 06/17] wave 4 completed --- app/__init__.py | 9 ++-- app/models/__init__.py | 0 app/models/planet.py | 14 ++++++ app/routes/routes.py | 110 ++++++++++++++++++++--------------------- 4 files changed, 71 insertions(+), 62 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py diff --git a/app/__init__.py b/app/__init__.py index 8167bee94..87964aa80 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,18 +5,17 @@ db = SQLAlchemy() migrate = Migrate() -def create_app(): +def create_app():#test_config=None app = Flask(__name__) # __name__ stores the name of the module we're in app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' - # Import models here - from app.models.planet import Planet - db.init_app(app) - migrate.init_app(app,db) + migrate.init_app(app, db) + # Import models here + from app.models.planet import Planet from app.routes.routes import planets_bp app.register_blueprint(planets_bp) 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..4cff0631b --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,14 @@ +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 to_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/routes.py b/app/routes/routes.py index a0d50ece8..21f357afa 100644 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -1,5 +1,5 @@ from app import db -from flask import Blueprint, jsonify, make_response, request +from flask import Blueprint, jsonify, abort, make_response, request from app.models.planet import Planet planets_bp = Blueprint("planets", __name__, url_prefix="/planets") @@ -31,59 +31,55 @@ def read_all_planets(): ) return jsonify (planets_response), 200 -#"""""" #####learn to docstring -# #OLD CODE BELOW -# #created Planet class -# class Planet: -# def __init__(self, id, name, description, moons): -# self.id = id -# self.name = name -# self.description = description -# self.moons = moons - - -# #method in class planet.to_planet -# def to_planet_dict(self): -# return dict( -# id=self.id, -# name=self.name, -# description=self.description, -# moons=self.moons -# ) -# #created planet instances -# planets= [ -# Planet(1, "fi", "red planet", 10), -# Planet(2, "fie", "blue planet", 9), -# Planet(3, "foo", "yellow planet", 8) - -# bp = Blueprint("planets", __name__, url_prefix="/planets") -# #call method .to planets, return jsonified result from dictionary -# @bp.route("", methods=["GET"]) -# def handle_planets(): -# results_list = [] -# for planet in planets: -# results_list.append(planet.to_planet_dict()) -# return jsonify(results_list) - -# #validate input for request -# def validate_planet(planet_id): -# #if string cannot cast to integer, return "bad request" -# try: -# planet_id= int(planet_id) -# except: -# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) - -# #if planet.id not found, return 404 -# for planet in planets: -# if planet.id == planet_id: -# return planet - -# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - -# #create endpoint blueprint -# @bp.route("/", methods=["GET"]) -# def handle_planet(id): -# planet = validate_planet(id) -# return jsonify(planet.to_planet_dict()) - -# """""" \ No newline at end of file +# GET ONE RESOURCE +@planets_bp.route("/", methods=["GET"]) +def get_one_planet(id): + planet = validate_planet(id) + + return jsonify({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "moons": planet.moons +}), 200 + +# UPDATE RESOURCE +@planets_bp.route("/", methods=["PUT"]) +def update_planet(id): + planet = validate_planet(id) + request_body = request.get_json() + + planet.name = request_body["name"] + planet.description = request_body["description"] + planet.moons = request_body["moons"] + + db.session.commit() + + return make_response(f"planet {id} successfully updated") + +# DELETE RESOURCE +@planets_bp.route("/", methods=["DELETE"]) +def delete_planet(id): + planet = validate_planet(id) + + db.session.delete(planet) + + db.session.commit() + + return make_response(f"planet {id} successfully deleted") + +#validate input for request +def validate_planet(planet_id): + #if string cannot cast to integer, return "bad request" + try: + planet_id= int(planet_id) + except: + abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + + #if planet.id not found, return 404 + planet = Planet.query.get(planet_id) + if not planet: + abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + + return planet + From 3c992d0f576707f971665795641b9a8412f58636 Mon Sep 17 00:00:00 2001 From: Maria Silva Date: Wed, 2 Nov 2022 13:45:33 -0500 Subject: [PATCH 07/17] passed wave 5 --- app/models/planet.py | 23 +++++++---- app/routes/routes.py | 94 +++++++++++++++++++++++++------------------- 2 files changed, 70 insertions(+), 47 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 4cff0631b..baa0fc014 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -5,10 +5,19 @@ class Planet(db.Model): name = db.Column(db.String) description = db.Column(db.String) moons = db.Column(db.Integer) - - def to_planet_dict(self): - return dict( - id=self.id, - name=self.name, - description=self.description, - moons=self.moons) \ No newline at end of file + + + def to_dict(self): + planet_as_dict = {} + planet_as_dict["id"] = self.id + planet_as_dict["name"] = self.name + planet_as_dict["description"] = self.description + + return planet_as_dict + + def from_json(cls, req_body): + return cls( + name = req_body["name"], + description = req_body["description"], + moons = req_body["moons"] + ) \ No newline at end of file diff --git a/app/routes/routes.py b/app/routes/routes.py index 21f357afa..fa99e09e2 100644 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -1,16 +1,45 @@ + +from os import abort from app import db -from flask import Blueprint, jsonify, abort, make_response, request from app.models.planet import Planet +from flask import Blueprint, jsonify, abort, make_response, request planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +#validate input for request +#def validate_planet(planet_id): +# #if string cannot cast to integer, return "bad request" +# try: +# planet_id= int(planet_id) +# except: +# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + +# #if planet.id not found, return 404 +# planet = Planet.query.get(planet_id) +# if not planet: +# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + +# return planet + +######################### NEW VALIDATE FUNCTION ############################ +def validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + + return model + + @planets_bp.route("", methods=["POST"]) def handle_planets(): request_body = request.get_json() #converts request body into json object - new_planet = Planet(name=request_body["name"], - description=request_body["description"], - moons = request_body["moons"]) - + new_planet = Planet.from_json(Planet, request_body) db.session.add(new_planet) db.session.commit() @@ -18,37 +47,38 @@ def handle_planets(): @planets_bp.route("", methods=["GET"]) def read_all_planets(): + + #this code replaces the previous query + name_query = request.args.get("name") + description_query = request.args.get("description") + moons_query = request.args.get("moons") + if name_query: + planets = Planet.query.filter_by(name=name_query) + elif description_query: + planets = Planet.query.filter_by(description=description_query) + elif moons_query: + planets = Planet.query.filter_by(moons=moons_query) + else: + planets = Planet.query.all() + planets_response = [] - planets = Planet.query.all() for planet in planets: - planets_response.append( - { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "moons": planet.moons, - } - ) + planets_response.append(planet.to_dict()) return jsonify (planets_response), 200 # GET ONE RESOURCE @planets_bp.route("/", methods=["GET"]) def get_one_planet(id): - planet = validate_planet(id) + planet = validate_model(Planet, id) - return jsonify({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "moons": planet.moons -}), 200 + return planet.to_dict() # UPDATE RESOURCE @planets_bp.route("/", methods=["PUT"]) def update_planet(id): - planet = validate_planet(id) + planet = validate_model(Planet, id) request_body = request.get_json() - + planet.name = request_body["name"] planet.description = request_body["description"] planet.moons = request_body["moons"] @@ -60,26 +90,10 @@ def update_planet(id): # DELETE RESOURCE @planets_bp.route("/", methods=["DELETE"]) def delete_planet(id): - planet = validate_planet(id) + planet = validate_model(Planet, id) db.session.delete(planet) db.session.commit() return make_response(f"planet {id} successfully deleted") - -#validate input for request -def validate_planet(planet_id): - #if string cannot cast to integer, return "bad request" - try: - planet_id= int(planet_id) - except: - abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) - - #if planet.id not found, return 404 - planet = Planet.query.get(planet_id) - if not planet: - abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - - return planet - From 3550ddedd6831490f41e43b7ad30203aadedae77 Mon Sep 17 00:00:00 2001 From: Maria Silva Date: Wed, 2 Nov 2022 13:51:11 -0500 Subject: [PATCH 08/17] removed import Planet in app.__init__.py --- app/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 87964aa80..1782e05c5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -15,7 +15,6 @@ def create_app():#test_config=None migrate.init_app(app, db) # Import models here - from app.models.planet import Planet from app.routes.routes import planets_bp app.register_blueprint(planets_bp) From 41501218b9224eb30f3c6672233c4da905be4cdb Mon Sep 17 00:00:00 2001 From: n2020h Date: Wed, 2 Nov 2022 11:55:24 -0700 Subject: [PATCH 09/17] "git ready for wave 5" --- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py 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() From 5833fc9155beb1b9a6fad51e1e531d54327e9f1c Mon Sep 17 00:00:00 2001 From: n2020h Date: Wed, 2 Nov 2022 12:02:45 -0700 Subject: [PATCH 10/17] "removed old validate_planet code" --- app/routes/routes.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/routes/routes.py b/app/routes/routes.py index fa99e09e2..6c4c4c40f 100644 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -6,21 +6,6 @@ planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -#validate input for request -#def validate_planet(planet_id): -# #if string cannot cast to integer, return "bad request" -# try: -# planet_id= int(planet_id) -# except: -# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) - -# #if planet.id not found, return 404 -# planet = Planet.query.get(planet_id) -# if not planet: -# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - -# return planet - ######################### NEW VALIDATE FUNCTION ############################ def validate_model(cls, model_id): try: From 4fda348839922b0343a4e3d1a6ceede7f9cf8dea Mon Sep 17 00:00:00 2001 From: n2020h Date: Thu, 3 Nov 2022 11:25:29 -0700 Subject: [PATCH 11/17] added testing config, added .env, ran server --- .gitignore | 1 + app/__init__.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bfad270fc..94de50a43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .vscode .DS_Store +.env # Byte-compiled / optimized / DLL files **/__pycache__/ diff --git a/app/__init__.py b/app/__init__.py index 1782e05c5..59519deb4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,15 +1,24 @@ 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 +def create_app(test_config=None):#test_config=None app = Flask(__name__) # __name__ stores the name of the module we're in - 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'] = os.environ.get("SQLALCHEMY_DATABASE_URI") + + else: + app.config["TESTING"] = True + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI") db.init_app(app) migrate.init_app(app, db) From 0d000188c25e290964df27fa34efe9881f8db5c2 Mon Sep 17 00:00:00 2001 From: n2020h Date: Thu, 3 Nov 2022 11:35:26 -0700 Subject: [PATCH 12/17] "test routes initiated get_planets test passed" Co-authored-by: Maria Silva --- tests/__init__.py | 0 tests/conftest.py | 24 ++++++++++++++++++++++++ tests/test_routes.py | 8 ++++++++ 3 files changed, 32 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..b531cc0ba --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,24 @@ +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..1124a9765 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,8 @@ +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 eb9cf22bd7253dc49d3965136aad2eb3db8d80db Mon Sep 17 00:00:00 2001 From: n2020h Date: Thu, 3 Nov 2022 12:15:07 -0700 Subject: [PATCH 13/17] get one book, test fails with moons in assert statement --- tests/conftest.py | 12 +++++++++++- tests/test_routes.py | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index b531cc0ba..1d8320dd2 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 def app(): @@ -21,4 +22,13 @@ def expire_session(sender, response, **extra): @pytest.fixture def client(app): - return app.test_client() \ No newline at end of file + return app.test_client() + +@pytest.fixture +def two_saved_planets(app): + # Arrange + red_planet = Planet(name="Mars", description="Too hot", moons = 2) + blue_planet = Planet(name="Earth",description="Home Sweet Home", moons = 1) + + db.session.add_all([red_planet, blue_planet]) + db.session.commit() diff --git a/tests/test_routes.py b/tests/test_routes.py index 1124a9765..8294617ac 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -5,4 +5,19 @@ 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() + #response_body = response.get_data(as_text=True) + + # Assert + assert response.status_code == 200 + assert response_body == { + 'id': 1, + 'name': 'Mars', + 'description': 'Too hot', + #'moons': 2 + } \ No newline at end of file From b356a693f7ff8c9f345e3681f9576b1d4fccfde9 Mon Sep 17 00:00:00 2001 From: Maria Silva Date: Thu, 3 Nov 2022 18:00:18 -0500 Subject: [PATCH 14/17] fixing up db migration --- migrations/script.py.mako | 24 +++++++++++++ .../58f74e36b5a4_initial_migration.py | 34 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/58f74e36b5a4_initial_migration.py 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/58f74e36b5a4_initial_migration.py b/migrations/versions/58f74e36b5a4_initial_migration.py new file mode 100644 index 000000000..106e4c6d1 --- /dev/null +++ b/migrations/versions/58f74e36b5a4_initial_migration.py @@ -0,0 +1,34 @@ +"""initial migration + +Revision ID: 58f74e36b5a4 +Revises: +Create Date: 2022-11-03 17:56:16.597086 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '58f74e36b5a4' +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 18c3f8eff2a7307c10098c0f5d9a4bd05afbe518 Mon Sep 17 00:00:00 2001 From: n2020h Date: Thu, 3 Nov 2022 18:55:26 -0700 Subject: [PATCH 15/17] moons added to planet model --- app/models/planet.py | 1 + tests/conftest.py | 4 +++- tests/test_routes.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index baa0fc014..682df6542 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -12,6 +12,7 @@ def to_dict(self): planet_as_dict["id"] = self.id planet_as_dict["name"] = self.name planet_as_dict["description"] = self.description + planet_as_dict["moons"]=self.moons return planet_as_dict diff --git a/tests/conftest.py b/tests/conftest.py index 1d8320dd2..6c1c090e8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -27,7 +27,9 @@ def client(app): @pytest.fixture def two_saved_planets(app): # Arrange - red_planet = Planet(name="Mars", description="Too hot", moons = 2) + red_planet = Planet(name="Mars", + description="Too hot", + moons = 2) blue_planet = Planet(name="Earth",description="Home Sweet Home", moons = 1) db.session.add_all([red_planet, blue_planet]) diff --git a/tests/test_routes.py b/tests/test_routes.py index 8294617ac..526932c45 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -19,5 +19,5 @@ def test_get_one_planet(client, two_saved_planets): 'id': 1, 'name': 'Mars', 'description': 'Too hot', - #'moons': 2 + 'moons': 2 } \ No newline at end of file From 15c61e93ddbafddce84deff258b67d21300c1fef Mon Sep 17 00:00:00 2001 From: n2020h Date: Thu, 3 Nov 2022 20:32:52 -0700 Subject: [PATCH 16/17] Get /planets/1 both completed, post/planets done, Get /planets needed --- app/routes/routes.py | 3 ++- tests/conftest.py | 1 + tests/test_routes.py | 47 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/app/routes/routes.py b/app/routes/routes.py index 6c4c4c40f..7469f0bf5 100644 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -28,7 +28,8 @@ 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(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(): diff --git a/tests/conftest.py b/tests/conftest.py index 6c1c090e8..f4478253a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -34,3 +34,4 @@ def two_saved_planets(app): db.session.add_all([red_planet, blue_planet]) db.session.commit() + diff --git a/tests/test_routes.py b/tests/test_routes.py index 526932c45..e3bbfb112 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -7,6 +7,7 @@ def test_get_all_planets_with_no_records(client): assert response.status_code == 200 assert response_body == [] +#1. GET /books/1 returns a response body that matches our fixture def test_get_one_planet(client, two_saved_planets): # Act response = client.get("/planets/1") @@ -20,4 +21,48 @@ def test_get_one_planet(client, two_saved_planets): 'name': 'Mars', 'description': 'Too hot', 'moons': 2 - } \ No newline at end of file + } + +#2. GET /books/1 with no data in test database (no fixture) returns a 404 +def test_get_one_planet_not_in_db(client): + # Act + response = client.get("/planets/3") + response_body = response.get_json() + #response_body = response.get_data(as_text=True) + + # Assert + assert response.status_code == 404 + assert response_body == {"message":"Planet 3 not found"} + +#3. GET /books with valid test data (fixtures) returns a 200 with an array including appropriate test data +# def test_get_all_planets_with_two_planets_db(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': 'Mars', +# 'description': 'Too hot', +# 'moons': 2} +# { +# 'id': 2, +# 'name' : 'Earth', +# 'description' : 'Home Sweet Home', +# 'moons' = 1} + +# 4.POST /books with a JSON request body returns a 201 +def test_create_one_book(client): + # Act + response = client.post("/planets", json={ + "name": "New Planet", + "description": "Beautiful planet!", + "moons": 3 + }) + response_body = response.get_json() + + # Assert + assert response.status_code == 201 + assert response_body == "Planet New Planet successfully created" From 5fb3fa4014165deb31138843b427230c0f6b011c Mon Sep 17 00:00:00 2001 From: n2020h Date: Thu, 3 Nov 2022 20:59:17 -0700 Subject: [PATCH 17/17] finished wave 6 --- tests/test_routes.py | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index e3bbfb112..01fd0eb2e 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -35,23 +35,26 @@ def test_get_one_planet_not_in_db(client): assert response_body == {"message":"Planet 3 not found"} #3. GET /books with valid test data (fixtures) returns a 200 with an array including appropriate test data -# def test_get_all_planets_with_two_planets_db(client, two_saved_planets): -# # Act -# response = client.get("/planets") -# response_body = response.get_json() +def test_get_all_planets_with_two_planets_db(client, two_saved_planets): + # Act + response = client.get("/planets") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert len(response_body) == 2 + assert response_body[0] == { + 'id': 1, + 'name': 'Mars', + 'description': 'Too hot', + 'moons': 2} + + assert response_body[1] == { + 'id': 2, + 'name' : 'Earth', + 'description' : 'Home Sweet Home', + 'moons': 1} -# # Assert -# assert response.status_code == 200 -# assert response_body == { -# 'id': 1, -# 'name': 'Mars', -# 'description': 'Too hot', -# 'moons': 2} -# { -# 'id': 2, -# 'name' : 'Earth', -# 'description' : 'Home Sweet Home', -# 'moons' = 1} # 4.POST /books with a JSON request body returns a 201 def test_create_one_book(client):