From 871339d4bd88d6afb411723a76af51ab6e4cd4a9 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Fri, 21 Apr 2023 20:12:09 -0500 Subject: [PATCH 01/25] wave-01 complete --- app/__init__.py | 3 +++ app/routes.py | 30 +++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..bae5e50fc 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,5 +3,8 @@ def create_app(test_config=None): app = Flask(__name__) + + from .routes import planets_bp + app.register_blueprint(planets_bp) return app diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..ce286d401 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,30 @@ -from flask import Blueprint +from flask import Blueprint, jsonify +class Planet: + def __init__(self, id, name, description, size): + self.id = id + self.name = name + self.description = description + self.size = size + +planets = [ + Planet(1, "Earth", "habitable", "12742km in diameter"), + Planet(2, "Mercury", "inhabitable", "4880km in diameter"), + Planet(3, "Venus", "inhabitable", "12104km in diameter"), + Planet(4, "Mars", "inhabitable", "6779km in diameter"), + Planet(5, "Jupiter", "inhabitable", "139822km in diameter"), + Planet(6, "Saturn", "inhabitable", "116460km in diameter") +] + +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +@planets_bp.route("", methods=["GET"]) +def get_list_of_planets(): + results =[] + for planet in planets: + results.append(dict( + id=planet.id, + name=planet.name, + description=planet.description, + size=planet.size + )) + return jsonify(results) \ No newline at end of file From 70d78c0c397a1373c7b0cf28a94897f2ee75037e Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Fri, 21 Apr 2023 18:16:35 -0700 Subject: [PATCH 02/25] [WIP] - Wave 1 --- app/routes.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..426a4bb06 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,18 @@ from flask import Blueprint +class Planet: + def __init__(self, id, name, description, size): + self.id = id + self.name = name + self.description = description + self.size = size + +planets = [ + Planet(1, "Earth", "habitable", "12742km in diameter"), + Planet(2, "Mercury", "inhabitable", "4880km in diameter"), + Planet(3, "Venus", "inhabitable", "12104km in diameter"), + Planet(4, "Mars", "inhabitable", "6779km in diameter"), + Planet(5, "Jupiter", "inhabitable", "139822km in diameter"), + Planet(6, "Saturn", "inhabitable", "116460km in diameter") +] + From 789c169c33c4f9dfe5139e540a074849acf6d0e8 Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Fri, 21 Apr 2023 18:20:09 -0700 Subject: [PATCH 03/25] RESOLVED MERGE CONFLICT --- app/routes.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app/routes.py b/app/routes.py index 7406f1643..ce286d401 100644 --- a/app/routes.py +++ b/app/routes.py @@ -7,22 +7,6 @@ def __init__(self, id, name, description, size): self.description = description self.size = size -class Planet: - def __init__(self, id, name, description, size): - self.id = id - self.name = name - self.description = description - self.size = size - -planets = [ - Planet(1, "Earth", "habitable", "12742km in diameter"), - Planet(2, "Mercury", "inhabitable", "4880km in diameter"), - Planet(3, "Venus", "inhabitable", "12104km in diameter"), - Planet(4, "Mars", "inhabitable", "6779km in diameter"), - Planet(5, "Jupiter", "inhabitable", "139822km in diameter"), - Planet(6, "Saturn", "inhabitable", "116460km in diameter") -] - planets = [ Planet(1, "Earth", "habitable", "12742km in diameter"), Planet(2, "Mercury", "inhabitable", "4880km in diameter"), From 69c7a101a84b3a1fb5853c346e6bfee34867c8c0 Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Fri, 21 Apr 2023 20:02:14 -0700 Subject: [PATCH 04/25] Wave 02 - Refactoring --- app/__init__.py | 1 + app/routes.py | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index bae5e50fc..1a03e5d1a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,4 +7,5 @@ def create_app(test_config=None): from .routes import planets_bp app.register_blueprint(planets_bp) + return app diff --git a/app/routes.py b/app/routes.py index ce286d401..6d17360d2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -27,4 +27,24 @@ def get_list_of_planets(): description=planet.description, size=planet.size )) - return jsonify(results) \ No newline at end of file + return jsonify(results) + + +planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +@planets_bp.route("/", methods=["GET"]) +def get_planet(planet_id): + try: + planet_id=int(planet_id) + except: + return {"message": f"planet {planet_id} invalid"}, 400 + for planet in planets: + if planet.id == planet_id: + return dict( + id=planet.id, + name=planet.name, + description=planet.description, + size=planet.size + ) + + return {"message": f"planet {planet_id} not found"}, 404 + From 3918b026faadadc6a917767cf27e3f123a7f7823 Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Sat, 22 Apr 2023 13:42:48 -0700 Subject: [PATCH 05/25] Finished Wave 2 --- app/routes.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/routes.py b/app/routes.py index 6d17360d2..e3ec654eb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,5 @@ -from flask import Blueprint, jsonify +from flask import Blueprint, jsonify, abort, make_response + class Planet: def __init__(self, id, name, description, size): @@ -29,22 +30,27 @@ def get_list_of_planets(): )) return jsonify(results) - planets_bp = Blueprint("planets", __name__, url_prefix="/planets") @planets_bp.route("/", methods=["GET"]) def get_planet(planet_id): + planet = validate_planet(planet_id) + return dict( + id=planet.id, + name=planet.name, + description=planet.description, + size=planet.size + ) + + +def validate_planet(planet_id): try: planet_id=int(planet_id) except: - return {"message": f"planet {planet_id} invalid"}, 400 + abort(make_response({"message": f"planet {planet_id} invalid"}, 400)) + for planet in planets: if planet.id == planet_id: - return dict( - id=planet.id, - name=planet.name, - description=planet.description, - size=planet.size - ) - - return {"message": f"planet {planet_id} not found"}, 404 - + return planet + + abort(make_response({"message": f"planet {planet_id} not found"}, 404)) + \ No newline at end of file From 70352de029b96ae6f056c1b34227a69786cc865f Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Sat, 22 Apr 2023 15:53:15 -0500 Subject: [PATCH 06/25] refactor wave 2 --- app/routes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index e3ec654eb..31b0864a2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -47,10 +47,10 @@ def validate_planet(planet_id): planet_id=int(planet_id) except: abort(make_response({"message": f"planet {planet_id} invalid"}, 400)) - + for planet in planets: if planet.id == planet_id: return planet - + abort(make_response({"message": f"planet {planet_id} not found"}, 404)) - \ No newline at end of file + From f7c4666be27b3e453d38a38401631e1187b82a4e Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Mon, 24 Apr 2023 14:46:41 -0700 Subject: [PATCH 07/25] Finished wave 1 & Wave 2 --- app/routes.py | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/routes.py b/app/routes.py index e3ec654eb..f54d94946 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,5 @@ from flask import Blueprint, jsonify, abort, make_response - class Planet: def __init__(self, id, name, description, size): self.id = id @@ -8,6 +7,14 @@ def __init__(self, id, name, description, size): self.description = description self.size = size + def create_dict(self): + return dict( + id=self.id, + name=self.name, + description=self.description, + size=self.size + ) + planets = [ Planet(1, "Earth", "habitable", "12742km in diameter"), Planet(2, "Mercury", "inhabitable", "4880km in diameter"), @@ -18,29 +25,6 @@ def __init__(self, id, name, description, size): ] planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -@planets_bp.route("", methods=["GET"]) -def get_list_of_planets(): - results =[] - for planet in planets: - results.append(dict( - id=planet.id, - name=planet.name, - description=planet.description, - size=planet.size - )) - return jsonify(results) - -planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -@planets_bp.route("/", methods=["GET"]) -def get_planet(planet_id): - planet = validate_planet(planet_id) - return dict( - id=planet.id, - name=planet.name, - description=planet.description, - size=planet.size - ) - def validate_planet(planet_id): try: @@ -53,4 +37,20 @@ def validate_planet(planet_id): return planet abort(make_response({"message": f"planet {planet_id} not found"}, 404)) + + +@planets_bp.route("", methods=["GET"]) +def get_list_of_planets(): + results =[] + for planet in planets: + results.append(planet.create_dict()) + return jsonify(results) + +@planets_bp.route("/", methods=["GET"]) +def get_planet(planet_id): + planet = validate_planet(planet_id) + return planet.create_dict() + + + \ No newline at end of file From 9dccaaa74911dcc1884ee01333370043c5165c1d Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Fri, 28 Apr 2023 12:59:07 -0500 Subject: [PATCH 08/25] adds more attributes --- app/routes.py | 70 ++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/app/routes.py b/app/routes.py index 2e9caddc3..cf03ee016 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,56 +1,62 @@ from flask import Blueprint, jsonify, abort, make_response class Planet: - def __init__(self, id, name, description, size): + def __init__(self, id, name, description, size, parent_planet, habitable, gravity, nickname): self.id = id self.name = name self.description = description self.size = size + self.parent_planet = parent_planet + self.habitable = habitable + self.gravity = gravity + self.nickname = nickname def create_dict(self): return dict( id=self.id, name=self.name, description=self.description, - size=self.size - ) + size=self.size, + parent_planet = self.parent_planet, + habitable = self.habitable, + gravity = self.gravity, + nickname = self.nickname -planets = [ - Planet(1, "Earth", "habitable", "12742km in diameter"), - Planet(2, "Mercury", "inhabitable", "4880km in diameter"), - Planet(3, "Venus", "inhabitable", "12104km in diameter"), - Planet(4, "Mars", "inhabitable", "6779km in diameter"), - Planet(5, "Jupiter", "inhabitable", "139822km in diameter"), - Planet(6, "Saturn", "inhabitable", "116460km in diameter") -] + ) planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -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 +# planets = [ +# Planet(1, "Earth", "habitable", "12742km in diameter"), +# Planet(2, "Mercury", "inhabitable", "4880km in diameter"), +# Planet(3, "Venus", "inhabitable", "12104km in diameter"), +# Planet(4, "Mars", "inhabitable", "6779km in diameter"), +# Planet(5, "Jupiter", "inhabitable", "139822km in diameter"), +# Planet(6, "Saturn", "inhabitable", "116460km in diameter") +# ] - abort(make_response({"message": f"planet {planet_id} not found"}, 404)) +# def validate_planet(planet_id): +# try: +# planet_id=int(planet_id) +# except: +# abort(make_response({"message": f"planet {planet_id} invalid"}, 400)) -@planets_bp.route("", methods=["GET"]) -def get_list_of_planets(): - results =[] - for planet in planets: - results.append(planet.create_dict()) - return jsonify(results) +# for planet in planets: +# if planet.id == planet_id: +# return planet -@planets_bp.route("/", methods=["GET"]) -def get_planet(planet_id): - planet = validate_planet(planet_id) - return planet.create_dict() +# abort(make_response({"message": f"planet {planet_id} not found"}, 404)) +# @planets_bp.route("", methods=["GET"]) +# def get_list_of_planets(): +# results =[] +# for planet in planets: +# results.append(planet.create_dict()) +# return jsonify(results) - \ No newline at end of file +# @planets_bp.route("/", methods=["GET"]) +# def get_planet(planet_id): +# planet = validate_planet(planet_id) +# return planet.create_dict() From 130caac908a2254f06e337543dafbf2823bceee1 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Fri, 28 Apr 2023 14:42:23 -0500 Subject: [PATCH 09/25] create Planet model table --- app/__init__.py | 15 ++- app/models/__init__.py | 0 app/models/planet.py | 13 +++ migrations/README | 1 + migrations/alembic.ini | 45 +++++++++ migrations/env.py | 96 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../f6f9b34297e7_adds_planet_model.py | 38 ++++++++ 8 files changed, 230 insertions(+), 2 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/f6f9b34297e7_adds_planet_model.py diff --git a/app/__init__.py b/app/__init__.py index 1a03e5d1a..6a2469bb5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,11 +1,22 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +db = SQLAlchemy() +migrate = Migrate() def create_app(test_config=None): app = Flask(__name__) - + + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + + from app.models.planet import Planet + + db.init_app(app) + migrate.init_app(app, db) + from .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..c2acfe63a --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,13 @@ +from app import db + + + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String, nullable=False) + description = db.Column(db.String, nullable=False) + size = db.Column(db.String, nullable=False) + parent_planet = db.Column(db.String) + habitable = db.Column(db.Boolean) + gravity = db.Column(db.String) + nickname = db.Column(db.String) 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/f6f9b34297e7_adds_planet_model.py b/migrations/versions/f6f9b34297e7_adds_planet_model.py new file mode 100644 index 000000000..79c0b6907 --- /dev/null +++ b/migrations/versions/f6f9b34297e7_adds_planet_model.py @@ -0,0 +1,38 @@ +"""adds Planet model + +Revision ID: f6f9b34297e7 +Revises: +Create Date: 2023-04-28 14:38:53.218761 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f6f9b34297e7' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('planet', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('size', sa.String(), nullable=False), + sa.Column('parent_planet', sa.String(), nullable=True), + sa.Column('habitable', sa.Boolean(), nullable=True), + sa.Column('gravity', sa.String(), nullable=True), + sa.Column('nickname', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From ef68c3d0a62d70007df1ee5b2584d77de0596ee2 Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Fri, 28 Apr 2023 18:21:20 -0700 Subject: [PATCH 10/25] Finished handle planet endpoint --- app/models/planet.py | 1 - app/routes.py | 80 ++++++++++++++++++++++++++++++-------------- 2 files changed, 55 insertions(+), 26 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index c2acfe63a..e523821ee 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -1,7 +1,6 @@ from app import db - class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String, nullable=False) diff --git a/app/routes.py b/app/routes.py index cf03ee016..4ab613ef2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,31 +1,61 @@ -from flask import Blueprint, jsonify, abort, make_response - -class Planet: - def __init__(self, id, name, description, size, parent_planet, habitable, gravity, nickname): - self.id = id - self.name = name - self.description = description - self.size = size - self.parent_planet = parent_planet - self.habitable = habitable - self.gravity = gravity - self.nickname = nickname - - def create_dict(self): - return dict( - id=self.id, - name=self.name, - description=self.description, - size=self.size, - parent_planet = self.parent_planet, - habitable = self.habitable, - gravity = self.gravity, - nickname = self.nickname - - ) +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, make_response, request planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +@planets_bp.route("", methods=["POST"]) +def handle_planet(): + request_body = request.get_json() + new_planet = Planet( + name=request_body["name"] + description=request_body["description"], + size=request_body["size"], + parent_planet =request_body["parent_planet"], + habitable =request_body["habitable"], + gravity =request_body["gravity"], + nickname =request_body["name"], + ) + + + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} successfully created", 201) + + + +# from flask import Blueprint, jsonify, abort, make_response + +# class Planet: +# def __init__(self, id, name, description, size, parent_planet, habitable, gravity, nickname): +# self.id = id +# self.name = name +# self.description = description +# self.size = size +# self.parent_planet = parent_planet +# self.habitable = habitable +# self.gravity = gravity +# self.nickname = nickname + +# def create_dict(self): +# return dict( +# id=self.id, +# name=self.name, +# description=self.description, +# size=self.size, +# parent_planet = self.parent_planet, +# habitable = self.habitable, +# gravity = self.gravity, +# nickname = self.nickname + +# ) + + + + + + # planets = [ # Planet(1, "Earth", "habitable", "12742km in diameter"), # Planet(2, "Mercury", "inhabitable", "4880km in diameter"), From 8ec0f0d81830e8f1dfb2cd609038310ae212b1a6 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Fri, 28 Apr 2023 20:25:17 -0500 Subject: [PATCH 11/25] resolves conflict --- app/models/planet.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/planet.py b/app/models/planet.py index e523821ee..084f29716 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -1,6 +1,9 @@ from app import db +<<<<<<< Updated upstream +======= +>>>>>>> Stashed changes class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String, nullable=False) From 5533430ad8bd0eea1a70eff585a440db047f3f90 Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Fri, 28 Apr 2023 19:49:00 -0700 Subject: [PATCH 12/25] Changed planet table column datatypes --- app/models/planet.py | 7 ++----- app/routes.py | 8 +++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 084f29716..eb4d6b2e0 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -1,15 +1,12 @@ from app import db -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) size = db.Column(db.String, nullable=False) - parent_planet = db.Column(db.String) + parent_planet = db.Column(db.String, nullable=True) habitable = db.Column(db.Boolean) gravity = db.Column(db.String) - nickname = db.Column(db.String) + nickname = db.Column(db.String, nullable=True) diff --git a/app/routes.py b/app/routes.py index 4ab613ef2..a4514c09c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,7 +8,7 @@ def handle_planet(): request_body = request.get_json() new_planet = Planet( - name=request_body["name"] + name=request_body["name"], description=request_body["description"], size=request_body["size"], parent_planet =request_body["parent_planet"], @@ -25,6 +25,12 @@ def handle_planet(): + + + + + + # from flask import Blueprint, jsonify, abort, make_response # class Planet: From a6810cf8c40f1968dfc2ad2fc2acda402b853a47 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Fri, 28 Apr 2023 21:50:18 -0500 Subject: [PATCH 13/25] removed white space --- app/models/planet.py | 3 --- app/routes.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 084f29716..e523821ee 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -1,9 +1,6 @@ from app import db -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String, nullable=False) diff --git a/app/routes.py b/app/routes.py index 4ab613ef2..3737959bd 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,7 +8,7 @@ def handle_planet(): request_body = request.get_json() new_planet = Planet( - name=request_body["name"] + name=request_body["name"], description=request_body["description"], size=request_body["size"], parent_planet =request_body["parent_planet"], From 3a93d5d7f49598cdfd8cbbde293354edcb3100a6 Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Fri, 28 Apr 2023 20:38:25 -0700 Subject: [PATCH 14/25] Finished Wave 3 Complete --- app/models/planet.py | 1 - app/routes.py | 91 +++++++++----------------------------------- 2 files changed, 19 insertions(+), 73 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index eb4d6b2e0..78a287492 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -1,6 +1,5 @@ from app import db - class Planet(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) name = db.Column(db.String, nullable=False) diff --git a/app/routes.py b/app/routes.py index a4514c09c..8f3260b5a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -23,76 +23,23 @@ def handle_planet(): return make_response(f"Planet {new_planet.name} successfully created", 201) +@planets_bp.route("", methods=["GET"]) +def get_all_planets(): + planets = Planet.query.all() + results = [] + for planet in planets: + results.append( + dict( + id =planet.id, + name=planet.name, + description=planet.description, + size=planet.size, + parent_planet =planet.parent_planet, + habitable =planet.habitable, + gravity =planet.gravity, + nickname =planet.nickname + ) + ) + + return jsonify(results) - - - - - - - -# from flask import Blueprint, jsonify, abort, make_response - -# class Planet: -# def __init__(self, id, name, description, size, parent_planet, habitable, gravity, nickname): -# self.id = id -# self.name = name -# self.description = description -# self.size = size -# self.parent_planet = parent_planet -# self.habitable = habitable -# self.gravity = gravity -# self.nickname = nickname - -# def create_dict(self): -# return dict( -# id=self.id, -# name=self.name, -# description=self.description, -# size=self.size, -# parent_planet = self.parent_planet, -# habitable = self.habitable, -# gravity = self.gravity, -# nickname = self.nickname - -# ) - - - - - - -# planets = [ -# Planet(1, "Earth", "habitable", "12742km in diameter"), -# Planet(2, "Mercury", "inhabitable", "4880km in diameter"), -# Planet(3, "Venus", "inhabitable", "12104km in diameter"), -# Planet(4, "Mars", "inhabitable", "6779km in diameter"), -# Planet(5, "Jupiter", "inhabitable", "139822km in diameter"), -# Planet(6, "Saturn", "inhabitable", "116460km in diameter") -# ] - - -# 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 get_list_of_planets(): -# results =[] -# for planet in planets: -# results.append(planet.create_dict()) -# return jsonify(results) - -# @planets_bp.route("/", methods=["GET"]) -# def get_planet(planet_id): -# planet = validate_planet(planet_id) -# return planet.create_dict() From d2572b53be478c2172be9e40420b4188379e008b Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Fri, 28 Apr 2023 22:39:42 -0500 Subject: [PATCH 15/25] solves merge conflict --- app/routes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index a4514c09c..5d4a4bf33 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,7 +17,6 @@ def handle_planet(): nickname =request_body["name"], ) - db.session.add(new_planet) db.session.commit() From 51ff4099d23cf7fa33d9785b22a6ebd58ef678e7 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Tue, 2 May 2023 13:02:52 -0500 Subject: [PATCH 16/25] changed parent_planet column to mmon_of_planet --- app/models/planet.py | 2 +- app/routes.py | 7 +++---- migrations/versions/d12b70d81f7f_.py | 30 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 migrations/versions/d12b70d81f7f_.py diff --git a/app/models/planet.py b/app/models/planet.py index 78a287492..ec4167d19 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -5,7 +5,7 @@ class Planet(db.Model): name = db.Column(db.String, nullable=False) description = db.Column(db.String, nullable=False) size = db.Column(db.String, nullable=False) - parent_planet = db.Column(db.String, nullable=True) + moon_of_planet = db.Column(db.String, nullable=True) habitable = db.Column(db.Boolean) gravity = db.Column(db.String) nickname = db.Column(db.String, nullable=True) diff --git a/app/routes.py b/app/routes.py index 5d89e54be..ed0dd83c7 100644 --- a/app/routes.py +++ b/app/routes.py @@ -11,7 +11,7 @@ def handle_planet(): name=request_body["name"], description=request_body["description"], size=request_body["size"], - parent_planet =request_body["parent_planet"], + moon_of_planet =request_body["moon_of_planet"], habitable =request_body["habitable"], gravity =request_body["gravity"], nickname =request_body["name"], @@ -32,8 +32,8 @@ def get_all_planets(): id =planet.id, name=planet.name, description=planet.description, - size=planet.size, - parent_planet =planet.parent_planet, + size=planet.size, + moon_of_planet =planet.moon_of_planet, habitable =planet.habitable, gravity =planet.gravity, nickname =planet.nickname @@ -41,4 +41,3 @@ def get_all_planets(): ) return jsonify(results) - diff --git a/migrations/versions/d12b70d81f7f_.py b/migrations/versions/d12b70d81f7f_.py new file mode 100644 index 000000000..086c90e85 --- /dev/null +++ b/migrations/versions/d12b70d81f7f_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: d12b70d81f7f +Revises: f6f9b34297e7 +Create Date: 2023-05-02 12:53:46.210669 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd12b70d81f7f' +down_revision = 'f6f9b34297e7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('planet', sa.Column('moon_of_planet', sa.String(), nullable=True)) + op.drop_column('planet', 'parent_planet') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('planet', sa.Column('parent_planet', sa.VARCHAR(), autoincrement=False, nullable=True)) + op.drop_column('planet', 'moon_of_planet') + # ### end Alembic commands ### From e7663b4e56a0fbd9b79c837d4c3cb683e0d3e804 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Tue, 2 May 2023 14:23:32 -0500 Subject: [PATCH 17/25] creates validate_planet and get_one_planet end point --- app/routes.py | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index ed0dd83c7..27a56e526 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,9 +1,22 @@ from app import db from app.models.planet import Planet -from flask import Blueprint, jsonify, make_response, request +from flask import Blueprint, jsonify, make_response, request , abort planets_bp = Blueprint("planets", __name__, url_prefix="/planets") +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=["POST"]) def handle_planet(): request_body = request.get_json() @@ -41,3 +54,19 @@ def get_all_planets(): ) return jsonify(results) + +@planets_bp.route("/", methods=["GET"]) +def get_one_planet(planet_id): + planet = validate_planet(planet_id) + return { + + "id" : planet.id, + "name" :planet.name, + "description" : planet.description, + "size" : planet.size, + "moon_of_planet" : planet.moon_of_planet, + "habitable" : planet.habitable, + "gravity" :planet.gravity, + "nickname" : planet.nickname + + } From 6112ac754f21f744734b1bac3bba3cf65f744435 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Tue, 2 May 2023 15:23:40 -0500 Subject: [PATCH 18/25] defines update_planet end point --- app/routes.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 27a56e526..9a4edb5e3 100644 --- a/app/routes.py +++ b/app/routes.py @@ -14,7 +14,7 @@ def validate_planet(planet_id): if not planet: abort(make_response({"message": f"Planet {planet_id} not found"}, 404)) - + return planet @planets_bp.route("", methods=["POST"]) @@ -70,3 +70,19 @@ def get_one_planet(planet_id): "nickname" : planet.nickname } +@planets_bp.route("/", methods=["PUT"]) +def update_planet(planet_id): + planet_to_update= validate_planet(planet_id) + planet_data= request.get_json() + + planet_to_update.name = planet_data["name"] + planet_to_update.description = planet_data["description"] + planet_to_update.size= planet_data["size"] + planet_to_update.moon_of_planet = planet_data["moon_of_planet"] + planet_to_update.habitable = planet_data["habitable"] + planet_to_update.gravity = planet_data["gravity"] + planet_to_update.nickname = planet_data["nickname"] + + db.session.commit() + + return make_response(f"Planet { planet_to_update.name} updated", 200) From 00e54c5cafdf746805015dffe0ee108bc3c330e2 Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Tue, 2 May 2023 13:37:27 -0700 Subject: [PATCH 19/25] Finished Wave 4 --- app/routes.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/routes.py b/app/routes.py index 9a4edb5e3..083628328 100644 --- a/app/routes.py +++ b/app/routes.py @@ -86,3 +86,15 @@ def update_planet(planet_id): db.session.commit() return make_response(f"Planet { planet_to_update.name} updated", 200) + +@planets_bp.route("/", methods=["DELETE"]) +def delete_planet(planet_id): + planet_to_delete = validate_planet(planet_id) + + db.session.delete(planet_to_delete) + db.session.commit() + + return make_response(f"Planet {planet_to_delete.name} successfully deleted", 200) + + + From 8f6c7980a859d2d42c699e22f5687ed417e4800c Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Wed, 3 May 2023 11:23:08 -0700 Subject: [PATCH 20/25] Create env file and setup databases --- app/__init__.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 6a2469bb5..dc9f62853 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,22 +1,31 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate +from dotenv import load_dotenv +import os db = SQLAlchemy() migrate = Migrate() +load_dotenv() def create_app(test_config=None): app = Flask(__name__) - app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' - from app.models.planet import Planet + if not test_config: + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "SQLALCHEMY_DATABASE_URI") + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI") db.init_app(app) migrate.init_app(app, db) + from app.models.planet import Planet + from .routes import planets_bp app.register_blueprint(planets_bp) - return app + return app \ No newline at end of file From a252622f75b58996315a022ef4a6bb41b1f4998d Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Wed, 3 May 2023 13:02:52 -0700 Subject: [PATCH 21/25] WIP creating test checks empty db returns empty list --- tests/__init__.py | 0 tests/conftest.py | 42 ++++++++++++++++++++++++++++++++++++++++++ tests/test_routes.py | 10 ++++++++++ 3 files changed, 52 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..38d5ed046 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,42 @@ +import pytest +from app import create_app +from app import db +from flask.signals import request_finished +from app.models.planet import Planet + + +@pytest.fixture +def app(): + app = create_app({"TESTING": True}) + + @request_finished.connect_via(app) + def expire_session(sender, response, **extra): + db.session.remove() + + with app.app_context(): + db.create_all() + yield app + + with app.app_context(): + db.drop_all() + + +@pytest.fixture +def client(app): + return app.test_client() + +@pytest.fixture +def one_planet(app): + planet = Planet( + description="A dusty, cold, desert world with a very thin atmosphere", + gravity="3.721 m/s²", + habitable=False, + id=7, + moon_of_planet="Phobos & Deimos", + name="Mars", + nickname="Mars", + size="6,792 km" + ) + db.session.add(planet) + db.session.commit() + return Planet \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..2bb5e55e1 --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,10 @@ +from app.models.planet import Planet + + +def test_get_all_planets_returns_empty_list_when_db_is_empty(client): + #act + response = client.get("/planets") + + #assert + assert response.status_code == 200 + assert response.get_json() == [] \ No newline at end of file From 1c200537bddeba2a65519032adaea5e0cc21af3a Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Wed, 3 May 2023 19:43:16 -0700 Subject: [PATCH 22/25] Finished wave 6 - implemented tests --- app/routes.py | 6 +-- test_fixtures.py | 1 + tests/conftest.py | 31 +++++++++++--- tests/test_routes.py | 97 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 test_fixtures.py diff --git a/app/routes.py b/app/routes.py index 083628328..a67d68b86 100644 --- a/app/routes.py +++ b/app/routes.py @@ -33,7 +33,7 @@ def handle_planet(): db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.name} successfully created", 201) + return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) @planets_bp.route("", methods=["GET"]) def get_all_planets(): @@ -85,7 +85,7 @@ def update_planet(planet_id): db.session.commit() - return make_response(f"Planet { planet_to_update.name} updated", 200) + return make_response(jsonify(f"Planet { planet_to_update.name} updated"), 200) @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): @@ -94,7 +94,7 @@ def delete_planet(planet_id): db.session.delete(planet_to_delete) db.session.commit() - return make_response(f"Planet {planet_to_delete.name} successfully deleted", 200) + return make_response(jsonify(f"Planet {planet_to_delete.name} successfully deleted"), 200) diff --git a/test_fixtures.py b/test_fixtures.py new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test_fixtures.py @@ -0,0 +1 @@ + diff --git a/tests/conftest.py b/tests/conftest.py index 38d5ed046..5c32df52a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -26,17 +26,36 @@ def client(app): return app.test_client() @pytest.fixture -def one_planet(app): - planet = Planet( +def multiple_planets(app): + planet_1 = Planet( description="A dusty, cold, desert world with a very thin atmosphere", gravity="3.721 m/s²", habitable=False, - id=7, + id=1, moon_of_planet="Phobos & Deimos", name="Mars", nickname="Mars", size="6,792 km" ) - db.session.add(planet) - db.session.commit() - return Planet \ No newline at end of file + planet_2= Planet( + name="Saturn", + description="The second-largest planet in solar system.", + size="36,183.7 miles", + moon_of_planet="Iapetus, Rhea, Dione, and Tethys", + habitable=False, + id=2, + gravity="10.44 m/s²", + nickname="Ringed Planet" + ) + planet_3 = Planet( + name="Neptune", + description="Dark, cold, and whipped by supersonic winds, ice giant.", + size="24,622 km", + moon_of_planet="Triton", + habitable=False, + id=3, + gravity="11.15 m/s²", + nickname="Ice Giant" + ) + db.session.add_all([planet_1, planet_2, planet_3]) + db.session.commit() \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py index 2bb5e55e1..0187b078b 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -7,4 +7,99 @@ def test_get_all_planets_returns_empty_list_when_db_is_empty(client): #assert assert response.status_code == 200 - assert response.get_json() == [] \ No newline at end of file + assert response.get_json() == [] + +def test_get_one_planet_by_id(client, multiple_planets): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == { + "description": "A dusty, cold, desert world with a very thin atmosphere", + "gravity": "3.721 m/s²", + "habitable": False, + "id": 1, + "moon_of_planet": "Phobos & Deimos", + "name": "Mars", + "nickname": "Mars", + "size": "6,792 km" + } + +def test_get_one_planet_with_no_data(client): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 404 + assert response_body == {"message": "Planet 1 not found"} + +def test_get_one_planet_with_id_not_found(client, multiple_planets): + # Act + response = client.get("/planets/5") + response_body = response.get_json() + + # Assert + assert response.status_code == 404 + assert response_body == {"message": "Planet 5 not found"} + +def test_get_list_of_all_planets(client, multiple_planets): + # Act + response = client.get("/planets") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == [{ + "description": "A dusty, cold, desert world with a very thin atmosphere", + "gravity": "3.721 m/s²", + "habitable": False, + "id": 1, + "moon_of_planet": "Phobos & Deimos", + "name": "Mars", + "nickname": "Mars", + "size": "6,792 km" + }, { + "name": "Saturn", + "description": "The second-largest planet in solar system.", + "size": "36,183.7 miles", + "moon_of_planet": "Iapetus, Rhea, Dione, and Tethys", + "habitable": False, + "id": 2, + "gravity": "10.44 m/s²", + "nickname": "Ringed Planet" + }, { + "name": "Neptune", + "description": "Dark, cold, and whipped by supersonic winds, ice giant.", + "size": "24,622 km", + "moon_of_planet": "Triton", + "habitable": False, + "id": 3, + "gravity": "11.15 m/s²", + "nickname": "Ice Giant" + }] + +def test_creates_one_planet(client): + #Arrange + Expected_planet = { + "name": "Venus", + "description": "It is the brightest object in the skynafter the Sun and the Moon", + "size": "12,104km", + "moon_of_planet": None, + "habitable": False, + "gravity": "8.87 m/s²", + "nickname": "Morning Star, Evening Star" +} + + # Act + response = client.post("/planets", json=Expected_planet) + response_body = response.get_json() + + # Assert + assert response.status_code == 201 + assert response_body == "Planet Venus successfully created" + + + From adecf6d4f4ebad10009174b1887bdb46a6a174f7 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Wed, 3 May 2023 21:44:30 -0500 Subject: [PATCH 23/25] setup .env file --- tests/conftest.py | 3 +-- tests/test_routes.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 38d5ed046..9ddf10af0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -31,7 +31,6 @@ def one_planet(app): description="A dusty, cold, desert world with a very thin atmosphere", gravity="3.721 m/s²", habitable=False, - id=7, moon_of_planet="Phobos & Deimos", name="Mars", nickname="Mars", @@ -39,4 +38,4 @@ def one_planet(app): ) db.session.add(planet) db.session.commit() - return Planet \ No newline at end of file + return planet \ No newline at end of file diff --git a/tests/test_routes.py b/tests/test_routes.py index 2bb5e55e1..39387260f 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -7,4 +7,5 @@ def test_get_all_planets_returns_empty_list_when_db_is_empty(client): #assert assert response.status_code == 200 - assert response.get_json() == [] \ No newline at end of file + assert response.get_json() == [] + From 847f3ef80fc1f494d6becf1cdc9a30a2f3fdd0b7 Mon Sep 17 00:00:00 2001 From: Tigist Woldearegai Date: Thu, 4 May 2023 15:00:54 -0500 Subject: [PATCH 24/25] refactors code, creates helper function --- app/models/planet.py | 24 +++++++++++++ app/routes.py | 80 ++++++++++++++------------------------------ tests/test_routes.py | 2 -- 3 files changed, 50 insertions(+), 56 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index ec4167d19..583fd1622 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -9,3 +9,27 @@ class Planet(db.Model): habitable = db.Column(db.Boolean) gravity = db.Column(db.String) nickname = db.Column(db.String, nullable=True) + + def to_dict(self): + return dict( + name=self.name, + description=self.description, + size=self.size, + moon_of_planet=self.moon_of_planet, + habitable=self.habitable, + id=self.id, + gravity=self.gravity, + nickname=self.nickname + ) + + @classmethod + def from_dict(cls, planet_data): + return cls( + name = planet_data["name"], + description = planet_data["description"], + size = planet_data["size"], + moon_of_planet = planet_data["moon_of_planet"], + habitable = planet_data["habitable"], + gravity = planet_data["gravity"], + nickname = planet_data["nickname"] + ) diff --git a/app/routes.py b/app/routes.py index a67d68b86..56a3ba9b8 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,75 +4,50 @@ planets_bp = Blueprint("planets", __name__, url_prefix="/planets") -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)) + message = f"{cls.__name__} {model_id} is invalid" + abort(make_response({"message": message}, 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: + message = f"{cls.__name__} {model_id} not found" + abort(make_response({"message": message}, 404)) - return planet + return model @planets_bp.route("", methods=["POST"]) -def handle_planet(): +def create_planet(): request_body = request.get_json() - new_planet = Planet( - name=request_body["name"], - description=request_body["description"], - size=request_body["size"], - moon_of_planet =request_body["moon_of_planet"], - habitable =request_body["habitable"], - gravity =request_body["gravity"], - nickname =request_body["name"], - ) - - db.session.add(new_planet) - db.session.commit() + try: + new_planet = Planet.from_dict(request_body) + db.session.add(new_planet) + db.session.commit() - return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) + message = f"Planet {new_planet.name} successfully created" + return make_response(message, 201) + + except KeyError as e: + abort(make_response({"message": f"missing required value: {e}"}, 400)) @planets_bp.route("", methods=["GET"]) def get_all_planets(): planets = Planet.query.all() - results = [] - for planet in planets: - results.append( - dict( - id =planet.id, - name=planet.name, - description=planet.description, - size=planet.size, - moon_of_planet =planet.moon_of_planet, - habitable =planet.habitable, - gravity =planet.gravity, - nickname =planet.nickname - ) - ) + results= [planet.to_dict()for planet in planets] return jsonify(results) @planets_bp.route("/", methods=["GET"]) def get_one_planet(planet_id): - planet = validate_planet(planet_id) - return { - - "id" : planet.id, - "name" :planet.name, - "description" : planet.description, - "size" : planet.size, - "moon_of_planet" : planet.moon_of_planet, - "habitable" : planet.habitable, - "gravity" :planet.gravity, - "nickname" : planet.nickname - - } + planet = validate_model(Planet, planet_id) + return planet.to_dict() + @planets_bp.route("/", methods=["PUT"]) def update_planet(planet_id): - planet_to_update= validate_planet(planet_id) + planet_to_update= validate_model(Planet, planet_id) planet_data= request.get_json() planet_to_update.name = planet_data["name"] @@ -82,19 +57,16 @@ def update_planet(planet_id): planet_to_update.habitable = planet_data["habitable"] planet_to_update.gravity = planet_data["gravity"] planet_to_update.nickname = planet_data["nickname"] - + db.session.commit() return make_response(jsonify(f"Planet { planet_to_update.name} updated"), 200) @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): - planet_to_delete = validate_planet(planet_id) + planet_to_delete = validate_model(Planet, planet_id) db.session.delete(planet_to_delete) db.session.commit() return make_response(jsonify(f"Planet {planet_to_delete.name} successfully deleted"), 200) - - - diff --git a/tests/test_routes.py b/tests/test_routes.py index 696814cc0..e28fa9a66 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -101,5 +101,3 @@ def test_creates_one_planet(client): assert response.status_code == 201 assert response_body == "Planet Venus successfully created" - - From 0e57c3c7a8a6a57d16348cd859fda3818623298d Mon Sep 17 00:00:00 2001 From: Valerie Valentin Date: Thu, 4 May 2023 17:09:30 -0700 Subject: [PATCH 25/25] Finished refactoring project --- app/routes.py | 11 ++++++++++- tests/conftest.py | 2 +- tests/test_routes.py | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index 56a3ba9b8..5264e011f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -28,14 +28,23 @@ def create_planet(): db.session.commit() message = f"Planet {new_planet.name} successfully created" - return make_response(message, 201) + return make_response(jsonify(message), 201) except KeyError as e: abort(make_response({"message": f"missing required value: {e}"}, 400)) @planets_bp.route("", methods=["GET"]) def get_all_planets(): + name_query = request.args.get("name") + nickname_query = request.args.get("nickname") + if name_query: + planets = Planet.query.filter_by(name = name_query) + + if nickname_query: + planets = Planet.query.filter_by(nickname = nickname_query) + planets = Planet.query.all() + results= [planet.to_dict()for planet in planets] return jsonify(results) diff --git a/tests/conftest.py b/tests/conftest.py index 5c32df52a..4ce93de27 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -34,7 +34,7 @@ def multiple_planets(app): id=1, moon_of_planet="Phobos & Deimos", name="Mars", - nickname="Mars", + nickname="Red Planet", size="6,792 km" ) planet_2= Planet( diff --git a/tests/test_routes.py b/tests/test_routes.py index e28fa9a66..e5023a942 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -23,7 +23,7 @@ def test_get_one_planet_by_id(client, multiple_planets): "id": 1, "moon_of_planet": "Phobos & Deimos", "name": "Mars", - "nickname": "Mars", + "nickname": "Red Planet", "size": "6,792 km" } @@ -59,7 +59,7 @@ def test_get_list_of_all_planets(client, multiple_planets): "id": 1, "moon_of_planet": "Phobos & Deimos", "name": "Mars", - "nickname": "Mars", + "nickname": "Red Planet", "size": "6,792 km" }, { "name": "Saturn", @@ -101,3 +101,32 @@ def test_creates_one_planet(client): assert response.status_code == 201 assert response_body == "Planet Venus successfully created" + +def test_replace_planet_returns_seeded_planet(client, multiple_planets): + replaced_planet = { + "name": "Earth", + "description": "A rocky, terrestrial planet.", + "size": "12,756 km", + "parent_planet": None, + "moon_of_planet": "The moon", + "habitable": True, + "gravity": "9.807 m/s²", + "nickname": "Blue Planet, Gaia, Terra" +} + response=client.put("/planets/1", json= replaced_planet) + actual_planet = Planet.query.get(1) + response_body = response.get_json() + assert response.status_code == 200 + assert response_body == "Planet Earth updated" + assert actual_planet.name == replaced_planet["name"] + +def test_delete_planet(client, multiple_planets): + # Act + response = client.delete("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == "Planet Mars successfully deleted" + +