NMA-618(Changed mediator port number, Added openhim response)

GPNamibia · Oct 7, 2022 · 3c5e6ed · 3c5e6ed
1 parent 82caa24
commit 3c5e6ed
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,6 @@ CMD npm start
 
 RUN npm install -g sequelize-cli
 
-EXPOSE 4000
+EXPOSE 4400
 
 VOLUME [ "/app/node_modules" ]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
     build:
       ./
     ports:
-      - "127.0.0.1:4000:4000"
+      - "127.0.0.1:2000:2000"
     restart: unless-stopped
 
 volumes:

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/config/mediator-config.json b/src/config/mediator-config.json
@@ -12,7 +12,7 @@
                     "name": "DHIS2 Mediator Route",
                     "host": "dhis2-mediator",
                     "path": "/",
-                    "port": "4000",
+                    "port": "4400",
                     "primary": true,
                     "type": "http"
                 }

diff --git a/src/csvData/fact_anc_dhis2_export.csv b/src/csvData/fact_anc_dhis2_export.csv
diff --git a/src/csvData/fact_maternity_dhis2_export.csv b/src/csvData/fact_maternity_dhis2_export.csv
diff --git a/src/csvData/fact_mbfu_dhis2_export.csv b/src/csvData/fact_mbfu_dhis2_export.csv
diff --git a/src/dhis2/pushData.js b/src/dhis2/pushData.js
@@ -33,6 +33,11 @@ async function postDataToDhis2() {
   }
 }
 
+async function getDataAndPostToDhis2(){
+  await this.postDataToDhis2().then(async(res)=>{
+    return res;
+})
+}; 
 
 //save csv data before sending to DHIS2
 function saveCsvFile(csvPath, csvData) {
@@ -63,5 +68,6 @@ module.exports = {
   postPtrackerData,
   getCsv,
   saveCsvFile,
-  postDataToDhis2
+  postDataToDhis2,
+  getDataAndPostToDhis2
 }
diff --git a/src/index.js b/src/index.js
@@ -11,7 +11,11 @@ app.get('/openhim', async (req, res) => {
     `\n${ new Date().toUTCString('en-GB', { timeZone: 'UTC' }) }  - `,
     `DHIS 2 <=> Database File Mediator has received a new request. \n`
   );
-   pushData.postDataToDhis2()
+   //get data from CSV and send data to DHIS2
+ await pushData.getDataAndPostToDhis2()
+ .then((results) => {
+         res.json('PTracker data succesfully sent to DHIS2');
+ }).catch(error => { res.json(`Error retrieving PTracker Data: ${error}`) })
 });
 //middlleware
 app.use(express.json())
@@ -26,7 +30,6 @@ app.use('/api/csv', router)
 //openhim
 getQueryParameters();
 
-
 //Server PORT
   app.listen(privateConfig.appConfig.PORT, (err) => {
       if (err) console.log(`Error: ${err}`)