running black for unopiniated formatting

dsayling · dsayling · commit ad4c0f5a05a9 · 2021-02-24T15:23:26.000-07:00
diff --git a/configure.py b/configure.py
@@ -1,5 +1,6 @@
 from openapi_server.__main__ import models, app
 
+
 def create_db():
     app.app.app_context().push()
     models.db.drop_all()
@@ -14,4 +15,4 @@ def seed_db():
 
 
 if __name__ == "__main__":
-    create_db()
+    create_db()
diff --git a/openapi_server/__main__.py b/openapi_server/__main__.py
@@ -11,17 +11,20 @@
 app = connexion.App(__name__, specification_dir="./openapi/")
 app.app.json_encoder = encoder.JSONEncoder
 # app.app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("DATABASE_URL", "postgresql:///test-cfd")
-app.app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("DATABASE_URL", "sqlite:///:memory:")  # can this work if there's no db to connect to?
-app.app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+app.app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv(
+    "DATABASE_URL", "sqlite:///:memory:"
+)  # can this work if there's no db to connect to?
+app.app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 app.add_api("openapi.yaml", arguments={"title": "CFD"}, pythonic_params=True)
 CORS(app.app)
 models.db.init_app(app.app)
 
-if 'memory' in app.app.config.get("SQLALCHEMY_DATABASE_URI"):
+if "memory" in app.app.config.get("SQLALCHEMY_DATABASE_URI"):
     app.app.app_context().push()
     models.db.create_all()
     db_seed.seed()
 
+
 def main():
     app.run(port=8080, debug=True)
 
diff --git a/openapi_server/config.py b/openapi_server/config.py
@@ -1,8 +1,9 @@
 import os
 
+
 class Config(object):
     DEBUG = True
     TESTING = True
     CSRF_ENABLED = True
-    SECRET_KEY = 'not_totally_secret'
-    SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL']
+    SECRET_KEY = "not_totally_secret"
+    SQLALCHEMY_DATABASE_URI = os.environ["DATABASE_URL"]
diff --git a/openapi_server/controllers/menu_controller.py b/openapi_server/controllers/menu_controller.py
@@ -5,6 +5,7 @@
 from openapi_server.database import models
 from sqlalchemy.exc import SQLAlchemyError
 
+
 def add_menu_item():  # noqa: E501
     """Create a menu item
 
@@ -51,7 +52,7 @@ def show_menu_item_by_id(item_id):  # noqa: E501
 
     :rtype: MenuItem
     """
-    if (item := models.MenuItem.query_by_id(int(item_id))):
+    if (item := models.MenuItem.query_by_id(int(item_id))) :
         return item.serialize()
     else:
         return Error(400), 400
diff --git a/openapi_server/database/db_seed.py b/openapi_server/database/db_seed.py
@@ -14,7 +14,7 @@
 
 menu_start_raw = [
     {
-        "description": "Sample water bottle",
+        "description": "Fresh from the tap",
         "id": 0,
         "imageId": "water",
         "name": "Water",
@@ -57,18 +57,19 @@
     },
 ]
 
+
 def _prepopulate_images():
     for f in os.listdir(IMAGES_PATH):
         if f.endswith(".jpg"):
             name = f.split(".")[0]
             ipath = os.path.join(IMAGES_PATH, f)
-            with open(ipath, 'rb') as f2:
+            with open(ipath, "rb") as f2:
                 raw = f2.read()
             image = models.Image.add(raw)
             # super inefficient
             for mi in menu_start_raw:
-                if mi.get('imageId') == name :
-                    mi.update({'imageId': image.id})
+                if mi.get("imageId") == name:
+                    mi.update({"imageId": image.id})
 
 
 def _prepopulate_menu():
diff --git a/openapi_server/database/models.py b/openapi_server/database/models.py
@@ -17,11 +17,16 @@ class MenuItem(db.Model):
     name = db.Column(db.String())
     price = db.Column(db.Float())
     # image_id = db.Column(db.Integer)   # this is probably broken
-    image_id = db.Column(db.Integer, db.ForeignKey('image.id'))
-    cart_id = db.Column(db.String, db.ForeignKey('cart.host'), nullable=True)
+    image_id = db.Column(db.Integer, db.ForeignKey("image.id"))
+    cart_id = db.Column(db.String, db.ForeignKey("cart.host"), nullable=True)
 
     def __init__(
-        self, description, name, price, image_id, cart_id=None,
+        self,
+        description,
+        name,
+        price,
+        image_id,
+        cart_id=None,
     ):
         self.description = description
         self.name = name
@@ -30,7 +35,7 @@ def __init__(
         self.cart_id = cart_id
 
     def __repr__(self):
-        return '<id {}>'.format(self.id)
+        return "<id {}>".format(self.id)
 
     # something like marshmallow would be a good addition if we were planning to scale this, but
     # there's just one model
@@ -41,10 +46,13 @@ def serialize(self):
             "imageId": self.image_id,
             "name": self.name,
             "price": self.price,
-                }
+        }
+
     @classmethod
     def add(cls, menu_item):
-        item = cls(menu_item.description, menu_item.name, menu_item.price, menu_item.image_id)
+        item = cls(
+            menu_item.description, menu_item.name, menu_item.price, menu_item.image_id
+        )
         _commit_item(item)
         return item.serialize()
 
@@ -59,13 +67,13 @@ def query_by_id(cls, item_id):
 
 class Cart(db.Model):
     host = db.Column(db.String, primary_key=True)
-    items = db.relationship('MenuItem')
+    items = db.relationship("MenuItem")
 
     def __init__(self, host):
         self.host = host
 
     def __repr__(self):
-        return '<host {}>'.format(self.host)
+        return "<host {}>".format(self.host)
 
     @classmethod
     def add_item(cls, host, menu_item):
@@ -89,16 +97,16 @@ def delete_item_by_id(cls, host, item_id):
                 break
             db.session.commit()
 
+
 class Image(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     data = db.Column(db.LargeBinary)
 
-
     def __init__(self, data):
         self.data = data
 
     def __repr__(self):
-        return '<id {}>'.format(self.id)
+        return "<id {}>".format(self.id)
 
     @classmethod
     def add(cls, raw_data):
@@ -116,4 +124,3 @@ def delete_image(cls, image_id):
     @classmethod
     def get_image(cls, image_id):
         return cls.query.filter(Image.id == image_id).first()
-
diff --git a/openapi_server/test/test_cart_controller.py b/openapi_server/test/test_cart_controller.py
@@ -17,10 +17,11 @@
 class TestCartController(BaseTestCase):
     """CartController integration test stubs"""
 
-
     def setUp(self):
-        self.sample_model = models.MenuItem(description="description", price=6.02, image_id=5, name='name')
-        self.sample_cart = models.Cart('fake')
+        self.sample_model = models.MenuItem(
+            description="description", price=6.02, image_id=5, name="name"
+        )
+        self.sample_cart = models.Cart("fake")
         self.sample_cart.items = [self.sample_model]
         self.sample_item = {
             "price": 6.02,
@@ -30,7 +31,7 @@ def setUp(self):
             "id": 13,
         }
 
-    @mock.patch.object(models.Cart, 'add_item')
+    @mock.patch.object(models.Cart, "add_item")
     def test_add_cart_item(self, mock_add_item):
         """Test case for add_cart_item
 
@@ -58,7 +59,7 @@ def test_add_cart_item(self, mock_add_item):
             response, 204, "Response body is : " + response.data.decode("utf-8")
         )
 
-    @mock.patch.object(models.Cart, 'delete_item_by_id')
+    @mock.patch.object(models.Cart, "delete_item_by_id")
     def test_delete_cart_item(self, mock_delete):
         """Test case for delete_cart_item
 
@@ -72,9 +73,11 @@ def test_delete_cart_item(self, mock_delete):
             method="DELETE",
             headers=headers,
         )
-        self.assertStatus(response, 204, "Response body is : " + response.data.decode("utf-8"))
+        self.assertStatus(
+            response, 204, "Response body is : " + response.data.decode("utf-8")
+        )
 
-    @mock.patch.object(models.Cart, 'query_by_host')
+    @mock.patch.object(models.Cart, "query_by_host")
     def test_list_cart(self, mock_get_cart):
         """Test case for list_cart
 
diff --git a/openapi_server/test/test_image_controller.py b/openapi_server/test/test_image_controller.py
@@ -25,7 +25,7 @@ def setUp(self):
         self.mock_model = models.Image(self.mock_data)
 
     # @unittest.skip('reason')
-    @mock.patch.object(models.Image, 'add')
+    @mock.patch.object(models.Image, "add")
     def test_add_image(self, mock_add):
         """Test case for add_image
 
@@ -44,11 +44,9 @@ def test_add_image(self, mock_add):
             data=data,
             content_type="multipart/form-data",
         )
-        self.assert200(
-            response, "Response body is : " + response.data.decode("utf-8")
-        )
+        self.assert200(response, "Response body is : " + response.data.decode("utf-8"))
 
-    @mock.patch.object(models.Image, 'delete_image')
+    @mock.patch.object(models.Image, "delete_image")
     def test_delete_image(self, mock_delete):
         """Test case for delete_image
 
@@ -67,7 +65,7 @@ def test_delete_image(self, mock_delete):
         )
         assert mock_delete.call_count == 1
 
-    @mock.patch.object(models.Image, 'get_image')
+    @mock.patch.object(models.Image, "get_image")
     def test_get_image(self, mock_get):
         """Test case for get_image
 
diff --git a/openapi_server/test/test_menu_controller.py b/openapi_server/test/test_menu_controller.py
@@ -17,7 +17,9 @@ class TestMenuController(BaseTestCase):
     """MenuController integration test stubs"""
 
     def setUp(self):
-        self.sample_model = models.MenuItem(description="description", price=6.02, image_id=5, name='name')
+        self.sample_model = models.MenuItem(
+            description="description", price=6.02, image_id=5, name="name"
+        )
         self.sample_item = {
             "price": 6.02,
             "imageId": 5,
@@ -26,7 +28,7 @@ def setUp(self):
             "id": 13,
         }
 
-    @mock.patch.object(models.MenuItem, 'add')
+    @mock.patch.object(models.MenuItem, "add")
     def test_add_menu_item(self, mock_item_add):
         """Test case for add_menu_item
 
@@ -48,7 +50,7 @@ def test_add_menu_item(self, mock_item_add):
             response, 200, "Response body is : " + response.data.decode("utf-8")
         )
 
-    @mock.patch.object(models.MenuItem, 'query_all')
+    @mock.patch.object(models.MenuItem, "query_all")
     def test_list_menu(self, mock_query_menu):
         """Test case for list_menu
 
@@ -66,8 +68,7 @@ def test_list_menu(self, mock_query_menu):
         )
         self.assert200(response, "Response body is : " + response.data.decode("utf-8"))
 
-
-    @mock.patch.object(models.MenuItem, 'query_by_id')
+    @mock.patch.object(models.MenuItem, "query_by_id")
     def test_show_menu_item_by_id(self, mock_query):
         """Test case for show_menu_item_by_id
 
