From 3c5e6edb151d1e2f7e7f94260c7bd8953c1a3a21 Mon Sep 17 00:00:00 2001
From: Collin Nehemia <collin.nehemia@ucglobalprograms.org>
Date: Fri, 7 Oct 2022 14:32:40 +0200
Subject: [PATCH] NMA-618(Changed mediator port number, Added openhim response)

---
 Dockerfile                                  | 2 +-
 docker-compose.yml                          | 2 +-
 package-lock.json                           | 6 ++----
 src/config/mediator-config.json             | 2 +-
 src/csvData/fact_anc_dhis2_export.csv       | 0
 src/csvData/fact_maternity_dhis2_export.csv | 0
 src/csvData/fact_mbfu_dhis2_export.csv      | 0
 src/dhis2/pushData.js                       | 8 +++++++-
 src/index.js                                | 7 +++++--
 9 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 src/csvData/fact_anc_dhis2_export.csv
 create mode 100644 src/csvData/fact_maternity_dhis2_export.csv
 create mode 100644 src/csvData/fact_mbfu_dhis2_export.csv

diff --git a/Dockerfile b/Dockerfile
index 3e92559..2817e47 100644
--- 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" ]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b5e8b6..bf268f4 100644
--- 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
index d12e9e9..2da2b7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18652,8 +18652,7 @@
     "mongoose-legacy-pluralize": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
-      "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==",
-      "requires": {}
+      "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
     },
     "mongoose-patch-history": {
       "version": "1.4.0",
@@ -20842,8 +20841,7 @@
     "sinon-chai": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-3.7.0.tgz",
-      "integrity": "sha512-mf5NURdUaSdnatJx3uhoBOrY9dtL19fiOtAdT1Azxg3+lNJFiuN0uzaU3xX1LeAfL17kHQhTAJgpsfhbMJMY2g==",
-      "requires": {}
+      "integrity": "sha512-mf5NURdUaSdnatJx3uhoBOrY9dtL19fiOtAdT1Azxg3+lNJFiuN0uzaU3xX1LeAfL17kHQhTAJgpsfhbMJMY2g=="
     },
     "slash": {
       "version": "2.0.0",
diff --git a/src/config/mediator-config.json b/src/config/mediator-config.json
index 9cf2d37..cc5205a 100644
--- 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
new file mode 100644
index 0000000..e69de29
diff --git a/src/csvData/fact_maternity_dhis2_export.csv b/src/csvData/fact_maternity_dhis2_export.csv
new file mode 100644
index 0000000..e69de29
diff --git a/src/csvData/fact_mbfu_dhis2_export.csv b/src/csvData/fact_mbfu_dhis2_export.csv
new file mode 100644
index 0000000..e69de29
diff --git a/src/dhis2/pushData.js b/src/dhis2/pushData.js
index 69c89f9..01dfd72 100644
--- 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
 }
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 5494720..5bc0579 100644
--- 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}`)