From 7a263009ca6d5eab462fcc7f03c8eccfd04470ba Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Wed, 14 Dec 2022 10:49:54 -0800 Subject: [PATCH 01/31] Coworking agreement signed --- coworking_agreement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coworking_agreement.md b/coworking_agreement.md index 463598c27..12294afe8 100644 --- a/coworking_agreement.md +++ b/coworking_agreement.md @@ -21,5 +21,5 @@ Talk through each section with your partner. Add notes on what you discussed and *Other co-working agreements that were not captured in the above sections.* ## Signatures -______________ _______________ -Date: _________ +_Supriya Chavan_ _______________ +Date: 12/14/2023 From 5d7af5c1ae652cb59f2ab7bba924a660398675b7 Mon Sep 17 00:00:00 2001 From: diana Date: Wed, 14 Dec 2022 10:50:55 -0800 Subject: [PATCH 02/31] Coworking Agreement :) --- coworking_agreement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coworking_agreement.md b/coworking_agreement.md index 12294afe8..7648181d0 100644 --- a/coworking_agreement.md +++ b/coworking_agreement.md @@ -21,5 +21,5 @@ Talk through each section with your partner. Add notes on what you discussed and *Other co-working agreements that were not captured in the above sections.* ## Signatures -_Supriya Chavan_ _______________ +_Supriya Chavan_ __Diana Arreola________ Date: 12/14/2023 From 984dd0b27c3ac45ddb2e7fc94d559052ae451f5f Mon Sep 17 00:00:00 2001 From: diana Date: Wed, 14 Dec 2022 11:00:29 -0800 Subject: [PATCH 03/31] Add planet class --- app/planet.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/planet.py diff --git a/app/planet.py b/app/planet.py new file mode 100644 index 000000000..273ec1bb5 --- /dev/null +++ b/app/planet.py @@ -0,0 +1,7 @@ + +class Planet: + def __init__(self, id, name, description, radius): + self.id = id + self.name = name + self.description = description + self.radius = radius From 40d41ddb900fa8edab5d528bd192d02f9c890d34 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Wed, 14 Dec 2022 14:30:36 -0800 Subject: [PATCH 04/31] Created Planets --- app/Planet.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 app/Planet.py diff --git a/app/Planet.py b/app/Planet.py new file mode 100644 index 000000000..f34ce1c11 --- /dev/null +++ b/app/Planet.py @@ -0,0 +1,17 @@ +class Planet: + def __init__(self, id, name, description, radius, num_moons = None, gravity=0): + self.id = id + self.name = name + self.description = description + self.radius = radius + self.num_moons = num_moons + self.gravity = gravity +planets = [ + Planet(1, "Earth","Has human life", 3958.8, 1, 9.08), + Planet(2, "Mercury","Slate Gray", 1516, 0, 3.7), + Planet(3, "Venus","Planet of Love", 3760.4, 1, 8.874), + Planet(4, "Mars","War planet", 2106.1, 2, 3.721), + Planet(5, "Jupiter","planet of luck", 43441, 80, 24.79), + Planet(6, "Uranus","Hashumanlife", 15759, 27, 8.87), + Planet(7, "Saturn","planet of lessons", 36184, 83, 10.44) +] From 9abc364a431c3d26538369ebdb50e79df1b7873d Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Wed, 14 Dec 2022 14:38:29 -0800 Subject: [PATCH 05/31] Created Planets --- app/planet.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/planet.py b/app/planet.py index 273ec1bb5..72e68f0a0 100644 --- a/app/planet.py +++ b/app/planet.py @@ -1,7 +1,18 @@ class Planet: - def __init__(self, id, name, description, radius): + def __init__(self, id, name, description, num_moons,radius): self.id = id self.name = name self.description = description self.radius = radius + self.num_moons = num_moons + self.gravity = gravity +planets = [ + Planet(1, "Earth","Has human life", 3958.8, 1, 9.08), + Planet(2, "Mercury","Slate Gray", 1516, 0, 3.7), + Planet(3, "Venus","Planet of Love", 3760.4, 1, 8.874), + Planet(4, "Mars","War planet", 2106.1, 2, 3.721), + Planet(5, "Jupiter","planet of luck", 43441, 80, 24.79), + Planet(6, "Uranus","Hashumanlife", 15759, 27, 8.87), + Planet(7, "Saturn","planet of lessons", 36184, 83, 10.44) +] From 3f08639e5d23b22a38a592d842ed9ecb75cb1b00 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Wed, 14 Dec 2022 14:49:52 -0800 Subject: [PATCH 06/31] Wave 01 --- app/__init__.py | 2 ++ app/planet.py | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..e617612d9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,4 +4,6 @@ def create_app(test_config=None): app = Flask(__name__) + from .planet import planets_bp + app.register_blueprint(planets_bp) return app diff --git a/app/planet.py b/app/planet.py index 72e68f0a0..a052c7b43 100644 --- a/app/planet.py +++ b/app/planet.py @@ -1,6 +1,7 @@ +from flask import Blueprint, jsonify class Planet: - def __init__(self, id, name, description, num_moons,radius): + def __init__(self, id, name, description, num_moons, radius, gravity): self.id = id self.name = name self.description = description @@ -16,3 +17,20 @@ def __init__(self, id, name, description, num_moons,radius): Planet(6, "Uranus","Hashumanlife", 15759, 27, 8.87), Planet(7, "Saturn","planet of lessons", 36184, 83, 10.44) ] + +planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") + +@planets_bp.route("", methods=["GET"]) +def get_all_planets(): + planet_response = [] + for planet in planets: + planet_response.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "radius": planet.radius, + "num_moons": planet.num_moons, + "gravity": planet.gravity + }) + + return jsonify(planet_response) From 2fda7274d525dd7e69bedf12fc753878e37d5de9 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Wed, 14 Dec 2022 15:05:15 -0800 Subject: [PATCH 07/31] Wave 02 --- app/__init__.py | 1 + app/planet.py | 45 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index e617612d9..d4a4dbb51 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,3 +7,4 @@ def create_app(test_config=None): from .planet import planets_bp app.register_blueprint(planets_bp) return app + diff --git a/app/planet.py b/app/planet.py index a052c7b43..95d5422de 100644 --- a/app/planet.py +++ b/app/planet.py @@ -1,8 +1,8 @@ -from flask import Blueprint, jsonify +from flask import Blueprint, jsonify,abort, make_response class Planet: - def __init__(self, id, name, description, num_moons, radius, gravity): - self.id = id + def __init__(self, planet_id, name, description, num_moons, radius, gravity): + self.id = planet_id self.name = name self.description = description self.radius = radius @@ -34,3 +34,42 @@ def get_all_planets(): }) return jsonify(planet_response) + +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)) + +@planets_bp.route("/", methods=["GET"]) +def handle_planet(planet_id): + planet = validate_planet(planet_id) + + return { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "radius": planet.radius, + "num_moons": planet.num_moons, + "gravity": planet.gravity + } + +def handle_planets(): + planets_response = [] + for planet in planets: + planets_response.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "radius": planet.radius, + "num_moons": planet.num_moons, + "gravity": planet.gravity + }) + return jsonify(planets_response) + From bf498b766ede1f687386efec35d18c708f78b2cb Mon Sep 17 00:00:00 2001 From: diana Date: Thu, 15 Dec 2022 10:26:17 -0800 Subject: [PATCH 08/31] Wave 02: refactor --- app/planet.py | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/app/planet.py b/app/planet.py index 95d5422de..8a482db2c 100644 --- a/app/planet.py +++ b/app/planet.py @@ -1,13 +1,24 @@ from flask import Blueprint, jsonify,abort, make_response class Planet: - def __init__(self, planet_id, name, description, num_moons, radius, gravity): + def __init__(self, planet_id, name, description, radius, num_moons, gravity): self.id = planet_id self.name = name self.description = description self.radius = radius self.num_moons = num_moons self.gravity = gravity + + def to_dict(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + "radius": self.radius, + "num_moons": self.num_moons, + "gravity": self.gravity + } + planets = [ Planet(1, "Earth","Has human life", 3958.8, 1, 9.08), Planet(2, "Mercury","Slate Gray", 1516, 0, 3.7), @@ -24,14 +35,7 @@ def __init__(self, planet_id, name, description, num_moons, radius, gravity): def get_all_planets(): planet_response = [] for planet in planets: - planet_response.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "radius": planet.radius, - "num_moons": planet.num_moons, - "gravity": planet.gravity - }) + planet_response.append(planet.to_dict()) return jsonify(planet_response) @@ -51,25 +55,11 @@ def validate_planet(planet_id): def handle_planet(planet_id): planet = validate_planet(planet_id) - return { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "radius": planet.radius, - "num_moons": planet.num_moons, - "gravity": planet.gravity - } + return jsonify(planet.to_dict()) def handle_planets(): planets_response = [] for planet in planets: - planets_response.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "radius": planet.radius, - "num_moons": planet.num_moons, - "gravity": planet.gravity - }) + planets_response.append(planet.to_dict()) return jsonify(planets_response) From 8898cfd324b6e210667f5917abe630cc1026a3cc Mon Sep 17 00:00:00 2001 From: diana Date: Thu, 15 Dec 2022 10:44:58 -0800 Subject: [PATCH 09/31] Add gravity endpoint --- app/planet.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/planet.py b/app/planet.py index 8a482db2c..0c9ccc8ac 100644 --- a/app/planet.py +++ b/app/planet.py @@ -63,3 +63,16 @@ def handle_planets(): planets_response.append(planet.to_dict()) return jsonify(planets_response) +@planets_bp.route("//gravity", methods=["GET"]) +def find_planets_with_greater_gravity(planet_id): + planets_with_greater_gravity = [] + planet = validate_planet(planet_id) + # retrieve that planets gravity value + current_planet_gravity = planet.gravity + for planet in planets: + if planet.gravity > current_planet_gravity: + planets_with_greater_gravity.append(planet.to_dict()) + return jsonify(planets_with_greater_gravity) + + + From 46e7bd104c99128129168531cb69de7eaf6ebce0 Mon Sep 17 00:00:00 2001 From: diana Date: Thu, 15 Dec 2022 10:52:42 -0800 Subject: [PATCH 10/31] Add greater_radius endpoint --- app/planet.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/planet.py b/app/planet.py index 0c9ccc8ac..b673c6c2d 100644 --- a/app/planet.py +++ b/app/planet.py @@ -63,7 +63,7 @@ def handle_planets(): planets_response.append(planet.to_dict()) return jsonify(planets_response) -@planets_bp.route("//gravity", methods=["GET"]) +@planets_bp.route("//greater_gravity", methods=["GET"]) def find_planets_with_greater_gravity(planet_id): planets_with_greater_gravity = [] planet = validate_planet(planet_id) @@ -74,5 +74,16 @@ def find_planets_with_greater_gravity(planet_id): planets_with_greater_gravity.append(planet.to_dict()) return jsonify(planets_with_greater_gravity) +@planets_bp.route("//greater_radius", methods=["GET"]) +def find_planets_with_greater_radius(planet_id): + planets_with_greater_radius = [] + planet = validate_planet(planet_id) + # retrieve that planets gravity value + current_planet_radius = planet.radius + for planet in planets: + if planet.radius > current_planet_radius: + planets_with_greater_radius.append(planet.to_dict()) + return jsonify(planets_with_greater_radius) + + - From f9544baae59a5356c44d572d71f5f5e85c0c2c65 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Tue, 20 Dec 2022 11:18:06 -0800 Subject: [PATCH 11/31] Database Migrations and Created Model --- app/Planet.py | 17 --- app/__init__.py | 13 +- app/models/__init__.py | 0 app/models/planet.py | 12 ++ app/planet.py | 89 ------------ app/planet_routes.py | 130 ++++++++++++++++++ migrations/README | 1 + migrations/alembic.ini | 45 ++++++ migrations/env.py | 96 +++++++++++++ migrations/script.py.mako | 24 ++++ .../abe0497758b8_adds_planet_model.py | 36 +++++ 11 files changed, 356 insertions(+), 107 deletions(-) delete mode 100644 app/Planet.py create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py delete mode 100644 app/planet.py create mode 100644 app/planet_routes.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/abe0497758b8_adds_planet_model.py diff --git a/app/Planet.py b/app/Planet.py deleted file mode 100644 index f34ce1c11..000000000 --- a/app/Planet.py +++ /dev/null @@ -1,17 +0,0 @@ -class Planet: - def __init__(self, id, name, description, radius, num_moons = None, gravity=0): - self.id = id - self.name = name - self.description = description - self.radius = radius - self.num_moons = num_moons - self.gravity = gravity -planets = [ - Planet(1, "Earth","Has human life", 3958.8, 1, 9.08), - Planet(2, "Mercury","Slate Gray", 1516, 0, 3.7), - Planet(3, "Venus","Planet of Love", 3760.4, 1, 8.874), - Planet(4, "Mars","War planet", 2106.1, 2, 3.721), - Planet(5, "Jupiter","planet of luck", 43441, 80, 24.79), - Planet(6, "Uranus","Hashumanlife", 15759, 27, 8.87), - Planet(7, "Saturn","planet of lessons", 36184, 83, 10.44) -] diff --git a/app/__init__.py b/app/__init__.py index d4a4dbb51..b7449dde7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,10 +1,21 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate + +db = SQLAlchemy() +migrate = Migrate() def create_app(test_config=None): app = Flask(__name__) - from .planet import planets_bp + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/planet_development' + + db.init_app(app) + migrate.init_app(app, db) + + from .planet_routes import planets_bp app.register_blueprint(planets_bp) return app diff --git a/app/models/__init__.py b/app/models/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/planet.py b/app/models/planet.py new file mode 100644 index 000000000..905061b5d --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,12 @@ +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) + radius = db.Column(db.Float) + num_moons = db.Column(db.Float) + gravity = db.Column(db.Float) + + def to_string(self): + return f"{self.id}: {self.title} Description:{self.description}" \ No newline at end of file diff --git a/app/planet.py b/app/planet.py deleted file mode 100644 index b673c6c2d..000000000 --- a/app/planet.py +++ /dev/null @@ -1,89 +0,0 @@ -from flask import Blueprint, jsonify,abort, make_response - -class Planet: - def __init__(self, planet_id, name, description, radius, num_moons, gravity): - self.id = planet_id - self.name = name - self.description = description - self.radius = radius - self.num_moons = num_moons - self.gravity = gravity - - def to_dict(self): - return { - "id": self.id, - "name": self.name, - "description": self.description, - "radius": self.radius, - "num_moons": self.num_moons, - "gravity": self.gravity - } - -planets = [ - Planet(1, "Earth","Has human life", 3958.8, 1, 9.08), - Planet(2, "Mercury","Slate Gray", 1516, 0, 3.7), - Planet(3, "Venus","Planet of Love", 3760.4, 1, 8.874), - Planet(4, "Mars","War planet", 2106.1, 2, 3.721), - Planet(5, "Jupiter","planet of luck", 43441, 80, 24.79), - Planet(6, "Uranus","Hashumanlife", 15759, 27, 8.87), - Planet(7, "Saturn","planet of lessons", 36184, 83, 10.44) -] - -planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") - -@planets_bp.route("", methods=["GET"]) -def get_all_planets(): - planet_response = [] - for planet in planets: - planet_response.append(planet.to_dict()) - - return jsonify(planet_response) - -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)) - -@planets_bp.route("/", methods=["GET"]) -def handle_planet(planet_id): - planet = validate_planet(planet_id) - - return jsonify(planet.to_dict()) - -def handle_planets(): - planets_response = [] - for planet in planets: - planets_response.append(planet.to_dict()) - return jsonify(planets_response) - -@planets_bp.route("//greater_gravity", methods=["GET"]) -def find_planets_with_greater_gravity(planet_id): - planets_with_greater_gravity = [] - planet = validate_planet(planet_id) - # retrieve that planets gravity value - current_planet_gravity = planet.gravity - for planet in planets: - if planet.gravity > current_planet_gravity: - planets_with_greater_gravity.append(planet.to_dict()) - return jsonify(planets_with_greater_gravity) - -@planets_bp.route("//greater_radius", methods=["GET"]) -def find_planets_with_greater_radius(planet_id): - planets_with_greater_radius = [] - planet = validate_planet(planet_id) - # retrieve that planets gravity value - current_planet_radius = planet.radius - for planet in planets: - if planet.radius > current_planet_radius: - planets_with_greater_radius.append(planet.to_dict()) - return jsonify(planets_with_greater_radius) - - - diff --git a/app/planet_routes.py b/app/planet_routes.py new file mode 100644 index 000000000..b231eb5fb --- /dev/null +++ b/app/planet_routes.py @@ -0,0 +1,130 @@ +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, abort, make_response, request + + +planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") + + +@planets_bp.route("", methods=["POST"]) +def create_planet(): + request_body = request.get_json() + new_planet = Planet(name=request_body["name"], + description=request_body["description"], + radius=request_body["radius"], + num_moons=request_body["num_moons"], + gravity=request_body["gravity"] + ) + + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.title} 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, + "radius": planet.radius, + "num_moons": planet.num_moons, + "gravity": planet.gravity + + } + ) + return jsonify(planets_response) + + +# class Planet: +# def __init__(self, planet_id, name, description, radius, num_moons, gravity): +# self.id = planet_id +# self.name = name +# self.description = description +# self.radius = radius +# self.num_moons = num_moons +# self.gravity = gravity + + +# def to_dict(self): +# return { +# "id": self.id, +# "name": self.name, +# "description": self.description, +# "radius": self.radius, +# "num_moons": self.num_moons, +# "gravity": self.gravity +# } + +# planets = [ +# Planet(1, "Earth","Has human life", 3958.8, 1, 9.08), +# Planet(2, "Mercury","Slate Gray", 1516, 0, 3.7), +# Planet(3, "Venus","Planet of Love", 3760.4, 1, 8.874), +# Planet(4, "Mars","War planet", 2106.1, 2, 3.721), +# Planet(5, "Jupiter","planet of luck", 43441, 80, 24.79), +# Planet(6, "Uranus","Hashumanlife", 15759, 27, 8.87), +# Planet(7, "Saturn","planet of lessons", 36184, 83, 10.44) +# ] + +# planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") + +# @planets_bp.route("", methods=["GET"]) +# def get_all_planets(): +# planet_response = [] +# for planet in planets: +# planet_response.append(planet.to_dict()) + +# return jsonify(planet_response) + +# 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)) + +# @planets_bp.route("/", methods=["GET"]) +# def handle_planet(planet_id): +# planet = validate_planet(planet_id) + +# return jsonify(planet.to_dict()) + +# def handle_planets(): +# planets_response = [] +# for planet in planets: +# planets_response.append(planet.to_dict()) +# return jsonify(planets_response) + +# @planets_bp.route("//greater_gravity", methods=["GET"]) +# def find_planets_with_greater_gravity(planet_id): +# planets_with_greater_gravity = [] +# planet = validate_planet(planet_id) +# # retrieve that planets gravity value +# current_planet_gravity = planet.gravity +# for planet in planets: +# if planet.gravity > current_planet_gravity: +# planets_with_greater_gravity.append(planet.to_dict()) +# return jsonify(planets_with_greater_gravity) + +# @planets_bp.route("//greater_radius", methods=["GET"]) +# def find_planets_with_greater_radius(planet_id): +# planets_with_greater_radius = [] +# planet = validate_planet(planet_id) +# # retrieve that planets gravity value +# current_planet_radius = planet.radius +# for planet in planets: +# if planet.radius > current_planet_radius: +# planets_with_greater_radius.append(planet.to_dict()) +# return jsonify(planets_with_greater_radius) + + + 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/abe0497758b8_adds_planet_model.py b/migrations/versions/abe0497758b8_adds_planet_model.py new file mode 100644 index 000000000..9df4e169e --- /dev/null +++ b/migrations/versions/abe0497758b8_adds_planet_model.py @@ -0,0 +1,36 @@ +"""adds planet Model + +Revision ID: abe0497758b8 +Revises: +Create Date: 2022-12-20 11:15:16.245571 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'abe0497758b8' +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('radius', sa.Float(), nullable=True), + sa.Column('num_moons', sa.Float(), nullable=True), + sa.Column('gravity', sa.Float(), 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 55fbb4452073e2030bd83af03528289a8b86b55e Mon Sep 17 00:00:00 2001 From: diana Date: Tue, 20 Dec 2022 11:38:51 -0800 Subject: [PATCH 12/31] retrieve planet name --- app/planet_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/planet_routes.py b/app/planet_routes.py index b231eb5fb..9f0542f59 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -19,7 +19,7 @@ def create_planet(): db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.title} successfully created", 201) + return make_response(f"Planet {new_planet.name} successfully created", 201) @planets_bp.route("", methods=["GET"]) def read_all_planets(): From 676f0b7939a69a35be5a7f461e92e0f4bfe978c7 Mon Sep 17 00:00:00 2001 From: diana Date: Wed, 21 Dec 2022 10:32:49 -0800 Subject: [PATCH 13/31] Retrieve one planet --- app/planet_routes.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/planet_routes.py b/app/planet_routes.py index 9f0542f59..c9ecfd73b 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -39,6 +39,32 @@ def read_all_planets(): ) return jsonify(planets_response) +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 + +@planets_bp.route("/", methods=["GET"]) +def read_one_planet(planet_id): + planet = validate_planet(planet_id) + return { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "radius": planet.radius, + "num_moons": planet.num_moons, + "gravity": planet.gravity + } + + # class Planet: # def __init__(self, planet_id, name, description, radius, num_moons, gravity): From a3829808640aea9ed0c4fc7cd6ef41f90d2d8dc7 Mon Sep 17 00:00:00 2001 From: diana Date: Wed, 21 Dec 2022 10:40:48 -0800 Subject: [PATCH 14/31] add PUT and DELETE endpoints --- app/planet_routes.py | 75 +++++++++++--------------------------------- 1 file changed, 18 insertions(+), 57 deletions(-) diff --git a/app/planet_routes.py b/app/planet_routes.py index c9ecfd73b..93d1fb48c 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -64,71 +64,32 @@ def read_one_planet(planet_id): "gravity": planet.gravity } - +@planets_bp.route("/", methods=["PUT"]) +def update_book(planet_id): + planet = validate_planet(planet_id) -# class Planet: -# def __init__(self, planet_id, name, description, radius, num_moons, gravity): -# self.id = planet_id -# self.name = name -# self.description = description -# self.radius = radius -# self.num_moons = num_moons -# self.gravity = gravity - - -# def to_dict(self): -# return { -# "id": self.id, -# "name": self.name, -# "description": self.description, -# "radius": self.radius, -# "num_moons": self.num_moons, -# "gravity": self.gravity -# } - -# planets = [ -# Planet(1, "Earth","Has human life", 3958.8, 1, 9.08), -# Planet(2, "Mercury","Slate Gray", 1516, 0, 3.7), -# Planet(3, "Venus","Planet of Love", 3760.4, 1, 8.874), -# Planet(4, "Mars","War planet", 2106.1, 2, 3.721), -# Planet(5, "Jupiter","planet of luck", 43441, 80, 24.79), -# Planet(6, "Uranus","Hashumanlife", 15759, 27, 8.87), -# Planet(7, "Saturn","planet of lessons", 36184, 83, 10.44) -# ] - -# planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") - -# @planets_bp.route("", methods=["GET"]) -# def get_all_planets(): -# planet_response = [] -# for planet in planets: -# planet_response.append(planet.to_dict()) + request_body = request.get_json() -# return jsonify(planet_response) + planet.name = request_body["name"] + planet.description = request_body["description"] + planet.radius = request_body["radius"] + planet.num_moons = request_body["num_moons"] + planet.gravity = request_body["gravity"] -# def validate_planet(planet_id): -# try: -# planet_id = int(planet_id) -# except: -# abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + db.session.commit() -# for planet in planets: -# if planet.id == planet_id: -# return planet + return make_response(f"Planet #{planet.id} successfully updated") -# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) -# @planets_bp.route("/", methods=["GET"]) -# def handle_planet(planet_id): -# planet = validate_planet(planet_id) +@planets_bp.route("/", methods=["DELETE"]) +def delete_book(planet_id): + planet = validate_planet(planet_id) -# return jsonify(planet.to_dict()) + db.session.delete(planet) + db.session.commit() + + return make_response(f"Planet #{planet.id} successfully deleted") -# def handle_planets(): -# planets_response = [] -# for planet in planets: -# planets_response.append(planet.to_dict()) -# return jsonify(planets_response) # @planets_bp.route("//greater_gravity", methods=["GET"]) # def find_planets_with_greater_gravity(planet_id): From 538d31aad4e58561eb74356ab81f8fcf6c779191 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Thu, 22 Dec 2022 11:15:01 -0800 Subject: [PATCH 15/31] Wave 5 GEt by name Asc and desc --- app/planet_routes.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/planet_routes.py b/app/planet_routes.py index 93d1fb48c..048280d61 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -23,8 +23,20 @@ def create_planet(): @planets_bp.route("", methods=["GET"]) def read_all_planets(): + planet_query = Planet.query + name_query = request.args.get("name") + if name_query: + planet_query = planet_query.filter(Planet.name.ilike(f"%{name_query}%")) + + sort_query = request.args.get("sort") + if sort_query: + if sort_query == "desc": + planet_query = planet_query.order_by(Planet.name.desc()) + else: + planet_query = planet_query.order_by(Planet.name.asc()) + + planets = planet_query.all() planets_response = [] - planets = Planet.query.all() for planet in planets: planets_response.append( { From 9610dbc7cd81804d8b26568959eb516db48e64fb Mon Sep 17 00:00:00 2001 From: diana Date: Tue, 3 Jan 2023 14:27:43 -0800 Subject: [PATCH 16/31] Add testing env --- .gitignore | 1 + app/__init__.py | 15 ++++++++++++--- requirements.txt | 7 +++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e9b18359..db601f26e 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 b7449dde7..ada58a845 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,20 +1,29 @@ 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/planet_development' - + + if test_config: + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI") + app.config["Testing"] = True + else: + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI") + db.init_app(app) migrate.init_app(app, db) + from app.models.planet import Planet + from .planet_routes import planets_bp app.register_blueprint(planets_bp) return app diff --git a/requirements.txt b/requirements.txt index fba2b3e38..352fc602e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,24 @@ alembic==1.5.4 +attrs==22.1.0 autopep8==1.5.5 blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==7.0.0 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 idna==2.10 +iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +packaging==22.0 +pluggy==1.0.0 psycopg2-binary==2.9.4 +py==1.11.0 pycodestyle==2.6.0 pytest==7.1.1 pytest-cov==2.12.1 @@ -23,5 +29,6 @@ requests==2.25.1 six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.4 Werkzeug==1.0.1 From dac5e28b55c06bf5fdb06bc61be0149eddc04905 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Tue, 3 Jan 2023 14:42:04 -0800 Subject: [PATCH 17/31] requirements.txt --- app/planet_routes.py | 7 +++ migrations/env.py | 96 ------------------------------------- requirements.txt | 7 +++ tests/__init__.py | 0 tests/conftest.py | 0 tests/test_planet_routes.py | 0 6 files changed, 14 insertions(+), 96 deletions(-) delete mode 100644 migrations/env.py create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py create mode 100644 tests/test_planet_routes.py diff --git a/app/planet_routes.py b/app/planet_routes.py index 048280d61..eca71149e 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -35,6 +35,7 @@ def read_all_planets(): else: planet_query = planet_query.order_by(Planet.name.asc()) + planets = planet_query.all() planets_response = [] for planet in planets: @@ -126,4 +127,10 @@ def delete_book(planet_id): # return jsonify(planets_with_greater_radius) +# session = Session() # this was configured elsewhere +# query = session.query(MyTable) +# query = query.filter(MyTable.x == f'{y:.2f}') # y is a float +# return session.query(query.exists()).scalar() + + diff --git a/migrations/env.py b/migrations/env.py deleted file mode 100644 index 8b3fb3353..000000000 --- a/migrations/env.py +++ /dev/null @@ -1,96 +0,0 @@ -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/requirements.txt b/requirements.txt index fba2b3e38..5561ec1de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,24 @@ alembic==1.5.4 +attrs==22.1.0 autopep8==1.5.5 blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==6.5.0 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 idna==2.10 +iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +packaging==22.0 +pluggy==1.0.0 psycopg2-binary==2.9.4 +py==1.11.0 pycodestyle==2.6.0 pytest==7.1.1 pytest-cov==2.12.1 @@ -23,5 +29,6 @@ requests==2.25.1 six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 +tomli==2.0.1 urllib3==1.26.4 Werkzeug==1.0.1 diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/test_planet_routes.py b/tests/test_planet_routes.py new file mode 100644 index 000000000..e69de29bb From 720c3bdbee84cdb4959534edaffd961793ef75b4 Mon Sep 17 00:00:00 2001 From: diana Date: Tue, 3 Jan 2023 14:47:06 -0800 Subject: [PATCH 18/31] revert requirements file --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 352fc602e..5561ec1de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 -coverage==7.0.0 +coverage==6.5.0 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 From 574952dbdba3d18dd460adf59a654332f540436d Mon Sep 17 00:00:00 2001 From: diana Date: Tue, 3 Jan 2023 14:54:42 -0800 Subject: [PATCH 19/31] Add tests file --- tests/__init__.py | 0 tests/conftest.py | 25 +++++++++++++++++++++++++ tests/test_routes.py | 0 3 files changed, 25 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..ac8a4193b --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,25 @@ +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 ede1669b4570594c7c6539e84c56b3c89480f194 Mon Sep 17 00:00:00 2001 From: diana Date: Tue, 3 Jan 2023 15:47:07 -0800 Subject: [PATCH 20/31] testing endpoints --- tests/conftest.py | 21 +++++++- tests/test_routes.py | 113 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index ac8a4193b..2f8780f9f 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 @@ -22,4 +23,22 @@ 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 + mars = Planet(name="Mars", + description="War planet", + radius=2106.1, + num_moons=2, + gravity=3.721) + venus = Planet(name="Venus", + description="Planet Of Love", + radius=3760.4, + num_moons=1, + gravity=8.874) + + db.session.add_all([mars, venus]) + db.session.commit() diff --git a/tests/test_routes.py b/tests/test_routes.py index e69de29bb..2e7501ed9 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -0,0 +1,113 @@ +def test_get_planets_empty_db_returns_empty_list(client): + # Act + response = client.get("/planets") + + # Assert + assert response.status_code == 200 + assert response.get_json() == [] + +def test_get_planet_with_id_empty_db_returns_404(client): + # Act + response = client.get("/planets/100") + + # Assert + assert response.status_code == 404 + assert response.get_json() == {"message":f"planet 100 not found"} + +def test_get_planets_optional_query_returns_seeded_planets(client, two_saved_planets): + response = client.get("/planets") + + assert response.status_code == 200 + planet_list = response.get_json() + assert len(planet_list) == 2 + assert planet_list[0]["id"] == 1 + assert planet_list[0]["name"] == "Mars" + assert planet_list[0]["description"] == "War planet" + assert planet_list[0]["radius"] == 2106.1 + assert planet_list[0]["num_moons"] == 2 + assert planet_list[0]["gravity"] == 3.721 + + assert planet_list[1]["id"] == 2 + assert planet_list[1]["name"] == "Venus" + assert planet_list[1]["description"] == "Planet Of Love" + assert planet_list[1]["radius"] == 3760.4 + assert planet_list[1]["num_moons"] == 1 + assert planet_list[1]["gravity"] == 8.874 + + +def test_create_one_planet(client): + # Act + response = client.post("/planets", json={ + "name": "Pluto", + "description": "like the dog", + "radius": 10000, + "num_moons": 123, + "gravity": 1234 + }) + response_body = response.get_data(as_text=True) + + # Assert + assert response.status_code == 201 + assert response_body == "Planet Pluto successfully created" + +def test_update_one_planet(client, two_saved_planets): + # Act + response = client.put("/planets/2", json={ + "name": "Jupiter", + "description": "Planet Of Luck", + "radius": 43441, + "num_moons":80, + "gravity": 24.79 + }) + response_body = response.get_data(as_text=True) + + # Assert + assert response.status_code == 200 + assert response_body == "Planet #2 successfully updated" + +def test_delete_one_planet(client, two_saved_planets): + # Act + response = client.delete("/planets/1") + response_body = response.get_data(as_text=True) + + # Assert + assert response.status_code == 200 + assert response_body == "Planet #1 successfully deleted" + + +def test__does_not_delete_planet_with_nonexistent_id(client, two_saved_planets): + # Act + response = client.delete("/planets/100") + + # Assert + assert response.status_code == 404 + assert response.get_json() == {"message": f"planet 100 not found"} + + +def test_does_not_update_one_planet_with_invalid_id(client, two_saved_planets): + # Act + response = client.put("/planets/helloworld", json={ + "name": "Jupiter", + "description": "Planet Of Luck", + "radius": 43441, + "num_moons":80, + "gravity": 24.79 + }) + + # Assert + assert response.status_code == 400 + assert response.get_json() == {"message":f"planet helloworld invalid"} + +def test_does_not_update_one_planet_with_nonexistent_id(client, two_saved_planets): + # Act + response = client.put("/planets/300", json={ + "name": "Jupiter", + "description": "Planet Of Luck", + "radius": 43441, + "num_moons":80, + "gravity": 24.79 + }) + + # Assert + assert response.status_code == 404 + assert response.get_json() == {"message":f"planet 300 not found"} \ No newline at end of file From 87d32e6b5eb6e8ef70270157b00d52ca74d34a70 Mon Sep 17 00:00:00 2001 From: diana Date: Tue, 3 Jan 2023 16:12:50 -0800 Subject: [PATCH 21/31] Fix code coverage --- app/models/planet.py | 3 --- app/routes.py | 2 -- tests/test_routes.py | 59 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 6 deletions(-) delete mode 100644 app/routes.py diff --git a/app/models/planet.py b/app/models/planet.py index 905061b5d..0ad4a016d 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -7,6 +7,3 @@ class Planet(db.Model): radius = db.Column(db.Float) num_moons = db.Column(db.Float) gravity = db.Column(db.Float) - - def to_string(self): - return f"{self.id}: {self.title} Description:{self.description}" \ No newline at end of file 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/tests/test_routes.py b/tests/test_routes.py index 2e7501ed9..a6337e593 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -34,6 +34,43 @@ def test_get_planets_optional_query_returns_seeded_planets(client, two_saved_pla assert planet_list[1]["num_moons"] == 1 assert planet_list[1]["gravity"] == 8.874 +def test_get_one_planet_with_name_param_asc_sort(client, two_saved_planets): + response = client.get("/planets?name=Mars&sort=asc") + + assert response.status_code == 200 + planet_list = response.get_json() + assert len(planet_list) == 1 + assert planet_list[0]["id"] == 1 + assert planet_list[0]["name"] == "Mars" + assert planet_list[0]["description"] == "War planet" + assert planet_list[0]["radius"] == 2106.1 + assert planet_list[0]["num_moons"] == 2 + assert planet_list[0]["gravity"] == 3.721 + +def test_get_one_planet_with_name_param_desc_sort(client, two_saved_planets): + response = client.get("/planets?name=Venus&sort=desc") + + assert response.status_code == 200 + planet_list = response.get_json() + assert len(planet_list) == 1 + assert planet_list[0]["id"] == 2 + assert planet_list[0]["name"] == "Venus" + assert planet_list[0]["description"] == "Planet Of Love" + assert planet_list[0]["radius"] == 3760.4 + assert planet_list[0]["num_moons"] == 1 + assert planet_list[0]["gravity"] == 8.874 + +def test_get_one_planet_by_id(client, two_saved_planets): + response = client.get("/planets/2") + + assert response.status_code == 200 + planet_list = response.get_json() + assert planet_list["id"] == 2 + assert planet_list["name"] == "Venus" + assert planet_list["description"] == "Planet Of Love" + assert planet_list["radius"] == 3760.4 + assert planet_list["num_moons"] == 1 + assert planet_list["gravity"] == 8.874 def test_create_one_planet(client): # Act @@ -110,4 +147,24 @@ def test_does_not_update_one_planet_with_nonexistent_id(client, two_saved_planet # Assert assert response.status_code == 404 - assert response.get_json() == {"message":f"planet 300 not found"} \ No newline at end of file + assert response.get_json() == {"message":f"planet 300 not found"} + +# def test_get_planets_optional_query_returns_seeded_planets(client, two_saved_planets): +# response = client.get("/planets") + +# assert response.status_code == 200 +# planet_list = response.get_json() +# assert len(planet_list) == 2 +# assert planet_list[0]["id"] == 1 +# assert planet_list[0]["name"] == "Mars" +# assert planet_list[0]["description"] == "War planet" +# assert planet_list[0]["radius"] == 2106.1 +# assert planet_list[0]["num_moons"] == 2 +# assert planet_list[0]["gravity"] == 3.721 + +# assert planet_list[1]["id"] == 2 +# assert planet_list[1]["name"] == "Venus" +# assert planet_list[1]["description"] == "Planet Of Love" +# assert planet_list[1]["radius"] == 3760.4 +# assert planet_list[1]["num_moons"] == 1 +# assert planet_list[1]["gravity"] == 8.874 \ No newline at end of file From 1be0f0a02e9d8157f1c1bea8db211f9abce8e46c Mon Sep 17 00:00:00 2001 From: diana Date: Wed, 4 Jan 2023 10:16:06 -0800 Subject: [PATCH 22/31] wave7: refactor to_dict --- app/models/planet.py | 12 ++++ app/planet_routes.py | 21 +------ tests/test_model.py | 145 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 19 deletions(-) create mode 100644 tests/test_model.py diff --git a/app/models/planet.py b/app/models/planet.py index 0ad4a016d..b5bac3158 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -7,3 +7,15 @@ class Planet(db.Model): radius = db.Column(db.Float) num_moons = db.Column(db.Float) gravity = db.Column(db.Float) + + def to_dict(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + "radius": self.radius, + "num_moons": self.num_moons, + "gravity": self.gravity + } + + diff --git a/app/planet_routes.py b/app/planet_routes.py index 048280d61..9ccfe0054 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -38,17 +38,7 @@ def read_all_planets(): planets = planet_query.all() planets_response = [] for planet in planets: - planets_response.append( - { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "radius": planet.radius, - "num_moons": planet.num_moons, - "gravity": planet.gravity - - } - ) + planets_response.append(planet.to_dict()) return jsonify(planets_response) def validate_planet(planet_id): @@ -67,14 +57,7 @@ def validate_planet(planet_id): @planets_bp.route("/", methods=["GET"]) def read_one_planet(planet_id): planet = validate_planet(planet_id) - return { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "radius": planet.radius, - "num_moons": planet.num_moons, - "gravity": planet.gravity - } + return planet.to_dict() @planets_bp.route("/", methods=["PUT"]) def update_book(planet_id): diff --git a/tests/test_model.py b/tests/test_model.py new file mode 100644 index 000000000..8e79e600e --- /dev/null +++ b/tests/test_model.py @@ -0,0 +1,145 @@ +from app.planet_routes import Planet + +def test_to_dict_no_missing_data(): + # Arrange + test_data = Planet(id = 1, + name="Mars", + description="watr 4evr", + radius=2106.1, + num_moons=2, + gravity=3.721 + ) + # Act + result = test_data.to_dict() + + # Assert + assert len(result) == 6 + assert result["id"] == 1 + assert result["name"] == "Mars" + assert result["description"] == "watr 4evr" + assert result["radius"] == 2106.1 + assert result["num_moons"] == 2 + assert result["gravity"] == 3.721 + + +def test_to_dict_missing_id(): + # Arrange + test_data = Planet(name="Mars", + description="watr 4evr", + radius=2106.1, + num_moons=2, + gravity=3.721 + ) + + # Act + result = test_data.to_dict() + + # Assert + assert len(result) == 6 + assert result["id"] is None + assert result["name"] == "Mars" + assert result["description"] == "watr 4evr" + assert result["radius"] == 2106.1 + assert result["num_moons"] == 2 + assert result["gravity"] == 3.721 + +def test_to_dict_missing_name(): + # Arrange + test_data = Planet(id=1, + description="watr 4evr", + radius=2106.1, + num_moons=2, + gravity=3.721 + ) + + # Act + result = test_data.to_dict() + + # Assert + assert len(result) == 6 + assert result["id"] == 1 + assert result["name"] is None + assert result["description"] == "watr 4evr" + assert result["radius"] == 2106.1 + assert result["num_moons"] == 2 + assert result["gravity"] == 3.721 + +def test_to_dict_missing_description(): + # Arrange + test_data = Planet(id=2, + name="Mars", + radius=2106.1, + num_moons=2, + gravity=3.721 + ) + # Act + result = test_data.to_dict() + + # Assert + assert len(result) == 6 + assert result["id"] == 2 + assert result["name"] == "Mars" + assert result["description"] is None + assert result["radius"] == 2106.1 + assert result["num_moons"] == 2 + assert result["gravity"] == 3.721 + +def test_to_dict_missing_radius(): + # Arrange + test_data = Planet(id=2, + name="Mars", + description="watr 4evr", + num_moons=2, + gravity=3.721 + ) + # Act + result = test_data.to_dict() + + # Assert + assert len(result) == 6 + assert result["id"] == 2 + assert result["name"] == "Mars" + assert result["description"] == "watr 4evr" + assert result["radius"] is None + assert result["num_moons"] == 2 + assert result["gravity"] == 3.721 + +def test_to_dict_missing_number_of_moons(): + # Arrange + test_data = Planet(id=2, + name="Mars", + description="watr 4evr", + radius=2106.1, + gravity=3.721 + ) + # Act + result = test_data.to_dict() + + # Assert + assert len(result) == 6 + assert result["id"] == 2 + assert result["name"] == "Mars" + assert result["description"] == "watr 4evr" + assert result["radius"] == 2106.1 + assert result["num_moons"] is None + assert result["gravity"] == 3.721 + +def test_to_dict_missing_gravity(): + # Arrange + test_data = Planet(id=2, + description="watr 4evr", + name="Mars", + radius=2106.1, + num_moons=2, + ) + # Act + result = test_data.to_dict() + + # Assert + assert len(result) == 6 + assert result["id"] == 2 + assert result["name"] == "Mars" + assert result["description"] == "watr 4evr" + assert result["radius"] == 2106.1 + assert result["num_moons"] == 2 + assert result["gravity"] is None \ No newline at end of file From f1f17a7617ed8c7332fccba3acac407f23a93c09 Mon Sep 17 00:00:00 2001 From: diana Date: Wed, 4 Jan 2023 12:38:54 -0800 Subject: [PATCH 23/31] wave7: refactor and added from_dict --- app/models/planet.py | 9 ++++++ app/planet_routes.py | 38 +++-------------------- tests/test_model.py | 73 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 85 insertions(+), 35 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index b5bac3158..14a16b6f9 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -18,4 +18,13 @@ def to_dict(self): "gravity": self.gravity } + @classmethod + def from_dict(cls, planet_data): + new_planet = Planet(name=planet_data["name"], + description=planet_data["description"], + radius=planet_data["radius"], + num_moons=planet_data["num_moons"], + gravity=planet_data["gravity"] + ) + return new_planet diff --git a/app/planet_routes.py b/app/planet_routes.py index 9ccfe0054..2c88cb146 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -9,12 +9,7 @@ @planets_bp.route("", methods=["POST"]) def create_planet(): request_body = request.get_json() - new_planet = Planet(name=request_body["name"], - description=request_body["description"], - radius=request_body["radius"], - num_moons=request_body["num_moons"], - gravity=request_body["gravity"] - ) + new_planet = Planet.from_dict(request_body) db.session.add(new_planet) db.session.commit() @@ -60,10 +55,11 @@ def read_one_planet(planet_id): return planet.to_dict() @planets_bp.route("/", methods=["PUT"]) -def update_book(planet_id): +def update_planet(planet_id): planet = validate_planet(planet_id) request_body = request.get_json() + # new_planet = Planet.from_dict(request_body) planet.name = request_body["name"] planet.description = request_body["description"] @@ -77,36 +73,10 @@ def update_book(planet_id): @planets_bp.route("/", methods=["DELETE"]) -def delete_book(planet_id): +def delete_planet(planet_id): planet = validate_planet(planet_id) db.session.delete(planet) db.session.commit() return make_response(f"Planet #{planet.id} successfully deleted") - - -# @planets_bp.route("//greater_gravity", methods=["GET"]) -# def find_planets_with_greater_gravity(planet_id): -# planets_with_greater_gravity = [] -# planet = validate_planet(planet_id) -# # retrieve that planets gravity value -# current_planet_gravity = planet.gravity -# for planet in planets: -# if planet.gravity > current_planet_gravity: -# planets_with_greater_gravity.append(planet.to_dict()) -# return jsonify(planets_with_greater_gravity) - -# @planets_bp.route("//greater_radius", methods=["GET"]) -# def find_planets_with_greater_radius(planet_id): -# planets_with_greater_radius = [] -# planet = validate_planet(planet_id) -# # retrieve that planets gravity value -# current_planet_radius = planet.radius -# for planet in planets: -# if planet.radius > current_planet_radius: -# planets_with_greater_radius.append(planet.to_dict()) -# return jsonify(planets_with_greater_radius) - - - diff --git a/tests/test_model.py b/tests/test_model.py index 8e79e600e..788fd1ce8 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1,4 +1,5 @@ from app.planet_routes import Planet +import pytest def test_to_dict_no_missing_data(): # Arrange @@ -142,4 +143,74 @@ def test_to_dict_missing_gravity(): assert result["description"] == "watr 4evr" assert result["radius"] == 2106.1 assert result["num_moons"] == 2 - assert result["gravity"] is None \ No newline at end of file + assert result["gravity"] is None + +# from_dict tests + +def test_from_dict_returns_planet(): + # Arrange + planet_data = { + "name": "Mars", + "description": "watr 4evr", + "radius": 2106.1, + "num_moons": 2, + "gravity": 3.721 + } + + # Act + result = Planet.from_dict(planet_data) + + # Assert + assert result.name == "Mars" + assert result.description == "watr 4evr" + assert result.radius == 2106.1 + assert result.num_moons == 2 + assert result.gravity == 3.721 + +def test_from_dict_with_no_name(): + # Arrange + planet_data = { + "description": "watr 4evr", + "radius": 2106.1, + "num_moons": 2, + "gravity": 3.721 + } + + # Act & Assert + with pytest.raises(KeyError, match = 'name'): + result = Planet.from_dict(planet_data) + + +def test_from_dict_with_no_description(): + # Arrange + planet_data = { + "name": "Mars", + "radius": 2106.1, + "num_moons": 2, + "gravity": 3.721 + } + + # Act & Assert + with pytest.raises(KeyError, match = 'description'): + result = Planet.from_dict(planet_data) + +def test_from_dict_with_extra_keys(): + # Arrange + planet_data = { + "name": "Mars", + "description": "watr 4evr", + "radius": 2106.1, + "num_moons": 2, + "gravity": 3.721, + "extra": "new stuff" + } + + # Act + result = Planet.from_dict(planet_data) + + # Assert + assert result.name == "Mars" + assert result.description == "watr 4evr" + assert result.radius == 2106.1 + assert result.num_moons == 2 + assert result.gravity == 3.721 From 1f3c9464d313c96248e78d04e93c3b107db7c273 Mon Sep 17 00:00:00 2001 From: diana Date: Wed, 4 Jan 2023 13:12:41 -0800 Subject: [PATCH 24/31] wave7: refactored valid_planet --- app/planet_routes.py | 22 ++++---- tests/test_routes.py | 116 ++++++++++++++++++++++++++++--------------- 2 files changed, 88 insertions(+), 50 deletions(-) diff --git a/app/planet_routes.py b/app/planet_routes.py index 2c88cb146..760932544 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -36,27 +36,27 @@ def read_all_planets(): planets_response.append(planet.to_dict()) return jsonify(planets_response) -def validate_planet(planet_id): +def validate_model(cls, model_id): try: - planet_id = int(planet_id) + model_id = int(model_id) except: - abort(make_response({"message":f"planet {planet_id} invalid"}, 400)) + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) - planet = Planet.query.get(planet_id) + model = cls.query.get(model_id) - if not planet: - abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) - return planet + return model @planets_bp.route("/", methods=["GET"]) def read_one_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_model(Planet, planet_id) return planet.to_dict() @planets_bp.route("/", methods=["PUT"]) def update_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_model(Planet, planet_id) request_body = request.get_json() # new_planet = Planet.from_dict(request_body) @@ -68,13 +68,13 @@ def update_planet(planet_id): planet.gravity = request_body["gravity"] db.session.commit() - + # new_planet = Planet.from_dict(request_body) return make_response(f"Planet #{planet.id} successfully updated") @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): - planet = validate_planet(planet_id) + planet = validate_model(Planet, planet_id) db.session.delete(planet) db.session.commit() diff --git a/tests/test_routes.py b/tests/test_routes.py index a6337e593..b2f9dcda4 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,3 +1,8 @@ +from werkzeug.exceptions import HTTPException +from app.planet_routes import validate_model +from app.models.planet import Planet +import pytest + def test_get_planets_empty_db_returns_empty_list(client): # Act response = client.get("/planets") @@ -12,7 +17,7 @@ def test_get_planet_with_id_empty_db_returns_404(client): # Assert assert response.status_code == 404 - assert response.get_json() == {"message":f"planet 100 not found"} + assert response.get_json() == {"message":f"Planet 100 not found"} def test_get_planets_optional_query_returns_seeded_planets(client, two_saved_planets): response = client.get("/planets") @@ -87,21 +92,6 @@ def test_create_one_planet(client): assert response.status_code == 201 assert response_body == "Planet Pluto successfully created" -def test_update_one_planet(client, two_saved_planets): - # Act - response = client.put("/planets/2", json={ - "name": "Jupiter", - "description": "Planet Of Luck", - "radius": 43441, - "num_moons":80, - "gravity": 24.79 - }) - response_body = response.get_data(as_text=True) - - # Assert - assert response.status_code == 200 - assert response_body == "Planet #2 successfully updated" - def test_delete_one_planet(client, two_saved_planets): # Act response = client.delete("/planets/1") @@ -112,13 +102,21 @@ def test_delete_one_planet(client, two_saved_planets): assert response_body == "Planet #1 successfully deleted" -def test__does_not_delete_planet_with_nonexistent_id(client, two_saved_planets): +def test_does_not_delete_planet_with_invalid_id(client, two_saved_planets): + # Act + response = client.delete("/planets/helloworld") + + # Assert + assert response.status_code == 400 + assert response.get_json() == {"message": f"Planet helloworld invalid"} + +def test_does_not_delete_planet_with_nonexistent_id(client, two_saved_planets): # Act response = client.delete("/planets/100") # Assert assert response.status_code == 404 - assert response.get_json() == {"message": f"planet 100 not found"} + assert response.get_json() == {"message":f"Planet 100 not found"} def test_does_not_update_one_planet_with_invalid_id(client, two_saved_planets): @@ -133,7 +131,7 @@ def test_does_not_update_one_planet_with_invalid_id(client, two_saved_planets): # Assert assert response.status_code == 400 - assert response.get_json() == {"message":f"planet helloworld invalid"} + assert response.get_json() == {"message":f"Planet helloworld invalid"} def test_does_not_update_one_planet_with_nonexistent_id(client, two_saved_planets): # Act @@ -147,24 +145,64 @@ def test_does_not_update_one_planet_with_nonexistent_id(client, two_saved_planet # Assert assert response.status_code == 404 - assert response.get_json() == {"message":f"planet 300 not found"} - -# def test_get_planets_optional_query_returns_seeded_planets(client, two_saved_planets): -# response = client.get("/planets") - -# assert response.status_code == 200 -# planet_list = response.get_json() -# assert len(planet_list) == 2 -# assert planet_list[0]["id"] == 1 -# assert planet_list[0]["name"] == "Mars" -# assert planet_list[0]["description"] == "War planet" -# assert planet_list[0]["radius"] == 2106.1 -# assert planet_list[0]["num_moons"] == 2 -# assert planet_list[0]["gravity"] == 3.721 + assert response.get_json() == {"message":f"Planet 300 not found"} + +def test_update_one_planet(client, two_saved_planets): + # Act + response = client.put("/planets/2", json={ + "name": "Jupiter", + "description": "Planet Of Luck", + "radius": 43441, + "num_moons":80, + "gravity": 24.79 + }) + response_body = response.get_data(as_text=True) + + # Assert + assert response.status_code == 200 + assert response_body == "Planet #2 successfully updated" + +def test_update_planet_with_extra_keys(client, two_saved_planets): + # Arrange + planet_data = { + "extra": "some stuff", + "name": "Jupiter", + "description": "Planet Of Luck", + "radius": 43441, + "num_moons":80, + "gravity": 24.79 + } + + # Act + response = client.put("/planets/1", json=planet_data) + response_body = response.get_data(as_text=True) + + # Assert + assert response.status_code == 200 + assert response_body == "Planet #1 successfully updated" + +def test_validate_model(two_saved_planets): + # Act + result_planet = validate_model(Planet, 2) + + # Assert + assert result_planet.id == 2 + assert result_planet.name == "Venus" + assert result_planet.description == "Planet Of Love" + assert result_planet.radius == 3760.4 + assert result_planet.num_moons == 1 + assert result_planet.gravity == 8.874 + +def test_validate_model_missing_id(two_saved_planets): + # Act & Assert + # Calling `validate_book` without being invoked by a route will + # cause an `HTTPException` when an `abort` statement is reached + with pytest.raises(HTTPException): + result_planet = validate_model(Planet, "3") -# assert planet_list[1]["id"] == 2 -# assert planet_list[1]["name"] == "Venus" -# assert planet_list[1]["description"] == "Planet Of Love" -# assert planet_list[1]["radius"] == 3760.4 -# assert planet_list[1]["num_moons"] == 1 -# assert planet_list[1]["gravity"] == 8.874 \ No newline at end of file +def test_validate_model_invalid_id(two_saved_planets): + # Act & Assert + # Calling `validate_book` without being invoked by a route will + # cause an `HTTPException` when an `abort` statement is reached + with pytest.raises(HTTPException): + result_planet = validate_model(Planet, "helloworld") \ No newline at end of file From dae1b0650e55c35453ff050d9e03bec9c4d7b7ba Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Thu, 5 Jan 2023 10:30:58 -0800 Subject: [PATCH 25/31] Co-authored-by: Diana --- tests/test_planet_routes.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/test_planet_routes.py diff --git a/tests/test_planet_routes.py b/tests/test_planet_routes.py deleted file mode 100644 index e69de29bb..000000000 From 440bd7cf6e5c94f38e395770da75d0f6d0534034 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Thu, 5 Jan 2023 11:48:50 -0800 Subject: [PATCH 26/31] Added Moon Model and Nested Routes --- app/__init__.py | 3 ++ app/models/moon.py | 26 ++++++++++ app/models/planet.py | 22 ++++++--- app/moon_routes.py | 73 ++++++++++++++++++++++++++++ app/planet_routes.py | 25 ++++++++++ migrations/versions/24c23c9197c9_.py | 36 ++++++++++++++ 6 files changed, 177 insertions(+), 8 deletions(-) create mode 100644 app/models/moon.py create mode 100644 app/moon_routes.py create mode 100644 migrations/versions/24c23c9197c9_.py diff --git a/app/__init__.py b/app/__init__.py index ada58a845..3302fe29e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -26,5 +26,8 @@ def create_app(test_config=None): from .planet_routes import planets_bp app.register_blueprint(planets_bp) + + from .moon_routes import moons_bp + app.register_blueprint(moons_bp) return app diff --git a/app/models/moon.py b/app/models/moon.py new file mode 100644 index 000000000..a01b2798a --- /dev/null +++ b/app/models/moon.py @@ -0,0 +1,26 @@ +from app import db + +class Moon(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String, nullable=False) + size = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + planet_id = db.Column(db.Integer, db.ForeignKey("planet.id")) + planet = db.relationship("Planet", back_populates="moons") + + def to_dict(self): + moon_dict = {} + moon_dict["id"] = self.id + moon_dict["name"] = self.name + moon_dict["size"] = self.size + moon_dict["description"] = self.description + return moon_dict + + @classmethod + def from_dict(cls, moon_data): + new_moon = Moon( + name = moon_data["name"], + size = moon_data["size"], + description = moon_data["description"] + ) + return new_moon \ No newline at end of file diff --git a/app/models/planet.py b/app/models/planet.py index 14a16b6f9..ad9b2a57a 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -7,16 +7,22 @@ class Planet(db.Model): radius = db.Column(db.Float) num_moons = db.Column(db.Float) gravity = db.Column(db.Float) + moons = db.relationship("Moon", back_populates="planet") def to_dict(self): - return { - "id": self.id, - "name": self.name, - "description": self.description, - "radius": self.radius, - "num_moons": self.num_moons, - "gravity": self.gravity - } + planet_dict = {} + planet_dict["id"] = self.id + planet_dict["name"] = self.name + planet_dict["description"] = self.name + planet_dict["radius"] = self.name + planet_dict["num_moons"] = self.name + planet_dict["gravity"] = self.name + + moon_names = [] + for moon in self.moons: + moon_names.append(moon.name) + planet_dict["cats"] = moon_names + return planet_dict @classmethod def from_dict(cls, planet_data): diff --git a/app/moon_routes.py b/app/moon_routes.py new file mode 100644 index 000000000..d55807180 --- /dev/null +++ b/app/moon_routes.py @@ -0,0 +1,73 @@ +from app import db +from app.models.moon import Moon +from app.planet_routes import validate_model +from flask import Blueprint, jsonify, make_response, request + +moons_bp = Blueprint("moons_bp", __name__, url_prefix="/moons") + +@moons_bp.route("", methods=["POST"]) +def create_moon(): + moon_data = request.get_json() + new_moon = Moon.from_dict(moon_data) + + db.session.add(new_moon) + db.session.commit() + + return make_response(f"Moon {new_moon.name} created", 201) + +@moons_bp.route("", methods=["GET"]) +def get_moons_optional_query(): + moon_query = Moon.query + + name_query = request.args.get("name") + if name_query: + # Case sensitive, exact match + # cat_query = cat_query.filter_by(breed=breed_query) + + # Case sensitive, partial match + # cat_query = cat_query.filter(Cat.breed.contains(breed_query)) + + # Case insensitive, partial match + moon_query = moon_query.filter(Moon.name.ilike(f"%{name_query}%")) + + sort_query = request.args.get("sort") + if sort_query: + if sort_query == "desc": + moon_query = moon_query.order_by(Moon.size.desc()) + else: + moon_query = moon_query.order_by(Moon.size.asc()) + + moons = moon_query.all() + moon_response = [] + for moon in moons: + moon_response.append(moon.to_dict()) + + return jsonify(moon_response) + +@moons_bp.route("/", methods=["GET"]) +def get_moon_by_id(moon_id): + moon_to_return = validate_model(Moon, moon_id) + + return jsonify(moon_to_return.to_dict()) + +@moons_bp.route("/", methods=["PUT"]) +def replace_moon_with_id(moon_id): + moon_data = request.get_json() + moon_to_update = validate_model(Moon, moon_id) + + moon_to_update.name = moon_data["name"], + moon_to_update.size = moon_data["size"], + moon_to_update.description = moon_data["description"], + + db.session.commit() + + return make_response(f"Moon {moon_to_update.name} updated", 200) + +@moons_bp.route("/", methods=["DELETE"]) +def delete_moons_by_id(moon_id): + moon_to_delete = validate_model(Moon, moon_id) + db.session.delete(moon_to_delete) + db.session.commit() + + return make_response(f"Moon {moon_to_delete.name} deleted", 200) + diff --git a/app/planet_routes.py b/app/planet_routes.py index c7429aa5e..be87a77ce 100644 --- a/app/planet_routes.py +++ b/app/planet_routes.py @@ -1,6 +1,7 @@ from app import db from app.models.planet import Planet from flask import Blueprint, jsonify, abort, make_response, request +from app.models.moon import Moon planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") @@ -82,3 +83,27 @@ def delete_planet(planet_id): return make_response(f"Planet #{planet.id} successfully deleted") +@planets_bp.route("//moons", methods=["POST"]) +def add_new_moon_to_planet(planet_id): + planet = validate_model(Planet, planet_id) + + request_body = request.get_json() + new_moon = Moon.from_dict(request_body) + new_moon.planet = planet + + db.session.add(new_moon) + db.session.commit() + + message = f"Moon {new_moon.name} created with Planet{planet.name}" + return make_response(jsonify(message), 201) + +@planets_bp.route("//moons", methods=["GET"]) +def get_all_moons_for_planet(planet_id): + planet = validate_model(Planet, planet_id) + + moons_response = [] + for moon in planet.moons: + moons_response.append(moon.to_dict()) + + return jsonify(moons_response) + diff --git a/migrations/versions/24c23c9197c9_.py b/migrations/versions/24c23c9197c9_.py new file mode 100644 index 000000000..9ec66440c --- /dev/null +++ b/migrations/versions/24c23c9197c9_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: 24c23c9197c9 +Revises: abe0497758b8 +Create Date: 2023-01-05 11:25:18.625903 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '24c23c9197c9' +down_revision = 'abe0497758b8' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('moon', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=False), + sa.Column('size', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('planet_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['planet_id'], ['planet.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('moon') + # ### end Alembic commands ### From 2483ee677de7e61264c57abd8af1cf9b8320065b Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Thu, 5 Jan 2023 11:54:25 -0800 Subject: [PATCH 27/31] Added Moon Model and Nested Routes New one --- app/models/planet.py | 2 +- app/moon_routes.py | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index ad9b2a57a..54d86b937 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -21,7 +21,7 @@ def to_dict(self): moon_names = [] for moon in self.moons: moon_names.append(moon.name) - planet_dict["cats"] = moon_names + planet_dict["moon"] = moon_names return planet_dict @classmethod diff --git a/app/moon_routes.py b/app/moon_routes.py index d55807180..f1a8ce6fe 100644 --- a/app/moon_routes.py +++ b/app/moon_routes.py @@ -21,13 +21,6 @@ def get_moons_optional_query(): name_query = request.args.get("name") if name_query: - # Case sensitive, exact match - # cat_query = cat_query.filter_by(breed=breed_query) - - # Case sensitive, partial match - # cat_query = cat_query.filter(Cat.breed.contains(breed_query)) - - # Case insensitive, partial match moon_query = moon_query.filter(Moon.name.ilike(f"%{name_query}%")) sort_query = request.args.get("sort") From 7ea390e20f0484dad80c8a63b59484bba0334622 Mon Sep 17 00:00:00 2001 From: diana Date: Sun, 8 Jan 2023 17:43:01 -0800 Subject: [PATCH 28/31] Add gunicorn adn procfile for heroku deployment --- Procfile | 1 + requirements.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5561ec1de..f1c31b3f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ coverage==6.5.0 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 +gunicorn==20.1.0 idna==2.10 iniconfig==1.1.1 itsdangerous==1.1.0 From 1209eec30166a052a112a5cad4b535f12618a6c6 Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Sun, 8 Jan 2023 20:16:42 -0800 Subject: [PATCH 29/31] Deployement procfile --- Procfile | 1 + requirements.txt | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5561ec1de..1783ca42f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ alembic==1.5.4 -attrs==22.1.0 +attrs==21.2.0 autopep8==1.5.5 blinker==1.4 certifi==2020.12.5 @@ -9,17 +9,19 @@ coverage==6.5.0 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 +gunicorn==20.1.0 idna==2.10 iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 -packaging==22.0 +packaging==21.2 pluggy==1.0.0 psycopg2-binary==2.9.4 -py==1.11.0 +py==1.10.0 pycodestyle==2.6.0 +pyparsing==2.4.7 pytest==7.1.1 pytest-cov==2.12.1 python-dateutil==2.8.1 @@ -30,5 +32,5 @@ six==1.15.0 SQLAlchemy==1.3.23 toml==0.10.2 tomli==2.0.1 -urllib3==1.26.4 +urllib3==1.26.5 Werkzeug==1.0.1 From 6d2dd5b458582d411e11fe21fba509927dd1533d Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Sun, 8 Jan 2023 20:34:58 -0800 Subject: [PATCH 30/31] Deployement procfile 1 --- migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 migrations/env.py 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 0803b6b731964cd3a0b48542d6ee1cb7bd424a0f Mon Sep 17 00:00:00 2001 From: Supriya Chavan Date: Sun, 8 Jan 2023 21:01:09 -0800 Subject: [PATCH 31/31] Modified tests --- app/models/planet.py | 8 ++++---- tests/test_model.py | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 54d86b937..0e94a5a11 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -13,10 +13,10 @@ def to_dict(self): planet_dict = {} planet_dict["id"] = self.id planet_dict["name"] = self.name - planet_dict["description"] = self.name - planet_dict["radius"] = self.name - planet_dict["num_moons"] = self.name - planet_dict["gravity"] = self.name + planet_dict["description"] = self.description + planet_dict["radius"] = self.radius + planet_dict["num_moons"] = self.num_moons + planet_dict["gravity"] = self.gravity moon_names = [] for moon in self.moons: diff --git a/tests/test_model.py b/tests/test_model.py index 788fd1ce8..ec33a84c1 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -14,7 +14,7 @@ def test_to_dict_no_missing_data(): result = test_data.to_dict() # Assert - assert len(result) == 6 + assert len(result) == 7 assert result["id"] == 1 assert result["name"] == "Mars" assert result["description"] == "watr 4evr" @@ -36,7 +36,7 @@ def test_to_dict_missing_id(): result = test_data.to_dict() # Assert - assert len(result) == 6 + assert len(result) == 7 assert result["id"] is None assert result["name"] == "Mars" assert result["description"] == "watr 4evr" @@ -57,7 +57,7 @@ def test_to_dict_missing_name(): result = test_data.to_dict() # Assert - assert len(result) == 6 + assert len(result) == 7 assert result["id"] == 1 assert result["name"] is None assert result["description"] == "watr 4evr" @@ -77,7 +77,7 @@ def test_to_dict_missing_description(): result = test_data.to_dict() # Assert - assert len(result) == 6 + assert len(result) == 7 assert result["id"] == 2 assert result["name"] == "Mars" assert result["description"] is None @@ -97,7 +97,7 @@ def test_to_dict_missing_radius(): result = test_data.to_dict() # Assert - assert len(result) == 6 + assert len(result) == 7 assert result["id"] == 2 assert result["name"] == "Mars" assert result["description"] == "watr 4evr" @@ -117,7 +117,7 @@ def test_to_dict_missing_number_of_moons(): result = test_data.to_dict() # Assert - assert len(result) == 6 + assert len(result) == 7 assert result["id"] == 2 assert result["name"] == "Mars" assert result["description"] == "watr 4evr" @@ -137,7 +137,7 @@ def test_to_dict_missing_gravity(): result = test_data.to_dict() # Assert - assert len(result) == 6 + assert len(result) == 7 assert result["id"] == 2 assert result["name"] == "Mars" assert result["description"] == "watr 4evr"