diff --git a/env.json b/env.json index b9857013..a9a3fd6e 100644 --- a/env.json +++ b/env.json @@ -1,7 +1,7 @@ { "MONGO_HOSTNAME": { "type": "string", - "default": "mongodb://rems-admin-pims-root:rems-admin-pims-password@localhost:27017", + "default": "mongodb://rems-user:pass@127.0.0.1:27017", "required": true }, "MONGO_DB_NAME": { diff --git a/mongo-init.js b/mongo-init.js index 657e799d..7e4006d0 100644 --- a/mongo-init.js +++ b/mongo-init.js @@ -1,7 +1,12 @@ // Create Databases const dbPims = db.getSiblingDB('pims'); const dbRemsAdmin = db.getSiblingDB('remsadmin'); - +dbRemsAdmin.createUser({ user: "rems-user", + pwd: "pass", + roles: [ + { role: "readWrite", db: "remsadmin" } + ] +}) // Create Collections dbPims.createCollection('pims-tmp'); dbRemsAdmin.createCollection('remsadmin-tmp'); diff --git a/package.json b/package.json index ddb7ebc0..b3a8502a 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "moment": "^2.24.0", "moment-timezone": "^0.5.40", "mongodb": "^4.12.1", + "mongoose": "^6.9.2", "morgan": "^1.9.1", "tingodb": "^0.6.1", "uid": "^2.0.1", diff --git a/src/lib/MongoDatabase.ts b/src/lib/MongoDatabase.ts index 4b726c87..448f58c1 100644 --- a/src/lib/MongoDatabase.ts +++ b/src/lib/MongoDatabase.ts @@ -1,6 +1,6 @@ import { Database } from './Database'; import * as mongoDB from 'mongodb'; - +import mongoose from 'mongoose'; export class MongoDatabase extends Database { options: any; db_name: string; @@ -16,8 +16,9 @@ export class MongoDatabase extends Database { new Promise(resolve => { // Connect to mongo console.log('MongoDatabase connect: ' + this.location); - this.client = new mongoDB.MongoClient(this.location); + const dbString = `${this.location}/${this.db_name}`; + this.client = new mongoose.mongo.MongoClient(dbString); this.database = this.client.db(this.db_name); - return resolve(this.client.connect()); + return resolve(mongoose.connect(dbString)); }); }