adding multitenancy support

uonafya · Mar 23, 2021 · 64d0afa · 64d0afa
1 parent 3c41a16
commit 64d0afa
Show file tree

Hide file tree

Showing 15 changed files with 839 additions and 637 deletions.
diff --git a/dhis2App/GOFR.zip b/dhis2App/GOFR.zip
diff --git a/facility-recon-backend/config/default.json b/facility-recon-backend/config/default.json
@@ -4,9 +4,14 @@
     "port": 3000
   },
   "mCSD": {
+    "url": "http://localhost:8081/hapi5/fhir",
+    "username": "",
+    "password": "",
     "fakeOrgId": "eac583d2-d1ba-11e8-a8d5-f2801f1b9fd1",
     "fakeOrgName": "Taifafeki",
-    "cacheTime": 1200
+    "cacheTime": 1200,
+    "registryDB": "facilityregistry",
+    "requestsDB": "facilityregistryrequests"
   },
   "dbArchives": {
     "maxArchives": 2
@@ -108,22 +113,5 @@
   }, {
     "uri": "http://codesystem.digitalhealth.intrahealth.org/facilityaddrequest",
     "name": "facilityAddRequest"
-  }],
-  "hapi": {
-    "DBUser": "hapi",
-    "DBPassword": "hapi",
-    "defaultDBName": "gofr_empty",
-    "requestsDBName": "gofrrequests_empty",
-    "fhirVersion": "R4",
-    "DBDependencyGrpID": "org.postgresql",
-    "DBDependencyArtfactID": "postgresql",
-    "DBDriver": "org.postgresql.Driver",
-    "DBDialect": "org.hibernate.dialect.PostgreSQL95Dialect",
-    "serverStarterPath": "/home/ally/hapi-fhir-jpaserver-starter",
-    "tomcatPath": "/opt/tomcat"
-  },
-  "pg": {
-    "user": "gofr",
-    "password": "gofr"
-  }
+  }]
 }
diff --git a/facility-recon-backend/gui/static/js/manifest.37a2ecbb1d1b7e6c9ada.js.map b/facility-recon-backend/gui/static/js/manifest.37a2ecbb1d1b7e6c9ada.js.map
diff --git a/facility-recon-backend/lib/config.js b/facility-recon-backend/lib/config.js
@@ -32,7 +32,6 @@ if (ops && ops.conf) {
   const environment = nconf.get('NODE_ENV') || 'development';
   nconf.file('environment', path.resolve(`${global.appRoot}/config`, `${environment}.json`));
   nconf.file('default', path.resolve(`${global.appRoot}/config`, 'default.json'));
-  // nconf.file('custom', path.resolve(`${global.appRoot}/config`, 'default_multiple_instances.json'))
 }
 
 if (ops && ops.createIndexes) {
@@ -48,12 +47,14 @@ function setConf(key, value) {
 }
 
 setConf('DB_HOST', process.env.DB_HOST || 'localhost');
-setConf('DB_NAME', process.env.DB_NAME || 'GOFR_NEW1');
+setConf('DB_NAME', process.env.DB_NAME || 'GOFR');
 setConf('DB_USER', process.env.DB_USER || '');
 setConf('DB_PASSWORD', process.env.DB_PASSWORD || '');
 setConf('DB_PORT', process.env.DB_PORT || '27017');
 setConf('REDIS_HOST', process.env.REDIS_HOST || '127.0.0.1');
-setConf('mCSD:url', process.env.HEARTH_URL || 'http://localhost:8081');
+if (process.env.FHIR_BASE_URL) {
+  setConf('mCSD:url', process.env.FHIR_BASE_URL);
+}
 setConf('server:port', process.env.GOFR_PORT || getConf('server:port'));
 
 exports.getConf = getConf;

diff --git a/facility-recon-backend/lib/cronjobs.js b/facility-recon-backend/lib/cronjobs.js
@@ -11,7 +11,6 @@ const config = require('./config');
 const dhis = require('./dhis')();
 const fhir = require('./fhir')();
 
-const topOrgId = config.getConf('mCSD:fakeOrgId');
 const topOrgName = config.getConf('mCSD:fakeOrgName');
 
 function getCrontime(callback) {
@@ -63,7 +62,6 @@ getCrontime((time) => {
               name,
               sourceOwner,
               clientId,
-              topOrgId,
               topOrgName,
               false,
               false,
@@ -79,7 +77,6 @@ getCrontime((time) => {
               name,
               sourceOwner,
               clientId,
-              topOrgId,
               topOrgName,
             );
           }

diff --git a/facility-recon-backend/lib/dhis.js b/facility-recon-backend/lib/dhis.js
@@ -26,15 +26,15 @@ const credentials = {
 
 module.exports = function () {
   return {
-    sync(host, username, password, name, sourceOwner, clientId, topOrgId, topOrgName, reset, full, dousers, doservices) {
+    sync(host, username, password, name, sourceOwner, clientId, topOrgName, reset, full, dousers, doservices) {
       const dhis2URL = url.parse(host);
       const auth = `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`;
       credentials.dhis2URL = dhis2URL;
       credentials.clientId = clientId;
       credentials.auth = auth;
       credentials.name = name;
       credentials.sourceOwner = sourceOwner;
-      credentials.topOrgId = topOrgId;
+      credentials.topOrgId = mixin.getTopOrgId(name + sourceOwner);
       credentials.topOrgName = topOrgName;
 
       if (reset) {
@@ -237,7 +237,7 @@ function processOrgUnit(metadata, hasKey) {
     clientId,
   } = credentials;
 
-  const database = mixin.toTitleCase(name) + credentials.sourceOwner;
+  const database = mixin.toTitleCase(name + credentials.sourceOwner);
   let counter = 0;
   const max = metadata.organisationUnits.length;
   // adding the fake orgid as the top orgid
@@ -446,7 +446,7 @@ function setLastUpdate(hasKey, lastUpdate) {
     dhis2URL,
   } = credentials;
   const userID = credentials.sourceOwner;
-  const database = mixin.toTitleCase(name) + userID;
+  const database = mixin.toTitleCase(name + userID);
   winston.info('setting lastupdated time');
   const req = (dhis2URL.protocol == 'https:' ? https : http).request({
     hostname: dhis2URL.hostname,