Added automatic database creation if it does not exist and fixes for test.js

Author: alex-ppg

README.md

@@ -86,7 +86,7 @@ This plugin adds an InfluxDB driver made available to all routes via the `decora
 | ---------- | ----------------------------------------------------------------------------------------------------------- |
 | `host`     | Optional, the host to connect to. Defaults to `localhost`                                                   |
 | `hosts`    | Optional, the multiple hosts to connect to. If specified, multi-cluster setup will be passed on to `influx` |
-| `database` | Optional, the database to connect to                                                                        |
+| `database` | Optional, the database to connect to. If the database does not exist, the library will create it.           |
 | `schema`   | Optional, the schema of the database we are connecting to                                                   |
 | `username` | Optional, the username to use for authorization if any                                                      |
 | `password` | Optional, the password to use for authorization if any                                                      |

index.js

@@ -15,7 +15,7 @@ async function influxConnector(
     password
   }
 ) {
-  const connectionOptions = { database, port, schema };
+  const connectionOptions = { database, port };
 
   if (hosts === undefined) connectionOptions.host = host;
   else connectionOptions.hosts = hosts;
@@ -26,7 +26,7 @@ async function influxConnector(
   }
 
   if (schema !== undefined) {
-    schema.map(schema => {
+    connectionOptions.schema = schema.map(schema => {
       Object.keys(schema.fields).forEach(
         field => (schema.fields[field] = Influx.FieldType[schema.fields[field]])
       );
@@ -36,6 +36,14 @@ async function influxConnector(
 
   const influx = new Influx.InfluxDB(connectionOptions);
 
+  if (database !== undefined) {
+    const names = await influx.getDatabaseNames();
+
+    if (!names.includes(database)) {
+      await influx.createDatabase(database);
+    }
+  }
+
   Influx.instance = influx;
   delete Influx.InfluxDB;
 

test.js

@@ -3,13 +3,9 @@
 const fastify = require("fastify")();
 const tap = require("tap");
 const fastifyInfluxDB = require("./index");
-const { InfluxDB } = require("influx");
-const influx = new InfluxDB();
 
 tap.test("fastify influxDB is correctly injected", async test => {
-  // Pre-cursory database creation
-  await influx.createDatabase("NOAA_water_database");
-  // End of pre-cursory code
+  test.plan(4);
 
   fastify.register(fastifyInfluxDB, {
     host: "localhost",
@@ -71,23 +67,19 @@ tap.test("fastify influxDB is correctly injected", async test => {
     });
   });
 
-  fastify.ready(err => {
-    test.error(err);
-    fastify.inject(
-      {
-        method: "GET",
-        url: "/"
-      },
-      (err, { payload }) => {
-        const [fetchedRow] = JSON.parse(payload).rows;
-        test.strictEqual(fetchedRow["level description"], "Medium");
-        test.strictEqual(fetchedRow.location, "athens");
-        test.strictEqual(fetchedRow.water_level, 2.4324);
-        fastify.close(() => {
-          test.end();
-          process.exit(0);
-        });
-      }
-    );
-  });
+  try {
+    await fastify.ready();
+
+    const { payload } = await fastify.inject({
+      method: "GET",
+      url: "/"
+    });
+
+    const [fetchedRow] = JSON.parse(payload).rows;
+    test.strictEqual(fetchedRow["level description"], "Medium");
+    test.strictEqual(fetchedRow.location, "athens");
+    test.strictEqual(fetchedRow.water_level, 2.4324);
+  } catch (e) {
+    test.error(e);
+  }
 });