fixed db handling

Author: arcuri82

js_npm/rest/cyclotron/em/app-driver.js

@@ -9,12 +9,6 @@ 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 [];
@@ -27,7 +21,6 @@ class AppController  extends em.SutController {
     getProblemInfo() {
         const dto = new em.dto.RestProblemDto();
         dto.openApiUrl = "http://localhost:" + this.port + "/swagger.json";
-
         return dto;
     }
 
@@ -39,24 +32,29 @@ class AppController  extends em.SutController {
     }
 
     resetStateOfSUT(){
-        dbHandler.cleanDb();
-        return Promise.resolve();
-
+        return new Promise(async (resolve) => {
+            await dbHandler.cleanDb();
+            resolve();
+        });
     }
 
     startSut(){
         //docker run -p 27017:27017 mongo
-        return new Promise( (resolve) => {
-            this.server = require("../src/app").listen(0, "localhost", () => {
+        return new Promise( async (resolve) => {
+
+           await dbHandler.startDb();
+
+            const app =  require("../src/app");
+
+            this.server = app.listen(0, "localhost", () => {
                 this.port = this.server.address().port;
                 resolve("http://localhost:" + this.port);
             });
         });
     }
 
     stopSut() {
-        return new Promise( (resolve) =>
-            {
+        return new Promise( (resolve) => {
                 this.server.close( () => {
                     // https://mongoosejs.com/docs/api/connection.html#connection_Connection-readyState
                     mongoose.connection.close();

js_npm/rest/cyclotron/em/db-handler.js

@@ -1,20 +1,17 @@
 const { GenericContainer } = require("testcontainers");
 const mongoose = require('mongoose');
 
-let dbPort = 27017;
-let exposedDbPort = 0;
-let dbURL = "mongodb://localhost/cyclotron"
 let test_container = null;
 
 module.exports ={
     startDb: async () =>{
         console.log("start db")
-        dbPort = process.env.DB_PORT || 27017;
+        const dbPort = 27017;
         test_container= await new GenericContainer("mongo", "3.5")
             .withExposedPorts(dbPort)
             .start();
-        exposedDbPort = test_container.getMappedPort(dbPort)
-        dbURL = `mongodb://localhost:${exposedDbPort}/cyclotron`
+        const exposedDbPort = test_container.getMappedPort(dbPort)
+        const dbURL = `mongodb://localhost:${exposedDbPort}/cyclotron`
         process.env.DB_URL = dbURL;
 
         console.log("connecting "+dbURL);
@@ -26,9 +23,7 @@ module.exports ={
             setTimeout(checkdb, 300)
     },
 
-    getDbPort: () =>{
-        return exposedDbPort
-    },
+
     /*
         https://github.com/KristianWEB/fakebooker-backend/blob/471d6f6fafc95af57a99b6506c8f945dce43ffe9/jest.setup.js
         https://kb.objectrocket.com/postgresql/mongoose-drop-collection-if-exists-605

js_npm/rest/cyclotron/em/em-main-cov.js

@@ -4,9 +4,7 @@
     const app = new AppController();
     const controller = new em.EMController(app);
 
-    await app.setupForGeneratedTest();
-
-    port = process.env.EM_PORT || 40100;
+    const port = process.env.EM_PORT || 40100;
     controller.setPort(port);
     controller.startTheControllerServer();
 })();