fixed DB handling

Author: arcuri82

js_npm/rest/disease-sh-api/em/app-driver.js

@@ -1,22 +1,10 @@
 const dbHandler = require("./db-handler");
-
-const http  = require("http");
-const {AddressInfo}  = require("net");
-
 const em = require("evomaster-client-js");
 
 
 class AppController extends em.SutController {
 
 
-    setupForGeneratedTest(){
-
-        return new Promise((resolve)=>{
-            this.testcontainer = dbHandler.startDb();
-            resolve(this.testcontainer);
-        });
-    }
-
     getInfoForAuthentication(){
         return [];
     }
@@ -44,10 +32,15 @@ class AppController extends em.SutController {
     }
 
     startSut(){
-        const app = require("../src/server");
-        return new Promise( (resolve) => {
+        return new Promise( async (resolve) => {
+
+            await dbHandler.startDb();
+
+            const app = require("../src/server");
+
             this.port = require('../src/config/index').port;
-            this.server = app.listen(this.port, "localhost", () => {
+            this.server = app.listen(0, "localhost", () => {
+                this.port = this.server.address().port;
                 resolve("http://localhost:" + this.port);
             });
         });

js_npm/rest/disease-sh-api/em/db-handler.js

@@ -1,45 +1,36 @@
-const { DockerComposeEnvironment , Wait } = require("testcontainers");
+const {DockerComposeEnvironment, Wait} = require("testcontainers");
 
-let dbPort = 27017;
-let exposedDbPort = 0;
-let dbURL = ""
 let test_container = null;
 
-module.exports ={
-    startDb: async () =>{
-        if(process.env.DOCKER_DBC && process.env.DOCKER_DBC === '0'){
-            console.log("use local redis on port:" + process.env.REDIS_PORT)
-        }else{
-            console.log("start docker db")
-            dbPort = process.env.DB_PORT || 50000;
-
-            // solve ioredis connection problem https://github.com/luin/ioredis/issues/763
-            const environment = await new DockerComposeEnvironment(__dirname, "test-redis-db.yml")
-                .withWaitStrategy("redis_1", Wait.forLogMessage("Ready to accept connections"))
-                .up();
-            test_container = await environment.getContainer("redis_1");
-            exposedDbPort = test_container.getMappedPort(dbPort);
-            process.env.REDIS_PORT = exposedDbPort;
-
-            console.log("connecting redis-server with " + exposedDbPort+ " " + test_container.getHost());
-        }
-        return test_container;
-    },
+module.exports = {
+    startDb: async () => {
 
-    checkdb: async () =>{
+        console.log("starting docker db")
+        const dbPort =  50000;
 
+        // solve ioredis connection problem https://github.com/luin/ioredis/issues/763
+        const environment = await new DockerComposeEnvironment(__dirname, "test-redis-db.yml")
+            .withWaitStrategy("redis_1", Wait.forLogMessage("Ready to accept connections"))
+            .up();
+        test_container = await environment.getContainer("redis_1");
+        const exposedDbPort = test_container.getMappedPort(dbPort);
+        process.env.REDIS_PORT = exposedDbPort;
+
+        console.log("connecting redis-server with " + exposedDbPort + " " + test_container.getHost());
+
+        return test_container;
     },
 
-    getDbPort: () =>{
-        return exposedDbPort
+    checkdb: async () => {
     },
 
-    cleanDb: async () =>{
 
+    cleanDb: async () => {
+        //read-only DB
     },
 
-    stopDb : () =>{
-        if (test_container){
+    stopDb: () => {
+        if (test_container) {
             test_container.stop();
             test_container = null;
         }