From 966c4264e7f96fe14e5e328600bfd331145c4092 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Mon, 25 Apr 2022 09:09:23 -1000 Subject: [PATCH 01/16] W1W2 --- app/__init__.py | 3 +++ app/planet.py | 15 +++++++++++++++ app/routes.py | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 app/planet.py diff --git a/app/__init__.py b/app/__init__.py index 70b4cabfe..ab9eee40e 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 planets_bp + app.register_blueprint(planets_bp) + return app diff --git a/app/planet.py b/app/planet.py new file mode 100644 index 000000000..146125836 --- /dev/null +++ b/app/planet.py @@ -0,0 +1,15 @@ +class Planet(): + def __init__(self, id, name, description, moons = None): + self.id = id + self.name = name + self.description = description + self.moons = moons + + def to_json(self): + return { + "id": self.id, + "name" : self.name, + "decription": self.description, + "moons": self.moons + + } diff --git a/app/routes.py b/app/routes.py index 8e9dfe684..f808dc07f 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,2 +1,34 @@ -from flask import Blueprint +from flask import Blueprint, jsonify, abort, make_response +from .planet import Planet +planets = [ + Planet(1, "Earth", "blue planet", 1), + Planet(2, "Mercury", "closest to sun", 0), + Planet(3, "Jupiter", "has big spot", 66) +] +planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") + +@planets_bp.route("", methods=["GET"]) +def handle_planets(): + planets_response = [] + for planet in planets: + planets_response.append(planet.to_json()) + + return jsonify(planets_response) + +def validate_planet(id): + try: + id = int(id) + except: + return abort(make_response({"message":f"planet_id {id} invalid"}, 400)) + + for planet in planets: + if planet.id == id: + return planet + + return abort(make_response({"message":f"planet {id} not found"}, 404)) + +@planets_bp.route("/", methods=["GET"]) +def handle_planet(id): + planet = validate_planet(id) + return jsonify(planet.to_json(), 200) \ No newline at end of file From 78b1a5ebecd176e91001b751d14cc7c406b6cfe0 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Tue, 26 Apr 2022 09:51:34 -1000 Subject: [PATCH 02/16] don't display code in response body --- app/routes.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index f808dc07f..e1b9c6c3b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -21,14 +21,19 @@ def validate_planet(id): id = int(id) except: return abort(make_response({"message":f"planet_id {id} invalid"}, 400)) + + + for planet in planets: if planet.id == id: return planet return abort(make_response({"message":f"planet {id} not found"}, 404)) + + @planets_bp.route("/", methods=["GET"]) def handle_planet(id): planet = validate_planet(id) - return jsonify(planet.to_json(), 200) \ No newline at end of file + return jsonify(planet.to_json()), 200 \ No newline at end of file From 5f22a57f1752ee8e7cddb024331e45d7e4e85dd1 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Tue, 26 Apr 2022 09:57:59 -1000 Subject: [PATCH 03/16] remove extra space so code looks nicer --- app/__init__.py | 1 - app/planet.py | 1 - app/routes.py | 5 ----- 3 files changed, 7 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index ab9eee40e..01ddd0208 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,5 @@ from flask import Flask - def create_app(test_config=None): app = Flask(__name__) diff --git a/app/planet.py b/app/planet.py index 146125836..94805f98e 100644 --- a/app/planet.py +++ b/app/planet.py @@ -11,5 +11,4 @@ def to_json(self): "name" : self.name, "decription": self.description, "moons": self.moons - } diff --git a/app/routes.py b/app/routes.py index e1b9c6c3b..76bc10b1d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -22,17 +22,12 @@ def validate_planet(id): except: return abort(make_response({"message":f"planet_id {id} invalid"}, 400)) - - - for planet in planets: if planet.id == id: return planet return abort(make_response({"message":f"planet {id} not found"}, 404)) - - @planets_bp.route("/", methods=["GET"]) def handle_planet(id): planet = validate_planet(id) From 5e55917ff3b7d93c89910213ad6299d7a7a29ac3 Mon Sep 17 00:00:00 2001 From: Thuytien Nguyen Date: Tue, 26 Apr 2022 16:51:55 -0400 Subject: [PATCH 04/16] w1&w2. Ready for submission --- app/routes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/routes.py b/app/routes.py index f808dc07f..c3b74724a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -20,15 +20,15 @@ def validate_planet(id): try: id = int(id) except: - return abort(make_response({"message":f"planet_id {id} invalid"}, 400)) - + abort(make_response({"message":f"planet_id {id} invalid"}, 400)) + for planet in planets: if planet.id == id: return planet - return abort(make_response({"message":f"planet {id} not found"}, 404)) + abort(make_response({"message":f"planet {id} not found"}, 404)) @planets_bp.route("/", methods=["GET"]) def handle_planet(id): planet = validate_planet(id) - return jsonify(planet.to_json(), 200) \ No newline at end of file + return jsonify(planet.to_json()) \ No newline at end of file From bf7d0d4b81bacd62939a76abbb89e3fcc1823a81 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Tue, 26 Apr 2022 17:07:43 -1000 Subject: [PATCH 05/16] default set to zero --- app/routes.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index 76bc10b1d..77d86b62a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,7 +3,7 @@ planets = [ Planet(1, "Earth", "blue planet", 1), - Planet(2, "Mercury", "closest to sun", 0), + Planet(2, "Mercury", "closest to sun"), Planet(3, "Jupiter", "has big spot", 66) ] planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") @@ -20,13 +20,14 @@ def validate_planet(id): try: id = int(id) except: - return abort(make_response({"message":f"planet_id {id} invalid"}, 400)) + abort(make_response({"message":f"planet_id {id} invalid"}, 400)) for planet in planets: if planet.id == id: return planet - return abort(make_response({"message":f"planet {id} not found"}, 404)) + abort(make_response({"message":f"planet {id} not found"}, 404)) + @planets_bp.route("/", methods=["GET"]) def handle_planet(id): From a5a72615040585304e1f2968fe347853568a1adb Mon Sep 17 00:00:00 2001 From: Thuytien Nguyen Date: Sat, 30 Apr 2022 23:14:46 -0400 Subject: [PATCH 06/16] Tien completed wave 1 - wave 4 --- app/models/__init__.py | 0 app/models/planet.py | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py 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..790a54cc6 --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,25 @@ +from app import db +''' +planet_data = [ + {"name":"Earth", "description": "blue planet", "moons": "1" }, + {"name":"Mercury", "description": "closest to sun and smallest", "moons": "0"}, + {"name":"Jupiter", "description": "largest in the solar system", "moons": "66"}, + {"name":"Venus", "description": "brightest object in Earth's night sky after the Moon", "moons": "0"} + {"name":"Mars", "description": "Second smallest planet and also is called 'Red planet'", "moons": "2"} +] +''' + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String) + description = db.Column(db.String) + moons = db.Column(db.Integer) + + def to_json(self): + return { + "id": self.id, + "name" : self.name, + "decription": self.description, + "moons": self.moons + } + From 7f14526379f6350a8632acc951bd7f48630acc56 Mon Sep 17 00:00:00 2001 From: Thuytien Nguyen Date: Mon, 2 May 2022 13:12:40 -0400 Subject: [PATCH 07/16] Tien completed wave1 - wave4 --- app/__init__.py | 14 ++++ app/planet.py | 14 ---- app/routes.py | 78 ++++++++++++++++------ migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/e1cff176ee22_.py | 34 ++++++++++ 8 files changed, 271 insertions(+), 35 deletions(-) delete mode 100644 app/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/e1cff176ee22_.py diff --git a/app/__init__.py b/app/__init__.py index 01ddd0208..aa394daab 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,9 +1,23 @@ 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/planets' + + db.init_app(app) + migrate.init_app(app, db) + from .routes import planets_bp app.register_blueprint(planets_bp) + from app.models.planet import Planet + return app diff --git a/app/planet.py b/app/planet.py deleted file mode 100644 index 94805f98e..000000000 --- a/app/planet.py +++ /dev/null @@ -1,14 +0,0 @@ -class Planet(): - def __init__(self, id, name, description, moons = None): - self.id = id - self.name = name - self.description = description - self.moons = moons - - def to_json(self): - return { - "id": self.id, - "name" : self.name, - "decription": self.description, - "moons": self.moons - } diff --git a/app/routes.py b/app/routes.py index f12856b99..e2f00ca84 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,34 +1,70 @@ -from flask import Blueprint, jsonify, abort, make_response -from .planet import Planet - -planets = [ - Planet(1, "Earth", "blue planet", 1), - Planet(2, "Mercury", "closest to sun", 0), - Planet(3, "Jupiter", "has big spot", 66) -] +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, abort, make_response, request + + planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") +@planets_bp.route("", methods=["POST"]) +def handle_post_planets(): + request_body = request.get_json() + new_planet = Planet(name=request_body["name"], + description=request_body["description"], + moons = int(request_body["moons"])) + + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} successfully created", 201) + @planets_bp.route("", methods=["GET"]) -def handle_planets(): +def handle_read_planets(): + planets = Planet.query.all() planets_response = [] for planet in planets: planets_response.append(planet.to_json()) return jsonify(planets_response) -def validate_planet(id): - try: - id = int(id) - except: - abort(make_response({"message":f"planet_id {id} invalid"}, 400)) - - for planet in planets: - if planet.id == id: - return planet - - abort(make_response({"message":f"planet {id} not found"}, 404)) @planets_bp.route("/", methods=["GET"]) -def handle_planet(id): +def handle_one_planet(id): planet = validate_planet(id) return jsonify(planet.to_json()) + +@planets_bp.route("/", methods=["PUT"]) +def update_one_planet(id): + planet = validate_planet(id) + + request_body = request.get_json() + + planet.name = request_body["name"] + planet.description = request_body["description"] + + db.session.commit() + + return make_response(f"Planet #{planet.id} successfully updated") + +@planets_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.id} successfully deleted") + + + + + + +def validate_planet(id): + if not id.isdigit(): + abort(make_response({"message":f"planet_id {id} invalid"}, 400)) + + planet = Planet.query.get(id) + if (planet == None): + abort(make_response({"message":f"planet {id} not found"}, 404)) + + return planet \ No newline at end of file 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/e1cff176ee22_.py b/migrations/versions/e1cff176ee22_.py new file mode 100644 index 000000000..3ca636d72 --- /dev/null +++ b/migrations/versions/e1cff176ee22_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: e1cff176ee22 +Revises: +Create Date: 2022-04-30 21:20:36.091638 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e1cff176ee22' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('planet', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('moons', sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 7617f582db483cd671ad86c588b52d9c378c5c9f Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Mon, 2 May 2022 07:16:30 -1000 Subject: [PATCH 08/16] test changes --- app/__init__.py | 31 +++++ app/models/__init__.py | 0 app/models/planet.py | 31 +++++ app/planet.py | 14 --- app/routes.py | 109 ++++++++++++++---- app/tests/__init__.py | 0 app/tests/conftest.py | 42 +++++++ app/tests/test_routes.py | 22 ++++ migrations/README | 1 + migrations/alembic.ini | 45 ++++++++ migrations/env.py | 96 +++++++++++++++ migrations/script.py.mako | 24 ++++ .../8161811efdc8_adds_planet_model.py | 34 ++++++ 13 files changed, 414 insertions(+), 35 deletions(-) create mode 100644 app/models/__init__.py create mode 100644 app/models/planet.py delete mode 100644 app/planet.py create mode 100644 app/tests/__init__.py create mode 100644 app/tests/conftest.py create mode 100644 app/tests/test_routes.py create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/8161811efdc8_adds_planet_model.py diff --git a/app/__init__.py b/app/__init__.py index 01ddd0208..175e288a9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,9 +1,40 @@ from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +from dotenv import load_dotenv +import os + +db = SQLAlchemy() +migrate = Migrate() +load_dotenv() def create_app(test_config=None): app = Flask(__name__) + # app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + # app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development' + + if not test_config: + app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + app.config['SQLALCHEMY_DATABASE_URI'] = 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) + + # Import models here + from app.models.planet import Planet + + # Register Blueprints here 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..2211851c5 --- /dev/null +++ b/app/models/planet.py @@ -0,0 +1,31 @@ +from app import db + +class Planet(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String) + description = db.Column(db.String) + moons = db.Column(db.Integer) + + def to_json(self): + return { + "id": self.id, + "name" : self.name, + "decription": self.description, + "moons": self.moons + } + + +# class Planet(): +# def __init__(self, id, name, description, moons = None): +# self.id = id +# self.name = name +# self.description = description +# self.moons = moons + +# def to_json(self): +# return { +# "id": self.id, +# "name" : self.name, +# "decription": self.description, +# "moons": self.moons +# } diff --git a/app/planet.py b/app/planet.py deleted file mode 100644 index 94805f98e..000000000 --- a/app/planet.py +++ /dev/null @@ -1,14 +0,0 @@ -class Planet(): - def __init__(self, id, name, description, moons = None): - self.id = id - self.name = name - self.description = description - self.moons = moons - - def to_json(self): - return { - "id": self.id, - "name" : self.name, - "decription": self.description, - "moons": self.moons - } diff --git a/app/routes.py b/app/routes.py index 54e1a6711..a7a17ef10 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,35 +1,102 @@ -from flask import Blueprint, jsonify, abort, make_response -from .planet import Planet - -planets = [ - Planet(1, "Earth", "blue planet", 1), - Planet(2, "Mercury", "closest to sun"), - Planet(3, "Jupiter", "has big spot", 66) -] +from requests import request +from app import db +from app.models.planet import Planet +from flask import Blueprint, jsonify, abort, make_response, request + + + +# planets = [ +# Planet(1, "Earth", "blue planet", 1), +# Planet(2, "Mercury", "closest to sun"), +# Planet(3, "Jupiter", "has big spot", 66) +# ] planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") +@planets_bp.route("", methods=["POST"]) +def create_planet(): + request_body = request.get_json() + new_planet = Planet(name=request_body["name"], + description=request_body["description"], + moons=request_body["moons"]) + db.session.add(new_planet) + db.session.commit() + + return make_response(f"Planet {new_planet.name} successfully created", 201) + @planets_bp.route("", methods=["GET"]) -def handle_planets(): +def read_all_planets(): + name_query = request.args.get("name") + if name_query: + planets = Planet.query.filter_by(name=name_query) + else: + planets = Planet.query.all() + planets_response = [] for planet in planets: - planets_response.append(planet.to_json()) + planets_response.append( + { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "moons": planet.moons + } + ) return jsonify(planets_response) -def validate_planet(id): +def validate_planet(planet_id): try: - id = int(id) + planet_id = int(planet_id) except: - abort(make_response({"message":f"planet_id {id} invalid"}, 400)) + abort(make_response({"message":f"planet_id {planet_id} invalid"}, 400)) - for planet in planets: - if planet.id == id: - return planet + planet = Planet.query.get(planet_id) + + if not planet: + abort(make_response({"message":f"planet {planet_id} not found"}, 404)) + + return planet - abort(make_response({"message":f"planet {id} not found"}, 404)) +@planets_bp.route("/", methods=["GET"]) +def read_one_planet(planet_id): + planet = validate_planet(planet_id) + return { + "id": planet.id, + "name": planet.name, + "description": planet.description, + "moons": planet.moons + } +@planets_bp.route("/", methods=["PUT"]) +def update_planet(planet_id): + planet = validate_planet(planet_id) + + request_body = request.get_json() + + planet.name = request_body["name"] + planet.description = request_body["description"] + planet.moons = request_body['moons'] + + db.session.commit() + + return make_response(f"Planet #{planet.id} successfully updated") + +@planets_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.id} successfully deleted") + + + + + + -@planets_bp.route("/", methods=["GET"]) -def handle_planet(id): - planet = validate_planet(id) - return jsonify(planet.to_json()) +# @planets_bp.route("/", methods=["GET"]) +# def handle_planet(id): +# planet = validate_planet(id) +# return jsonify(planet.to_json()) 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..e4e49f33a --- /dev/null +++ b/app/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 two_saved_planets(app): + # Arrange + jupiter = Planet(name="Jupiter", + description="has big spot", + moons=66) + venus = Planet(name="Venus", + description="beauty", + moons=0) + + db.session.add_all([jupiter, venus]) + # Alternatively, we could do + # db.session.add(jupiter) + # db.session.add(venus) + db.session.commit() \ No newline at end of file diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py new file mode 100644 index 000000000..94e9b4b56 --- /dev/null +++ b/app/tests/test_routes.py @@ -0,0 +1,22 @@ +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 == [] + +def test_get_one_planet(client, two_saved_planets): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 200 + assert response_body == { + "id": 1, + "name": "Jupiter", + "description": "has big spot", + "moons": 66 + } 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/8161811efdc8_adds_planet_model.py b/migrations/versions/8161811efdc8_adds_planet_model.py new file mode 100644 index 000000000..4ceb9c373 --- /dev/null +++ b/migrations/versions/8161811efdc8_adds_planet_model.py @@ -0,0 +1,34 @@ +"""adds Planet model + +Revision ID: 8161811efdc8 +Revises: +Create Date: 2022-04-28 13:10:35.827115 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8161811efdc8' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('planet', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('moons', sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('planet') + # ### end Alembic commands ### From 408a069df984b7511262dfa768406d0863fcab99 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Mon, 2 May 2022 12:10:04 -1000 Subject: [PATCH 09/16] finished Wave 6 --- app/routes.py | 33 +++++++++++++++++---------------- app/tests/test_routes.py | 13 +++++++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/app/routes.py b/app/routes.py index 13dbd7264..cd7445fe6 100644 --- a/app/routes.py +++ b/app/routes.py @@ -12,6 +12,19 @@ # ] planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message":f"planet_id {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 create_planet(): request_body = request.get_json() @@ -21,7 +34,7 @@ def create_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 read_all_planets(): @@ -44,19 +57,6 @@ def read_all_planets(): return jsonify(planets_response) -def validate_planet(planet_id): - try: - planet_id = int(planet_id) - except: - abort(make_response({"message":f"planet_id {planet_id} invalid"}, 400)) - - planet = Planet.query.get(planet_id) - - if not planet: - abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - - return planet - @planets_bp.route("/", methods=["GET"]) def read_one_planet(planet_id): planet = validate_planet(planet_id) @@ -79,7 +79,8 @@ def update_planet(planet_id): db.session.commit() - return make_response(f"Planet #{planet.id} successfully updated") + return make_response(jsonify(f"Planet #{planet.id} successfully updated")) + @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): planet = validate_planet(planet_id) @@ -87,7 +88,7 @@ def delete_planet(planet_id): db.session.delete(planet) db.session.commit() - return make_response(f"Planet #{planet.id} successfully deleted") + return make_response(jsonify(f"Planet #{planet.id} successfully deleted")) diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py index 94e9b4b56..73d1636d1 100644 --- a/app/tests/test_routes.py +++ b/app/tests/test_routes.py @@ -20,3 +20,16 @@ def test_get_one_planet(client, two_saved_planets): "description": "has big spot", "moons": 66 } + +def test_create_one_planet(client): + # Act + response = client.post("/planets", json={ + "name": "Saturn", + "description": "has rings", + "moons": 82 + }) + response_body = response.get_json() + + # Assert + assert response.status_code == 201 + assert response_body == "Planet Saturn successfully created" From 48e352b0f4dd76e975c3d73be9a1a019c16eefad Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Wed, 4 May 2022 09:42:52 -1000 Subject: [PATCH 10/16] refactoring --- app/helper.py | 15 ++++++++++++ app/models/planet.py | 16 +++++++++++++ app/routes.py | 49 ++++++++++++++++++---------------------- app/tests/test_routes.py | 10 ++++++++ 4 files changed, 63 insertions(+), 27 deletions(-) create mode 100644 app/helper.py diff --git a/app/helper.py b/app/helper.py new file mode 100644 index 000000000..5ce35b8db --- /dev/null +++ b/app/helper.py @@ -0,0 +1,15 @@ +from flask import abort, make_response +from app.models.planet import Planet + +def validate_planet(planet_id): + try: + planet_id = int(planet_id) + except: + abort(make_response({"message":f"planet_id {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 diff --git a/app/models/planet.py b/app/models/planet.py index 2211851c5..7c100aae8 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -1,3 +1,4 @@ + from app import db class Planet(db.Model): @@ -14,6 +15,21 @@ def to_json(self): "moons": self.moons } + def update(self, req_body): + self.name = req_body["name"] + self.description = req_body["description"] + self.moons = req_body["moons"] + + @classmethod + def create(cls,req_body): + new_planet = cls( + name=req_body["name"], + description=req_body["description"], + moons=req_body["moons"] + ) + return new_planet + + # class Planet(): # def __init__(self, id, name, description, moons = None): diff --git a/app/routes.py b/app/routes.py index cd7445fe6..319378162 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,6 +2,7 @@ from app import db from app.models.planet import Planet from flask import Blueprint, jsonify, abort, make_response, request +from .helper import validate_planet @@ -12,25 +13,28 @@ # ] planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") -def validate_planet(planet_id): - try: - planet_id = int(planet_id) - except: - abort(make_response({"message":f"planet_id {planet_id} invalid"}, 400)) +# def validate_planet(planet_id): +# try: +# planet_id = int(planet_id) +# except: +# abort(make_response({"message":f"planet_id {planet_id} invalid"}, 400)) - planet = Planet.query.get(planet_id) +# planet = Planet.query.get(planet_id) - if not planet: - abort(make_response({"message":f"planet {planet_id} not found"}, 404)) +# if not planet: +# abort(make_response({"message":f"planet {planet_id} not found"}, 404)) - return planet +# return planet @planets_bp.route("", methods=["POST"]) def create_planet(): request_body = request.get_json() - new_planet = Planet(name=request_body["name"], - description=request_body["description"], - moons=request_body["moons"]) + + new_planet = Planet.create(request_body) + + # new_planet = Planet(name=request_body["name"], + # description=request_body["description"], + # moons=request_body["moons"]) db.session.add(new_planet) db.session.commit() @@ -73,9 +77,11 @@ def update_planet(planet_id): request_body = request.get_json() - planet.name = request_body["name"] - planet.description = request_body["description"] - planet.moons = request_body['moons'] + planet.update(request_body) + + # planet.name = request_body["name"] + # planet.description = request_body["description"] + # planet.moons = request_body['moons'] db.session.commit() @@ -88,15 +94,4 @@ def delete_planet(planet_id): db.session.delete(planet) db.session.commit() - return make_response(jsonify(f"Planet #{planet.id} successfully deleted")) - - - - - - - -# @planets_bp.route("/", methods=["GET"]) -# def handle_planet(id): -# planet = validate_planet(id) -# return jsonify(planet.to_json()) + return make_response(jsonify(f"Planet #{planet.id} successfully deleted")) \ No newline at end of file diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py index 73d1636d1..19687aab8 100644 --- a/app/tests/test_routes.py +++ b/app/tests/test_routes.py @@ -21,6 +21,16 @@ def test_get_one_planet(client, two_saved_planets): "moons": 66 } +def test_get_one_planet_empty(client): + # Act + response = client.get("/planets/1") + response_body = response.get_json() + + # Assert + assert response.status_code == 404 + + + def test_create_one_planet(client): # Act response = client.post("/planets", json={ From 871e952a46cf2cf6e0653a271aa234f2c70fa0df Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Wed, 4 May 2022 09:46:51 -1000 Subject: [PATCH 11/16] remove some comments --- app/routes.py | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/app/routes.py b/app/routes.py index 319378162..fb53106d4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,37 +4,14 @@ from flask import Blueprint, jsonify, abort, make_response, request from .helper import validate_planet - - -# planets = [ -# Planet(1, "Earth", "blue planet", 1), -# Planet(2, "Mercury", "closest to sun"), -# Planet(3, "Jupiter", "has big spot", 66) -# ] planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") -# def validate_planet(planet_id): -# try: -# planet_id = int(planet_id) -# except: -# abort(make_response({"message":f"planet_id {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 create_planet(): request_body = request.get_json() new_planet = Planet.create(request_body) - # new_planet = Planet(name=request_body["name"], - # description=request_body["description"], - # moons=request_body["moons"]) db.session.add(new_planet) db.session.commit() @@ -79,10 +56,6 @@ def update_planet(planet_id): planet.update(request_body) - # planet.name = request_body["name"] - # planet.description = request_body["description"] - # planet.moons = request_body['moons'] - db.session.commit() return make_response(jsonify(f"Planet #{planet.id} successfully updated")) From 8742fb56fc78cfed89734dc8b59138fa0d0bafeb Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Wed, 4 May 2022 10:00:47 -1000 Subject: [PATCH 12/16] change some refactoring --- app/routes.py | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/app/routes.py b/app/routes.py index fb53106d4..626d4505b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -6,6 +6,7 @@ planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets") +# CREATE PLANET @planets_bp.route("", methods=["POST"]) def create_planet(): request_body = request.get_json() @@ -15,8 +16,9 @@ def create_planet(): db.session.add(new_planet) db.session.commit() - return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) + return make_response(jsonify(f"Planet {new_planet.name} successfully created!", 201), 201) +# GET ALL @planets_bp.route("", methods=["GET"]) def read_all_planets(): name_query = request.args.get("name") @@ -27,38 +29,26 @@ def read_all_planets(): planets_response = [] for planet in planets: - planets_response.append( - { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "moons": planet.moons - } - ) + planets_response.append(planet.to_json()) - return jsonify(planets_response) + return jsonify(planets_response), 200 +# GET one planet @planets_bp.route("/", methods=["GET"]) def read_one_planet(planet_id): planet = validate_planet(planet_id) - return { - "id": planet.id, - "name": planet.name, - "description": planet.description, - "moons": planet.moons - } - + return jsonify(planet.to_json()), 200 + + @planets_bp.route("/", methods=["PUT"]) def update_planet(planet_id): planet = validate_planet(planet_id) - request_body = request.get_json() planet.update(request_body) db.session.commit() - - return make_response(jsonify(f"Planet #{planet.id} successfully updated")) + return make_response(jsonify(f"Planet #{planet.id} successfully updated")), 200 @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): @@ -67,4 +57,4 @@ def delete_planet(planet_id): db.session.delete(planet) db.session.commit() - return make_response(jsonify(f"Planet #{planet.id} successfully deleted")) \ No newline at end of file + return make_response(jsonify(f"Planet #{planet.id} successfully deleted")), 200 \ No newline at end of file From 8f7677a4ab54257b6296b0742407ddbd6e1341b1 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Wed, 4 May 2022 14:37:19 -1000 Subject: [PATCH 13/16] tests --- app/models/planet.py | 2 +- app/routes.py | 6 ++++-- app/tests/conftest.py | 8 ++++---- app/tests/test_routes.py | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/models/planet.py b/app/models/planet.py index 7c100aae8..aa2187cf7 100644 --- a/app/models/planet.py +++ b/app/models/planet.py @@ -11,7 +11,7 @@ def to_json(self): return { "id": self.id, "name" : self.name, - "decription": self.description, + "description": self.description, "moons": self.moons } diff --git a/app/routes.py b/app/routes.py index 626d4505b..593a3371b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -16,7 +16,8 @@ def create_planet(): db.session.add(new_planet) db.session.commit() - return make_response(jsonify(f"Planet {new_planet.name} successfully created!", 201), 201) + # return make_response(jsonify(f"Planet {new_planet.name} successfully created!", 201)) + return make_response(jsonify(f"Planet {new_planet.name} successfully created"), 201) # GET ALL @planets_bp.route("", methods=["GET"]) @@ -37,7 +38,8 @@ def read_all_planets(): @planets_bp.route("/", methods=["GET"]) def read_one_planet(planet_id): planet = validate_planet(planet_id) - return jsonify(planet.to_json()), 200 + # return jsonify(planet.to_json()), 200 + return jsonify(planet.to_json()) @planets_bp.route("/", methods=["PUT"]) diff --git a/app/tests/conftest.py b/app/tests/conftest.py index e4e49f33a..125ab93eb 100644 --- a/app/tests/conftest.py +++ b/app/tests/conftest.py @@ -29,11 +29,11 @@ def client(app): def two_saved_planets(app): # Arrange jupiter = Planet(name="Jupiter", - description="has big spot", - moons=66) + description="has big spot", + moons=66) venus = Planet(name="Venus", - description="beauty", - moons=0) + description="beauty", + moons=0) db.session.add_all([jupiter, venus]) # Alternatively, we could do diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py index 19687aab8..467ea5bfe 100644 --- a/app/tests/test_routes.py +++ b/app/tests/test_routes.py @@ -24,7 +24,7 @@ def test_get_one_planet(client, two_saved_planets): def test_get_one_planet_empty(client): # Act response = client.get("/planets/1") - response_body = response.get_json() + # response_body = response.get_json() # Assert assert response.status_code == 404 From 6fc1e714bc5194c6b3b5e41aef7dbf1fccd56cfa Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Wed, 11 May 2022 07:34:50 -1000 Subject: [PATCH 14/16] Added Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file From d4241eba0f2a7c55a039f164fcde147e2ccb9b29 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Wed, 11 May 2022 07:52:53 -1000 Subject: [PATCH 15/16] installed gunicorn --- app/routes.py | 3 ++- app/tests/test_routes.py | 1 + merge.py | 20 ++++++++++++++++++++ requirements.txt | 8 ++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 merge.py diff --git a/app/routes.py b/app/routes.py index 593a3371b..917800252 100644 --- a/app/routes.py +++ b/app/routes.py @@ -41,7 +41,7 @@ def read_one_planet(planet_id): # return jsonify(planet.to_json()), 200 return jsonify(planet.to_json()) - +# UPDATE one planet @planets_bp.route("/", methods=["PUT"]) def update_planet(planet_id): planet = validate_planet(planet_id) @@ -52,6 +52,7 @@ def update_planet(planet_id): db.session.commit() return make_response(jsonify(f"Planet #{planet.id} successfully updated")), 200 +# DELETE one planet @planets_bp.route("/", methods=["DELETE"]) def delete_planet(planet_id): planet = validate_planet(planet_id) diff --git a/app/tests/test_routes.py b/app/tests/test_routes.py index 467ea5bfe..04b4738fe 100644 --- a/app/tests/test_routes.py +++ b/app/tests/test_routes.py @@ -28,6 +28,7 @@ def test_get_one_planet_empty(client): # Assert assert response.status_code == 404 + # assert response_body == make_response({"message":f"planet {planet_id} not found"}, 404) diff --git a/merge.py b/merge.py new file mode 100644 index 000000000..23ae8c133 --- /dev/null +++ b/merge.py @@ -0,0 +1,20 @@ +result = [] +def merge_lists(list1, list2): + + if not list1: + return list2 + if not list2: + return list1 + if not list1 and not list2: + return [] + + if list1[0] < list2[0]: + result.append(list1[0]) + merge_lists(list1[1:], list2) + else: + result.append(list2[0]) + merge_lists(list1, list2[1:]) + + return result + +print(merge_lists([1, 2, 4, 5], [1, 2, 4, 5, 6])) diff --git a/requirements.txt b/requirements.txt index a506b4d12..37b7c1d29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,27 @@ alembic==1.5.4 +attrs==21.4.0 autopep8==1.5.5 blinker==1.4 certifi==2020.12.5 chardet==4.0.0 click==7.1.2 +coverage==6.3.2 Flask==1.1.2 Flask-Migrate==2.6.0 Flask-SQLAlchemy==2.4.4 +gunicorn==20.1.0 idna==2.10 +iniconfig==1.1.1 itsdangerous==1.1.0 Jinja2==2.11.3 Mako==1.1.4 MarkupSafe==1.1.1 +packaging==21.3 +pluggy==0.13.1 psycopg2-binary==2.8.6 +py==1.11.0 pycodestyle==2.6.0 +pyparsing==3.0.8 pytest==6.2.3 pytest-cov==2.12.1 python-dateutil==2.8.1 From cd269be174b77b7cdbfe1e377ed9f2b87252b946 Mon Sep 17 00:00:00 2001 From: Anna Pranovich Date: Wed, 11 May 2022 08:09:12 -1000 Subject: [PATCH 16/16] added planets model --- ...6ee22_.py => 2c36a825ccc2_adds_planets.py} | 8 ++--- .../8161811efdc8_adds_planet_model.py | 34 ------------------- 2 files changed, 4 insertions(+), 38 deletions(-) rename migrations/versions/{e1cff176ee22_.py => 2c36a825ccc2_adds_planets.py} (87%) delete mode 100644 migrations/versions/8161811efdc8_adds_planet_model.py diff --git a/migrations/versions/e1cff176ee22_.py b/migrations/versions/2c36a825ccc2_adds_planets.py similarity index 87% rename from migrations/versions/e1cff176ee22_.py rename to migrations/versions/2c36a825ccc2_adds_planets.py index 3ca636d72..e5305688f 100644 --- a/migrations/versions/e1cff176ee22_.py +++ b/migrations/versions/2c36a825ccc2_adds_planets.py @@ -1,8 +1,8 @@ -"""empty message +"""adds planets -Revision ID: e1cff176ee22 +Revision ID: 2c36a825ccc2 Revises: -Create Date: 2022-04-30 21:20:36.091638 +Create Date: 2022-05-11 08:07:48.872328 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'e1cff176ee22' +revision = '2c36a825ccc2' down_revision = None branch_labels = None depends_on = None diff --git a/migrations/versions/8161811efdc8_adds_planet_model.py b/migrations/versions/8161811efdc8_adds_planet_model.py deleted file mode 100644 index 4ceb9c373..000000000 --- a/migrations/versions/8161811efdc8_adds_planet_model.py +++ /dev/null @@ -1,34 +0,0 @@ -"""adds Planet model - -Revision ID: 8161811efdc8 -Revises: -Create Date: 2022-04-28 13:10:35.827115 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '8161811efdc8' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('planet', - sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), - sa.Column('name', sa.String(), nullable=True), - sa.Column('description', sa.String(), nullable=True), - sa.Column('moons', sa.Integer(), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('planet') - # ### end Alembic commands ###