From e7bf5039a5d336893a6947be3cd5c38882e2fb31 Mon Sep 17 00:00:00 2001
From: takiguchi <florian.thierry72@gmail.com>
Date: Sat, 26 Sep 2020 20:56:28 +0200
Subject: [PATCH] Fix database connection.

---
 docker/docker-compose.yml                                 | 2 +-
 docker/mongodb/docker-entrypoint-initdb.d/initDatabase.js | 2 +-
 src/js/repository/mongoClient.js                          | 8 +++++---
 src/resources/application.yml                             | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f125b0a..d682efc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     ports:
      - "27017:27017"
     environment:
-     - "MONGO_INITDB_DATABASE=express-test"
+     - "MONGO_INITDB_DATABASE=db_application"
      - "MONGO_INITDB_ROOT_USERNAME=god"
      - "MONGO_INITDB_ROOT_PASSWORD=P@ssword"
     volumes:
diff --git a/docker/mongodb/docker-entrypoint-initdb.d/initDatabase.js b/docker/mongodb/docker-entrypoint-initdb.d/initDatabase.js
index 7aa3d49..57630c8 100644
--- a/docker/mongodb/docker-entrypoint-initdb.d/initDatabase.js
+++ b/docker/mongodb/docker-entrypoint-initdb.d/initDatabase.js
@@ -3,7 +3,7 @@ db.test.insert({id: 'test'});
 db.createUser(
     {
       user: "application_user",
-      pwd: "Password1",
+      pwd: "P@ssword1",
       roles:
         [
           { role: "readWrite", db: "db_application" }
diff --git a/src/js/repository/mongoClient.js b/src/js/repository/mongoClient.js
index 2a3bb10..6f32027 100644
--- a/src/js/repository/mongoClient.js
+++ b/src/js/repository/mongoClient.js
@@ -3,10 +3,12 @@ const configuration = require('../configuration');
 const mongoConfig = configuration.mongodb;
 
 function buildDatabaseUrl() {
-    const username = mongoConfig.username;
+    const username = encodeURIComponent(mongoConfig.username);
     const password = encodeURIComponent(mongoConfig.password);
-    const url = `${mongoConfig.url}:${mongoConfig.port}`;
-    const test = `mongodb://${username}:${password}@${url}`;
+    const url = mongoConfig.url;
+    const port = mongoConfig.port;
+    const database = mongoConfig.database;
+    const test = `mongodb://${username}:${password}@${url}:${port}/${database}`;
     console.log(test);
     return test;
 }
diff --git a/src/resources/application.yml b/src/resources/application.yml
index f189a13..135aac4 100644
--- a/src/resources/application.yml
+++ b/src/resources/application.yml
@@ -2,7 +2,7 @@ mongodb:
   url: 'localhost'
   port: 27017
   username: 'application_user'
-  password: 'Password1'
+  password: 'P@ssword1'
   database: 'db_application'
 security:
   jwt: