From f5c115dbda16be5b3c40201c03b3da0d46d7f521 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Fri, 21 Oct 2022 11:06:11 -0700 Subject: [PATCH 01/29] 'Created Planet Class and instance' --- app/routes.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..0a56a3ffc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,20 @@ from flask import Blueprint +class Planet(): + def __init__(self, id, name, description, rings): + self.id = id + self.name = name + self.description = description + self.rings = rings + +planets = [ + Planet(1, "Mercury", "The smallest and fastest planet", False), + Planet(2, "Venus", "The hottest planet", False), + Planet(3, "Earth", "The blue marble", False), + Planet(4, "Mars", "The red planet", False), + Planet(5, "Jupiter", "The gas giant", False), + Planet(6, "Saturn", "The second largest planet", True), + Planet(7, "Uranus", "This planet spins on its side", True), + Planet(8, "Neptune", "The most distant planet from the sun", False) + ] + From 0ff2e16718ff1bdae644e640ad18988d2f2120f8 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Fri, 21 Oct 2022 11:23:06 -0700 Subject: [PATCH 02/29] Created and registered blueprint and handle_planets --- app/__init__.py | 3 +++ app/routes.py | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..1123a559e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,4 +4,7 @@ def create_app(test_config=None): app = Flask(__name__) + from .routes import bp + app.register_blueprint(bp) + return app diff --git a/app/routes.py b/app/routes.py index 0a56a3ffc..2255e13f5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,7 @@ -from flask import Blueprint +from crypt import methods +from flask import Blueprint, jsonify -class Planet(): +class Planet: def __init__(self, id, name, description, rings): self.id = id self.name = name @@ -18,3 +19,17 @@ def __init__(self, id, name, description, rings): Planet(8, "Neptune", "The most distant planet from the sun", False) ] +bp = Blueprint("planets", __name__, url_prefix="/planets") + +@bp.route("", methods=["GET"]) +def list_planets(): + return_body = [] + for planet in planets: + return_body.append({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "rings": planet.rings + }) + + return jsonify(return_body) \ No newline at end of file From 145fd494c0dd85da1b909c28af290271742ae8b7 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Fri, 21 Oct 2022 11:23:47 -0700 Subject: [PATCH 03/29] 'Created handle_planets route' --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 2255e13f5..a5bf58265 100644 --- a/app/routes.py +++ b/app/routes.py @@ -22,7 +22,7 @@ def __init__(self, id, name, description, rings): bp = Blueprint("planets", __name__, url_prefix="/planets") @bp.route("", methods=["GET"]) -def list_planets(): +def handle_planets(): return_body = [] for planet in planets: return_body.append({ From 16f3825d3ec6e73c737383b72b968a59677eb58e Mon Sep 17 00:00:00 2001 From: Jennifer Date: Mon, 24 Oct 2022 11:52:52 -0700 Subject: [PATCH 04/29] Completed wave 02 --- app/routes.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index a5bf58265..f1fe4f069 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,5 +1,5 @@ from crypt import methods -from flask import Blueprint, jsonify +from flask import Blueprint, jsonify, abort, make_response class Planet: def __init__(self, id, name, description, rings): @@ -32,4 +32,23 @@ def handle_planets(): "rings": planet.rings }) - return jsonify(return_body) \ No newline at end of file + return jsonify(return_body) + +@bp.route("/", methods=["GET"]) +def handle_planet(id): + try: + planet_id = int(id) + except: + abort(400, description=f"planet {id} is not valid") + + for planet in planets: + if planet.id == planet_id: + return jsonify({ + "id": planet.id, + "name": planet.name, + "description": planet.description, + "rings": planet.rings + }) + + abort(404, description=f"Planet {id} not found") + From f0aea40e36185368cc405eaadc3e4ba65b9532e0 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Tue, 25 Oct 2022 13:37:24 -0700 Subject: [PATCH 05/29] Refactored abort statement --- app/routes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index f1fe4f069..a4faadf99 100644 --- a/app/routes.py +++ b/app/routes.py @@ -39,7 +39,7 @@ def handle_planet(id): try: planet_id = int(id) except: - abort(400, description=f"planet {id} is not valid") + abort(make_response({"message":f"planet {id} is not valid"}, 400)) for planet in planets: if planet.id == planet_id: @@ -50,5 +50,5 @@ def handle_planet(id): "rings": planet.rings }) - abort(404, description=f"Planet {id} not found") + abort(make_response({"message":f"Planet {id} not found."}, 404)) From 694d1c52dc265b6db584af1cd3f22fd16e222475 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Fri, 28 Oct 2022 11:14:34 -0700 Subject: [PATCH 06/29] Created planet model and post route --- app/__init__.py | 12 ++++++++++++ app/models/__init__.py | 0 app/models/planet.py | 7 +++++++ app/routes.py | 24 +++++++++++++++--------- 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py diff --git a/app/__init__.py b/app/__init__.py index 1123a559e..4a8630e72 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,9 +1,21 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +db = SQLAlchemy() +migrate = Migrate() def create_app(test_config=None): app = Flask(__name__) + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + + from app.models.planet import Planet + + db.init_app(app) + migrate.init_app(app, db) + from .routes import bp app.register_blueprint(bp) diff --git a/app/models/__init__.py b/app/models/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/planet.py b/app/models/planet.py new file mode 100644 index 000000000..dd0e9dead --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,7 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String, nullable=False) + description = db.Column(db.Text, nullable=False) + rings = db.Column(db.Boolean, nullable=False) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index a4faadf99..b1b12f494 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,12 +1,6 @@ -from crypt import methods -from flask import Blueprint, jsonify, abort, make_response - -class Planet: - def __init__(self, id, name, description, rings): - self.id = id - self.name = name - self.description = description - self.rings = rings +from flask import Blueprint, jsonify, abort, make_response, request +from app.models.planet import Planet +from app import db planets = [ Planet(1, "Mercury", "The smallest and fastest planet", False), @@ -52,3 +46,15 @@ def handle_planet(id): abort(make_response({"message":f"Planet {id} not found."}, 404)) +@bp.route("", methods=["POST"]) +def create_planet(): + request_body = request.get_json() + new_planet = Planet(name=request_body["name"], + description=request_body["description"], + rings=request_body["rings"]) + + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} created", 201) + From ec8d9b4885916074c30982f8fda9a7bf0ccc05b4 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Fri, 28 Oct 2022 11:34:33 -0700 Subject: [PATCH 07/29] Created post endpoint --- app/routes.py | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/app/routes.py b/app/routes.py index b1b12f494..80997c8a1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,49 +2,49 @@ from app.models.planet import Planet from app import db -planets = [ - Planet(1, "Mercury", "The smallest and fastest planet", False), - Planet(2, "Venus", "The hottest planet", False), - Planet(3, "Earth", "The blue marble", False), - Planet(4, "Mars", "The red planet", False), - Planet(5, "Jupiter", "The gas giant", False), - Planet(6, "Saturn", "The second largest planet", True), - Planet(7, "Uranus", "This planet spins on its side", True), - Planet(8, "Neptune", "The most distant planet from the sun", False) - ] +# planets = [ +# Planet(1, "Mercury", "The smallest and fastest planet", False), +# Planet(2, "Venus", "The hottest planet", False), +# Planet(3, "Earth", "The blue marble", False), +# Planet(4, "Mars", "The red planet", False), +# Planet(5, "Jupiter", "The gas giant", False), +# Planet(6, "Saturn", "The second largest planet", True), +# Planet(7, "Uranus", "This planet spins on its side", True), +# Planet(8, "Neptune", "The most distant planet from the sun", False) +# ] bp = Blueprint("planets", __name__, url_prefix="/planets") -@bp.route("", methods=["GET"]) -def handle_planets(): - return_body = [] - for planet in planets: - return_body.append({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "rings": planet.rings - }) +# @bp.route("", methods=["GET"]) +# def handle_planets(): +# return_body = [] +# for planet in planets: +# return_body.append({ +# "id": planet.id, +# "name": planet.name, +# "description": planet.description, +# "rings": planet.rings +# }) - return jsonify(return_body) +# return jsonify(return_body) -@bp.route("/", methods=["GET"]) -def handle_planet(id): - try: - planet_id = int(id) - except: - abort(make_response({"message":f"planet {id} is not valid"}, 400)) +# @bp.route("/", methods=["GET"]) +# def handle_planet(id): +# try: +# planet_id = int(id) +# except: +# abort(make_response({"message":f"planet {id} is not valid"}, 400)) - for planet in planets: - if planet.id == planet_id: - return jsonify({ - "id": planet.id, - "name": planet.name, - "description": planet.description, - "rings": planet.rings - }) +# for planet in planets: +# if planet.id == planet_id: +# return jsonify({ +# "id": planet.id, +# "name": planet.name, +# "description": planet.description, +# "rings": planet.rings +# }) - abort(make_response({"message":f"Planet {id} not found."}, 404)) +# abort(make_response({"message":f"Planet {id} not found."}, 404)) @bp.route("", methods=["POST"]) def create_planet(): From fdb034c175db0b21dc0bcab52963f62db6478f24 Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Sat, 29 Oct 2022 20:01:39 -0400 Subject: [PATCH 08/29] migration complete --- migrations/README | 1 + migrations/alembic.ini | 50 ++++++++++ migrations/env.py | 91 +++++++++++++++++++ migrations/script.py.mako | 24 +++++ .../versions/f361a1882d05_adds_book_model.py | 34 +++++++ 5 files changed, 200 insertions(+) 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/f361a1882d05_adds_book_model.py diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..0e0484415 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..ec9d45c26 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# 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,flask_migrate + +[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 + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[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..68feded2a --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,91 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +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.get_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 = current_app.extensions['migrate'].db.get_engine() + + 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/f361a1882d05_adds_book_model.py b/migrations/versions/f361a1882d05_adds_book_model.py new file mode 100644 index 000000000..d4918c865 --- /dev/null +++ b/migrations/versions/f361a1882d05_adds_book_model.py @@ -0,0 +1,34 @@ +"""adds Book model + +Revision ID: f361a1882d05 +Revises: +Create Date: 2022-10-29 19:51:40.904287 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f361a1882d05' +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.Text(), nullable=False), + sa.Column('rings', sa.Boolean(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 41a8f781630fd269078a6dbbc0ffcf6c0518f008 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Sat, 29 Oct 2022 17:02:21 -0700 Subject: [PATCH 09/29] Created migration for planet model --- migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++++++ migrations/env.py | 96 +++++++++++++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++++ 4 files changed, 166 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako 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"} From 01a52df44058eaaad0fd5c9da9fbce88c23682ed Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Sat, 29 Oct 2022 20:43:46 -0400 Subject: [PATCH 10/29] delete and update --- app/routes.py | 62 +++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 41 deletions(-) diff --git a/app/routes.py b/app/routes.py index 80997c8a1..dc9cf5e8a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,49 +2,9 @@ from app.models.planet import Planet from app import db -# planets = [ -# Planet(1, "Mercury", "The smallest and fastest planet", False), -# Planet(2, "Venus", "The hottest planet", False), -# Planet(3, "Earth", "The blue marble", False), -# Planet(4, "Mars", "The red planet", False), -# Planet(5, "Jupiter", "The gas giant", False), -# Planet(6, "Saturn", "The second largest planet", True), -# Planet(7, "Uranus", "This planet spins on its side", True), -# Planet(8, "Neptune", "The most distant planet from the sun", False) -# ] bp = Blueprint("planets", __name__, url_prefix="/planets") -# @bp.route("", methods=["GET"]) -# def handle_planets(): -# return_body = [] -# for planet in planets: -# return_body.append({ -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "rings": planet.rings -# }) - -# return jsonify(return_body) - -# @bp.route("/", methods=["GET"]) -# def handle_planet(id): -# try: -# planet_id = int(id) -# except: -# abort(make_response({"message":f"planet {id} is not valid"}, 400)) - -# for planet in planets: -# if planet.id == planet_id: -# return jsonify({ -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "rings": planet.rings -# }) - -# abort(make_response({"message":f"Planet {id} not found."}, 404)) @bp.route("", methods=["POST"]) def create_planet(): @@ -56,5 +16,25 @@ def create_planet(): db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.name} created", 201) + return make_response(f"Planet {new_planet.name} succesfully created", 201) + +@bp.route.route("", methods=["POST"]) +def update_planet(): + request_body = request.get_json() + new_planet = Planet(title=request_body["name"], + description=request_body["description"], + rings=request_body["rings"]) + + + + db.session.add(new_planet) + db.session.commit() + +@bp.route("/guide/", methods=["DELETE"]) +def planet_delete(id): + request_body = request.get_json() + planet_delete = Planet(title=request_body["name"], + description=request_body["description"], + rings=request_body["rings"]) + return make_response(f"Planet {planet_delete} successfully deleted", 201) From c80037eaca59c15df1ff96a6b90cdc87479400fb Mon Sep 17 00:00:00 2001 From: Jennifer Date: Sat, 29 Oct 2022 17:43:53 -0700 Subject: [PATCH 11/29] created helper method to build planet dict --- app/models/planet.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/planet.py b/app/models/planet.py index dd0e9dead..661769527 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -4,4 +4,12 @@ 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.Text, nullable=False) - rings = db.Column(db.Boolean, nullable=False) \ No newline at end of file + rings = db.Column(db.Boolean, nullable=False) + + def build_planet_dict(self): + return { + "id": self.id, + "name": self.name, + "description": self.description, + "rings": self.rings + } \ No newline at end of file From 6090479c75453dcce233fbba05263a13891da630 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Sat, 29 Oct 2022 17:44:33 -0700 Subject: [PATCH 12/29] Created endpoint to get single planet --- app/routes.py | 61 +++++++++++++++------------------------------------ 1 file changed, 18 insertions(+), 43 deletions(-) diff --git a/app/routes.py b/app/routes.py index 80997c8a1..fd1756135 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,51 +1,9 @@ -from flask import Blueprint, jsonify, abort, make_response, request +from flask import Blueprint, jsonify, make_response, request from app.models.planet import Planet from app import db -# planets = [ -# Planet(1, "Mercury", "The smallest and fastest planet", False), -# Planet(2, "Venus", "The hottest planet", False), -# Planet(3, "Earth", "The blue marble", False), -# Planet(4, "Mars", "The red planet", False), -# Planet(5, "Jupiter", "The gas giant", False), -# Planet(6, "Saturn", "The second largest planet", True), -# Planet(7, "Uranus", "This planet spins on its side", True), -# Planet(8, "Neptune", "The most distant planet from the sun", False) -# ] - bp = Blueprint("planets", __name__, url_prefix="/planets") -# @bp.route("", methods=["GET"]) -# def handle_planets(): -# return_body = [] -# for planet in planets: -# return_body.append({ -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "rings": planet.rings -# }) - -# return jsonify(return_body) - -# @bp.route("/", methods=["GET"]) -# def handle_planet(id): -# try: -# planet_id = int(id) -# except: -# abort(make_response({"message":f"planet {id} is not valid"}, 400)) - -# for planet in planets: -# if planet.id == planet_id: -# return jsonify({ -# "id": planet.id, -# "name": planet.name, -# "description": planet.description, -# "rings": planet.rings -# }) - -# abort(make_response({"message":f"Planet {id} not found."}, 404)) - @bp.route("", methods=["POST"]) def create_planet(): request_body = request.get_json() @@ -58,3 +16,20 @@ def create_planet(): return make_response(f"Planet {new_planet.name} created", 201) +@bp.route("", methods=["GET"]) +def get_all_planets(): + planets = Planet.query.all() + planets_response = [] + for planet in planets: + planets_response.append(planet.build_planet_dict()) + + return jsonify(planets_response) + +@bp.route("/", methods=["GET"]) +def get_planet(id): + planets = Planet.query.all() + for planet in planets: + if planet.id == int(id): + return jsonify(planet.build_planet_dict()) + + return make_response(f"Planet {id} not found", 404) \ No newline at end of file From eed25159383c681b7310e22c5ed7ba9115429bf0 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Sat, 29 Oct 2022 17:53:19 -0700 Subject: [PATCH 13/29] done for today --- app/routes.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0df416837..527cfd3d5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,7 +16,6 @@ def create_planet(): return make_response(f"Planet {new_planet.name} succesfully created", 201) - @bp.route("", methods=["GET"]) def get_all_planets(): planets = Planet.query.all() @@ -35,23 +34,23 @@ def get_planet(id): return make_response(f"Planet {id} not found", 404) -@bp.route.route("", methods=["POST"]) -def update_planet(): - request_body = request.get_json() - new_planet = Planet(title=request_body["name"], - description=request_body["description"], - rings=request_body["rings"]) +# @bp.route("/", methods=["POST"]) +# def update_planet(): +# request_body = request.get_json() +# updated_planet = Planet(title=request_body["name"], +# description=request_body["description"], +# rings=request_body["rings"]) - db.session.add(new_planet) - db.session.commit() -@bp.route("/guide/", methods=["DELETE"]) -def planet_delete(id): - request_body = request.get_json() - planet_delete = Planet(title=request_body["name"], - description=request_body["description"], - rings=request_body["rings"]) +# db.session.(updated_planet) +# db.session.commit() +# @bp.route("/guide/", methods=["DELETE"]) +# def planet_delete(id): +# request_body = request.get_json() +# planet_delete = Planet(title=request_body["name"], +# description=request_body["description"], +# rings=request_body["rings"]) - return make_response(f"Planet {planet_delete} successfully deleted", 201) \ No newline at end of file +# return make_response(f"Planet {planet_delete} successfully deleted", 201) \ No newline at end of file From aa816a2743bf6d79b0c24c2d537ce906faf3e223 Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Sat, 29 Oct 2022 20:53:35 -0400 Subject: [PATCH 14/29] changes to function --- app/routes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 0df416837..49ce6818f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -35,15 +35,15 @@ def get_planet(id): return make_response(f"Planet {id} not found", 404) -@bp.route.route("", methods=["POST"]) +@bp.route("", methods=["POST"]) def update_planet(): request_body = request.get_json() - new_planet = Planet(title=request_body["name"], + update_planet = Planet(title=request_body["name"], description=request_body["description"], rings=request_body["rings"]) - db.session.add(new_planet) + db.session.add(update_planet) db.session.commit() @bp.route("/guide/", methods=["DELETE"]) From b7b7bbeba6c886fb3d4bda5188224984e72fc0ed Mon Sep 17 00:00:00 2001 From: Jennifer Date: Wed, 2 Nov 2022 18:21:26 -0700 Subject: [PATCH 15/29] Created PUT route to update single planet --- app/routes.py | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/app/routes.py b/app/routes.py index 527cfd3d5..30a926cfb 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,9 +1,22 @@ -from flask import Blueprint, jsonify, make_response, request +from flask import Blueprint, jsonify, abort, make_response, request from app.models.planet import Planet from app import db bp = Blueprint("planets", __name__, url_prefix="/planets") +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message":f"book {planet_id} invalid"}, 400)) + + planet = Planet.query.get(planet_id) + + if not planet: + abort(make_response({"message":f"book {planet_id} not found"}, 404)) + + return planet + @bp.route("", methods=["POST"]) def create_planet(): request_body = request.get_json() @@ -23,28 +36,26 @@ def get_all_planets(): for planet in planets: planets_response.append(planet.build_planet_dict()) - return jsonify(planets_response) + return jsonify(planets_response), 400 @bp.route("/", methods=["GET"]) -def get_planet(id): - planets = Planet.query.all() - for planet in planets: - if planet.id == int(id): - return jsonify(planet.build_planet_dict()) - - return make_response(f"Planet {id} not found", 404) +def read_one_planet(id): + planet = validate_planet(id) -# @bp.route("/", methods=["POST"]) -# def update_planet(): -# request_body = request.get_json() + return jsonify(planet.build_planet_dict()) -# updated_planet = Planet(title=request_body["name"], -# description=request_body["description"], -# rings=request_body["rings"]) +@bp.route("/", methods=["PUT"]) +def update_planet(id): + planet = validate_planet(id) + request_body = request.get_json() + + planet.name = request_body["name"], + planet.description = request_body["description"], + planet.rings = request_body["rings"] + db.session.commit() -# db.session.(updated_planet) -# db.session.commit() + return make_response(f"Planet #{id} successfully updated") # @bp.route("/guide/", methods=["DELETE"]) # def planet_delete(id): From 0779bf148231e3ee7515a626316559b569e0ba7d Mon Sep 17 00:00:00 2001 From: Jennifer Date: Wed, 2 Nov 2022 19:04:44 -0700 Subject: [PATCH 16/29] Created DELETE route to delete single planet --- app/routes.py | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/app/routes.py b/app/routes.py index 30a926cfb..196abc79c 100644 --- a/app/routes.py +++ b/app/routes.py @@ -8,12 +8,12 @@ def validate_planet(planet_id): try: planet_id = int(planet_id) except: - abort(make_response({"message":f"book {planet_id} invalid"}, 400)) + abort(make_response({"message":f"Planet #{planet_id} invalid"}, 400)) planet = Planet.query.get(planet_id) if not planet: - abort(make_response({"message":f"book {planet_id} not found"}, 404)) + abort(make_response({"message":f"Planet #{planet_id} not found"}, 404)) return planet @@ -27,41 +27,44 @@ def create_planet(): db.session.add(new_planet) db.session.commit() - return make_response(f"Planet {new_planet.name} succesfully created", 201) + return make_response(f"Planet {new_planet.name} successfully created", 201) +# FIXME: response returns 400 code even when successful @bp.route("", methods=["GET"]) def get_all_planets(): - planets = Planet.query.all() planets_response = [] + planets = Planet.query.all() + for planet in planets: planets_response.append(planet.build_planet_dict()) - return jsonify(planets_response), 400 + return jsonify(planets_response) -@bp.route("/", methods=["GET"]) -def read_one_planet(id): - planet = validate_planet(id) +@bp.route("/", methods=["GET"]) +def read_one_planet(planet_id): + planet = validate_planet(planet_id) return jsonify(planet.build_planet_dict()) -@bp.route("/", methods=["PUT"]) -def update_planet(id): - planet = validate_planet(id) +@bp.route("/", methods=["PUT"]) +def update_planet(planet_id): + planet = validate_planet(planet_id) request_body = request.get_json() - planet.name = request_body["name"], - planet.description = request_body["description"], + planet.name = request_body["name"] + planet.description = request_body["description"] planet.rings = request_body["rings"] db.session.commit() - return make_response(f"Planet #{id} successfully updated") + return make_response(f"Planet #{planet.id} successfully updated", 200) -# @bp.route("/guide/", methods=["DELETE"]) -# def planet_delete(id): -# request_body = request.get_json() -# planet_delete = Planet(title=request_body["name"], -# description=request_body["description"], -# rings=request_body["rings"]) +# FIXME: response returns 405 'Method not allowed' +@bp.route("/", methods=["DELETE"]) +def delete_planet(planet_id): + planet = validate_planet(planet_id) + + db.session.delete(planet) + db.session.commit() -# return make_response(f"Planet {planet_delete} successfully deleted", 201) \ No newline at end of file + return make_response(f"Planet #{planet.id} successfully deleted", 200) \ No newline at end of file From 0cd42c53c3e01645d8d203c5fec4b2bb77600edc Mon Sep 17 00:00:00 2001 From: Jennifer Date: Wed, 2 Nov 2022 19:51:58 -0700 Subject: [PATCH 17/29] Created query params in GET all planets route --- app/routes.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 196abc79c..eb18f77db 100644 --- a/app/routes.py +++ b/app/routes.py @@ -29,11 +29,23 @@ def create_planet(): return make_response(f"Planet {new_planet.name} successfully created", 201) -# FIXME: response returns 400 code even when successful @bp.route("", methods=["GET"]) def get_all_planets(): + name_query = request.args.get("name") + rings_query = request.args.get("rings") + limit_query = request.args.get("limit") + + planet_query = Planet.query + + if name_query: + planet_query = planet_query.filter_by(name=name_query) + if rings_query: + planet_query = planet_query.filter_by(rings=rings_query) + if limit_query: + planet_query = planet_query.limit(limit=limit_query) + + planets = planet_query.all() planets_response = [] - planets = Planet.query.all() for planet in planets: planets_response.append(planet.build_planet_dict()) @@ -59,7 +71,6 @@ def update_planet(planet_id): return make_response(f"Planet #{planet.id} successfully updated", 200) -# FIXME: response returns 405 'Method not allowed' @bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): planet = validate_planet(planet_id) From abc5831e6ffc3088ac78b4479655b8eb4e471184 Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Thu, 3 Nov 2022 19:32:10 -0400 Subject: [PATCH 18/29] updating any missing changes --- app/routes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/routes.py b/app/routes.py index 196abc79c..8a73d78a9 100644 --- a/app/routes.py +++ b/app/routes.py @@ -29,7 +29,7 @@ def create_planet(): return make_response(f"Planet {new_planet.name} successfully created", 201) -# FIXME: response returns 400 code even when successful + @bp.route("", methods=["GET"]) def get_all_planets(): planets_response = [] @@ -59,7 +59,6 @@ def update_planet(planet_id): return make_response(f"Planet #{planet.id} successfully updated", 200) -# FIXME: response returns 405 'Method not allowed' @bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): planet = validate_planet(planet_id) From 4acbc6b7ca915abeb05927e4c5fead7bbf2e7cab Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Thu, 3 Nov 2022 20:01:53 -0400 Subject: [PATCH 19/29] created test files --- app/__init__.py | 11 ++++++++++- test/__init__.py | 0 test/conftest.py | 0 test/test_routes.py | 0 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 test/__init__.py create mode 100644 test/conftest.py create mode 100644 test/test_routes.py diff --git a/app/__init__.py b/app/__init__.py index 4a8630e72..25e5605b8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,15 +1,24 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate +from dotenv import load_dotenv +import os db = SQLAlchemy() migrate = Migrate() +load_dotenv() + def create_app(test_config=None): app = Flask(__name__) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + # if not test_config: + # app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + # else: + # app.config("TESTING") = True + # app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get("SQLALCHEMY_DATABASE_URI") + from app.models.planet import Planet diff --git a/test/__init__.py b/test/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/conftest.py b/test/conftest.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_routes.py b/test/test_routes.py new file mode 100644 index 000000000..e69de29bb From 70986e78d8fafc7fada796ee64e7537306b71bdc Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Thu, 3 Nov 2022 20:09:18 -0400 Subject: [PATCH 20/29] conftest started --- test/__init__.py | 32 ++++++++++++++++++++++++++++++++ test/conftest.py | 25 +++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/test/__init__.py b/test/__init__.py index e69de29bb..03932f1e0 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -0,0 +1,32 @@ +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__) + + if not test_config: + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get( + "SQLALCHEMY_DATABASE_URI") + else: + app.config["TESTING"] = True + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get( + "SQLALCHEMY_TEST_DATABASE_URI") + + db.init_app(app) + migrate.init_app(app, db) + + from app.models.planet import Book + + from .routes import books_bp + app.register_blueprint(books_bp) + + return app \ No newline at end of file diff --git a/test/conftest.py b/test/conftest.py index e69de29bb..ac8a4193b 100644 --- a/test/conftest.py +++ b/test/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 From ac8d537a9d6e834300e153e005a42cf56df8541a Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Thu, 3 Nov 2022 20:24:57 -0400 Subject: [PATCH 21/29] changes made after review --- app/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 25e5605b8..b34f6836d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -13,11 +13,6 @@ def create_app(test_config=None): app = Flask(__name__) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - # if not test_config: - # app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' - # else: - # app.config("TESTING") = True - # app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get("SQLALCHEMY_DATABASE_URI") from app.models.planet import Planet From 45f9864a46ef3ec8afd795c6fc5e1368383ba87c Mon Sep 17 00:00:00 2001 From: Jennifer Date: Thu, 3 Nov 2022 17:25:18 -0700 Subject: [PATCH 22/29] Reconfigured app to use env --- app/__init__.py | 17 +++++++++++++---- app/routes.py | 12 ++++++------ app/tests/__init__.py | 0 app/tests/conftest.py | 0 app/tests/test_routes.py | 0 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 app/tests/__init__.py create mode 100644 app/tests/conftest.py create mode 100644 app/tests/test_routes.py diff --git a/app/__init__.py b/app/__init__.py index 4a8630e72..031556078 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' + app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False + 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") + from app.models.planet import Planet db.init_app(app) migrate.init_app(app, db) - from .routes import bp - app.register_blueprint(bp) + from .routes import planet_bp + app.register_blueprint(planet_bp) return app diff --git a/app/routes.py b/app/routes.py index eb18f77db..206786438 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,7 +2,7 @@ from app.models.planet import Planet from app import db -bp = Blueprint("planets", __name__, url_prefix="/planets") +planet_bp = Blueprint("planets", __name__, url_prefix="/planets") def validate_planet(planet_id): try: @@ -17,7 +17,7 @@ def validate_planet(planet_id): return planet -@bp.route("", methods=["POST"]) +@planet_bp.route("", methods=["POST"]) def create_planet(): request_body = request.get_json() new_planet = Planet(name=request_body["name"], @@ -29,7 +29,7 @@ def create_planet(): return make_response(f"Planet {new_planet.name} successfully created", 201) -@bp.route("", methods=["GET"]) +@planet_bp.route("", methods=["GET"]) def get_all_planets(): name_query = request.args.get("name") rings_query = request.args.get("rings") @@ -52,13 +52,13 @@ def get_all_planets(): return jsonify(planets_response) -@bp.route("/", methods=["GET"]) +@planet_bp.route("/", methods=["GET"]) def read_one_planet(planet_id): planet = validate_planet(planet_id) return jsonify(planet.build_planet_dict()) -@bp.route("/", methods=["PUT"]) +@planet_bp.route("/", methods=["PUT"]) def update_planet(planet_id): planet = validate_planet(planet_id) request_body = request.get_json() @@ -71,7 +71,7 @@ def update_planet(planet_id): return make_response(f"Planet #{planet.id} successfully updated", 200) -@bp.route("/", methods=["DELETE"]) +@planet_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): planet = validate_planet(planet_id) diff --git a/app/tests/__init__.py b/app/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/tests/conftest.py b/app/tests/conftest.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py new file mode 100644 index 000000000..e69de29bb From 44cc2b994886e53928bb8094c75d31f1267d0d92 Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Thu, 3 Nov 2022 20:51:45 -0400 Subject: [PATCH 23/29] test_routes fucntions created --- test/test_routes.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/test_routes.py b/test/test_routes.py index e69de29bb..a5458d90c 100644 --- a/test/test_routes.py +++ b/test/test_routes.py @@ -0,0 +1,18 @@ +def test_get_all_planets(client): + #Act + response = client.get("/planets") + response_body = response.get_json() + #Assert + assert response.status_code == 200 + assert response_body == [] + + +def test_get_one_planet(client,one_saved_planet): + response = client.get("/planets/1") + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body == ["id"] == one_saved_planet.id + assert response_body == ["name"] == one_saved_planet.name + assert response_body == ["rings"] == one_saved_planet.rings + assert response_body == ["description"] == one_saved_planet.rings From 5b2f9f07a7ead1b9950064a2a35f28c8b3d2c068 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Thu, 3 Nov 2022 18:17:56 -0700 Subject: [PATCH 24/29] Created get one and get all planets tests --- app/tests/__init__.py | 0 app/tests/conftest.py | 0 app/tests/test_routes.py | 0 test/conftest.py | 25 ------------------- test/test_routes.py | 18 ------------- {test => tests}/__init__.py | 0 tests/conftest.py | 50 +++++++++++++++++++++++++++++++++++++ tests/test_routes.py | 36 ++++++++++++++++++++++++++ 8 files changed, 86 insertions(+), 43 deletions(-) delete mode 100644 app/tests/__init__.py delete mode 100644 app/tests/conftest.py delete mode 100644 app/tests/test_routes.py delete mode 100644 test/conftest.py delete mode 100644 test/test_routes.py rename {test => tests}/__init__.py (100%) create mode 100644 tests/conftest.py create mode 100644 tests/test_routes.py diff --git a/app/tests/__init__.py b/app/tests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/tests/conftest.py b/app/tests/conftest.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/conftest.py b/test/conftest.py deleted file mode 100644 index ac8a4193b..000000000 --- a/test/conftest.py +++ /dev/null @@ -1,25 +0,0 @@ -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/test/test_routes.py b/test/test_routes.py deleted file mode 100644 index a5458d90c..000000000 --- a/test/test_routes.py +++ /dev/null @@ -1,18 +0,0 @@ -def test_get_all_planets(client): - #Act - response = client.get("/planets") - response_body = response.get_json() - #Assert - assert response.status_code == 200 - assert response_body == [] - - -def test_get_one_planet(client,one_saved_planet): - response = client.get("/planets/1") - response_body = response.get_json() - - assert response.status_code == 200 - assert response_body == ["id"] == one_saved_planet.id - assert response_body == ["name"] == one_saved_planet.name - assert response_body == ["rings"] == one_saved_planet.rings - assert response_body == ["description"] == one_saved_planet.rings diff --git a/test/__init__.py b/tests/__init__.py similarity index 100% rename from test/__init__.py rename to tests/__init__.py diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 000000000..37c4564e1 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,50 @@ +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_saved_planet(): + planet = Planet(name='Earth', description='The blue marble', rings=False) + db.session.add(planet) + db.session.commit() + return planet + +@pytest.fixture +def all_planets(): + planets = [ + Planet(name="Mercury", description="The smallest and fastest planet", rings=False), + Planet(name="Venus", description="The hottest planet", rings=False), + Planet(name="Earth", description="The blue marble", rings=False), + Planet(name="Mars", description="The red planet", rings=False), + Planet(name="Jupiter", description="The gas giant", rings=False), + Planet(name="Saturn", description="The second largest planet", rings=True), + Planet(name="Uranus", description="This planet spins on its side", rings=True), + Planet(name="Neptune", description="The most distant planet from the sun", rings=False) + ] + + db.session.add_all(planets) + db.session.commit() + return planets diff --git a/tests/test_routes.py b/tests/test_routes.py new file mode 100644 index 000000000..cf49d9d2d --- /dev/null +++ b/tests/test_routes.py @@ -0,0 +1,36 @@ +def test_get_all_planets_with_no_records(client): + #Act + response = client.get("/planets") + response_body = response.get_json() + #Assert + assert response.status_code == 200 + assert response_body == [] + +"""Create test fixtures and unit tests for the following test cases: + +1. `GET` `/planets/1` returns a response body that matches our fixture +1. `GET` `/planets/1` with no data in test database (no fixture) returns a `404` +1. `GET` `/planets` with valid test data (fixtures) returns a `200` with an array including appropriate test data +1. `POST` `/planets` with a JSON request body returns a `201`""" + +def test_get_one_planet(client, one_saved_planet): + response = client.get("/planets/1") + response_body = response.get_json() + + assert response.status_code == 200 + assert response_body["id"] == one_saved_planet.id + assert response_body["name"] == one_saved_planet.name + assert response_body["rings"] == one_saved_planet.rings + assert response_body["description"] == one_saved_planet.description + +def test_no_data_returns_404(client): + response = client.get("/planets/1") + + assert response.status_code == 404 + +def test_get_all_planets(client, all_planets): + response = client.get("/planets") + response_body = response.get_json() + + assert response.status_code == 200 + assert len(response_body) == 8 \ No newline at end of file From 2538aa4567f6de358f5213be7c6e06031315902a Mon Sep 17 00:00:00 2001 From: Diana Soriano Date: Thu, 3 Nov 2022 21:18:27 -0400 Subject: [PATCH 25/29] test_routes functions --- {test => tests}/__init__.py | 0 {test => tests}/conftest.py | 0 {test => tests}/test_routes.py | 10 ++++++---- 3 files changed, 6 insertions(+), 4 deletions(-) rename {test => tests}/__init__.py (100%) rename {test => tests}/conftest.py (100%) rename {test => tests}/test_routes.py (59%) diff --git a/test/__init__.py b/tests/__init__.py similarity index 100% rename from test/__init__.py rename to tests/__init__.py diff --git a/test/conftest.py b/tests/conftest.py similarity index 100% rename from test/conftest.py rename to tests/conftest.py diff --git a/test/test_routes.py b/tests/test_routes.py similarity index 59% rename from test/test_routes.py rename to tests/test_routes.py index a5458d90c..b08e673c3 100644 --- a/test/test_routes.py +++ b/tests/test_routes.py @@ -12,7 +12,9 @@ def test_get_one_planet(client,one_saved_planet): response_body = response.get_json() assert response.status_code == 200 - assert response_body == ["id"] == one_saved_planet.id - assert response_body == ["name"] == one_saved_planet.name - assert response_body == ["rings"] == one_saved_planet.rings - assert response_body == ["description"] == one_saved_planet.rings + assert response_body["id"] == one_saved_planet.id + assert response_body["name"] == one_saved_planet.name + assert response_body["rings"] == one_saved_planet.rings + assert response_body["description"] == one_saved_planet.description + +1,2,3,4,55,6, \ No newline at end of file From 8011fd2a5db5cb47e1bce83f78e5fe7aeb314df0 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Thu, 3 Nov 2022 18:27:50 -0700 Subject: [PATCH 26/29] Created get all planets test --- tests/test_routes.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index cf49d9d2d..4bbdfb999 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -13,7 +13,7 @@ def test_get_all_planets_with_no_records(client): 1. `GET` `/planets` with valid test data (fixtures) returns a `200` with an array including appropriate test data 1. `POST` `/planets` with a JSON request body returns a `201`""" -def test_get_one_planet(client, one_saved_planet): +def test_get_one_planet_returns_planet(client, one_saved_planet): response = client.get("/planets/1") response_body = response.get_json() @@ -22,15 +22,23 @@ def test_get_one_planet(client, one_saved_planet): assert response_body["name"] == one_saved_planet.name assert response_body["rings"] == one_saved_planet.rings assert response_body["description"] == one_saved_planet.description + # assert response_body == {'id': 1, + # 'name': 'Earth', + # 'description': 'The blue marble', + # 'rings': False} -def test_no_data_returns_404(client): +def test_get_one_planet_with_no_records(client): response = client.get("/planets/1") assert response.status_code == 404 -def test_get_all_planets(client, all_planets): +def test_get_all_planets_returns_all_planets(client, all_planets): response = client.get("/planets") response_body = response.get_json() assert response.status_code == 200 - assert len(response_body) == 8 \ No newline at end of file + assert len(response_body) == 8 + +def test_post_ + + assert response.status_code == 201 \ No newline at end of file From de958535298b8145f3d2a36aa72bb729a9169312 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Thu, 3 Nov 2022 18:47:14 -0700 Subject: [PATCH 27/29] Created post route test --- tests/test_routes.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index 4bbdfb999..c9f7889d8 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,3 +1,5 @@ +from app.models.planet import Planet + def test_get_all_planets_with_no_records(client): #Act response = client.get("/planets") @@ -39,6 +41,19 @@ def test_get_all_planets_returns_all_planets(client, all_planets): assert response.status_code == 200 assert len(response_body) == 8 -def test_post_ - - assert response.status_code == 201 \ No newline at end of file +def test_create_planet_path(client): + EXPECTED_PLANET = { + "name": "Pluto", + "description": "Not a planet :(", + "rings": False + } + + response = client.post("/planets", json=EXPECTED_PLANET) + response_body = response.get_data(as_text=True) + planet = Planet.query.get(1) + + assert response.status_code == 201 + assert response_body == f"Planet {EXPECTED_PLANET['name']} successfully created" + assert planet.name == EXPECTED_PLANET["name"] + assert planet.description == EXPECTED_PLANET["description"] + assert planet.rings == EXPECTED_PLANET["rings"] \ No newline at end of file From 3f8a911fcd8573a7fc1d56b683abe1c5b37a436d Mon Sep 17 00:00:00 2001 From: Jennifer Date: Thu, 3 Nov 2022 19:03:58 -0700 Subject: [PATCH 28/29] cleaned test files --- tests/test_routes.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index eb9df3804..46f4f0c96 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -8,13 +8,6 @@ def test_get_all_planets_with_no_records(client): assert response.status_code == 200 assert response_body == [] -"""Create test fixtures and unit tests for the following test cases: - -1. `GET` `/planets/1` returns a response body that matches our fixture -1. `GET` `/planets/1` with no data in test database (no fixture) returns a `404` -1. `GET` `/planets` with valid test data (fixtures) returns a `200` with an array including appropriate test data -1. `POST` `/planets` with a JSON request body returns a `201`""" - def test_get_one_planet_returns_planet(client, one_saved_planet): response = client.get("/planets/1") response_body = response.get_json() @@ -24,10 +17,6 @@ def test_get_one_planet_returns_planet(client, one_saved_planet): assert response_body["name"] == one_saved_planet.name assert response_body["rings"] == one_saved_planet.rings assert response_body["description"] == one_saved_planet.description - # assert response_body == {'id': 1, - # 'name': 'Earth', - # 'description': 'The blue marble', - # 'rings': False} def test_get_one_planet_with_no_records(client): response = client.get("/planets/1") From b4308934f7465d0a9e27a77275228f38c8b83e65 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Tue, 24 Jan 2023 18:29:40 -0800 Subject: [PATCH 29/29] refactoring tests --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 37c4564e1..176183d89 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -35,7 +35,7 @@ def one_saved_planet(): @pytest.fixture def all_planets(): planets = [ - Planet(name="Mercury", description="The smallest and fastest planet", rings=False), + Planet(name="Mercury", description="The smallest planet", rings=False), Planet(name="Venus", description="The hottest planet", rings=False), Planet(name="Earth", description="The blue marble", rings=False), Planet(name="Mars", description="The red planet", rings=False),