fixed a bug

openhie · Dec 5, 2019 · dbbc9fd · dbbc9fd
1 parent 66d16be
commit dbbc9fd
Show file tree

Hide file tree

Showing 19 changed files with 690 additions and 849 deletions.
diff --git a/dhis2App/GOFR.zip b/dhis2App/GOFR.zip
diff --git a/dhis2App/index.html b/dhis2App/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.41aecb33f5e12a08100e95f4b28087cc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a77b8c324a0590a283c6.js></script><script type=text/javascript src=static/js/app.0b58579594e6db1604a3.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.e80fbd0b63c6aa97a8b0bbc202c664b7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a77b8c324a0590a283c6.js></script><script type=text/javascript src=static/js/app.ec33a6e680de61c306ba.js></script></body></html>
diff --git a/facility-recon-backend/gui/index.html b/facility-recon-backend/gui/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.41aecb33f5e12a08100e95f4b28087cc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a77b8c324a0590a283c6.js></script><script type=text/javascript src=static/js/app.0b58579594e6db1604a3.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.e80fbd0b63c6aa97a8b0bbc202c664b7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a77b8c324a0590a283c6.js></script><script type=text/javascript src=static/js/app.ec33a6e680de61c306ba.js></script></body></html>
diff --git a/facility-recon-backend/gui/static/css/app.41aecb33f5e12a08100e95f4b28087cc.css.map b/facility-recon-backend/gui/static/css/app.41aecb33f5e12a08100e95f4b28087cc.css.map
diff --git a/.../app.41aecb33f5e12a08100e95f4b28087cc.css → .../app.e80fbd0b63c6aa97a8b0bbc202c664b7.css b/.../app.41aecb33f5e12a08100e95f4b28087cc.css → .../app.e80fbd0b63c6aa97a8b0bbc202c664b7.css
diff --git a/facility-recon-backend/gui/static/css/app.e80fbd0b63c6aa97a8b0bbc202c664b7.css.map b/facility-recon-backend/gui/static/css/app.e80fbd0b63c6aa97a8b0bbc202c664b7.css.map
diff --git a/facility-recon-backend/gui/static/js/app.0b58579594e6db1604a3.js b/facility-recon-backend/gui/static/js/app.0b58579594e6db1604a3.js
diff --git a/facility-recon-backend/gui/static/js/app.0b58579594e6db1604a3.js.map b/facility-recon-backend/gui/static/js/app.0b58579594e6db1604a3.js.map
diff --git a/facility-recon-backend/gui/static/js/app.ec33a6e680de61c306ba.js b/facility-recon-backend/gui/static/js/app.ec33a6e680de61c306ba.js
diff --git a/facility-recon-backend/gui/static/js/app.ec33a6e680de61c306ba.js.map b/facility-recon-backend/gui/static/js/app.ec33a6e680de61c306ba.js.map
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/gui/static/js/vendor.a77b8c324a0590a283c6.js.map b/facility-recon-backend/gui/static/js/vendor.a77b8c324a0590a283c6.js.map
diff --git a/facility-recon-backend/lib/index.js b/facility-recon-backend/lib/index.js
@@ -10,6 +10,7 @@ const formidable = require('formidable');
 const winston = require('winston');
 const https = require('https');
 const http = require('http');
+const URI = require('urijs');
 const os = require('os');
 const fs = require('fs');
 const request = require('request');
@@ -114,8 +115,8 @@ app.use(bodyParser.urlencoded({
 app.use(bodyParser.json());
 // socket config - large documents can cause machine to max files open
 
-https.globalAgent.maxSockets = 32;
-http.globalAgent.maxSockets = 32;
+// https.globalAgent.maxSockets = 32;
+// http.globalAgent.maxSockets = 32;
 
 const topOrgId = config.getConf('mCSD:fakeOrgId');
 const topOrgName = config.getConf('mCSD:fakeOrgName');
@@ -2765,6 +2766,9 @@ if (cluster.isMaster) {
     const name = mixin.toTitleCase(req.params.name);
     winston.info(`Received request to delete data source with id ${id}`);
     mongo.deleteDataSource(id, name, sourceOwner, userID, (err, response) => {
+      const dbName = name + userID;
+      const cacheUrl = URI(config.getConf('mCSD:url')).segment(dbName).segment('fhir').toString();
+      mcsd.cleanCache(`url_${cacheUrl}`, true);
       if (err) {
         res.status(500).json({
           error: 'Unexpected error occured while deleting data source,please retry',
@@ -2870,15 +2874,18 @@ if (cluster.isMaster) {
   });
 
   app.delete('/deleteSourcePair', (req, res) => {
-    winston.info(`Received a request to delete data source pair with id ${req.params.id}`);
+    winston.info(`Received a request to delete data source pair with id ${req.params.pairId}`);
     const {
       pairId,
       userID,
     } = req.query;
     const source1Name = mixin.toTitleCase(req.query.source1Name);
     const source2Name = mixin.toTitleCase(req.query.source2Name);
+
     const dbName = source1Name + userID + source2Name;
     mongo.deleteSourcePair(pairId, dbName, (err, data) => {
+      const url = URI(config.getConf('mCSD:url')).segment(dbName).segment('fhir').toString();
+      mcsd.cleanCache(`url_${url}`, true);
       if (err) {
         winston.error(err);
         return res.send(500).send(err);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700\|Material+Icons" rel=stylesheet><link href=static/css/app.41aecb33f5e12a08100e95f4b28087cc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a77b8c324a0590a283c6.js></script><script type=text/javascript src=static/js/app.0b58579594e6db1604a3.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700\|Material+Icons" rel=stylesheet><link href=static/css/app.e80fbd0b63c6aa97a8b0bbc202c664b7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a77b8c324a0590a283c6.js></script><script type=text/javascript src=static/js/app.ec33a6e680de61c306ba.js></script></body></html>