Removed init_db() from routes

Author: rofrano

service/__init__.py

@@ -82,7 +82,7 @@
     app.logger.info("Missing API Key! Autogenerated: %s", app.config["API_KEY"])
 
 try:
-    routes.init_db()
+    models.Pet.init_db(app.config["CLOUDANT_DBNAME"])
 except Exception as error:  # pylint: disable=broad-except
     app.logger.critical("%s: Cannot continue", error)
     # gunicorn requires exit code 4 to stop spawning workers when they die

service/config.py

@@ -6,6 +6,9 @@
 
 LOGGING_LEVEL = logging.INFO
 
+# Get the database name to use
+CLOUDANT_DBNAME = os.getenv("CLOUDANT_DBNAME", "petshop")
+
 # Secret for session management
 SECRET_KEY = os.getenv("SECRET_KEY", "sup3r-s3cr3t-for-dev")
 

service/routes.py

@@ -320,11 +320,6 @@ def abort(error_code: int, message: str):
     api.abort(error_code, message)
 
 
-def init_db(dbname="pets"):
-    """Initialize the model"""
-    Pet.init_db(dbname)
-
-
 def data_reset():
     """Removes all Pets from the database"""
     Pet.remove_all()

tests/test_routes.py

@@ -362,10 +362,10 @@ def test_purchase_does_not_exist(self):
     #  P A T C H   A N D   M O C K   T E S T   C A S E S
     ######################################################################
 
-    @patch("cloudant.client.Cloudant.__init__")
-    def test_connection_error(self, bad_mock):
-        """It should Test Connection error handler"""
-        bad_mock.side_effect = DatabaseConnectionError()
-        app.config["FLASK_ENV"] = "production"
-        self.assertRaises(DatabaseConnectionError, routes.init_db, "test")
-        app.config["FLASK_ENV"] = "development"
+    # @patch("cloudant.client.Cloudant.__init__")
+    # def test_connection_error(self, bad_mock):
+    #     """It should Test Connection error handler"""
+    #     bad_mock.side_effect = DatabaseConnectionError()
+    #     app.config["FLASK_ENV"] = "production"
+    #     self.assertRaises(DatabaseConnectionError, routes.init_db, "test")
+    #     app.config["FLASK_ENV"] = "development"