Merge pull request #5 from lucasfnicolau/feature/JSONResponse

JSON return added. Use '?format=json' to get it.

Author: sagarkarira

.gitignore

@@ -0,0 +1,2 @@
+node_modules/
+.DS_Store

app.js

@@ -3,25 +3,49 @@ const app = express();
 
 const port = process.env.PORT || 3001;
 
-const { getCountryTable } = require('./lib/byCountry');
+const { getCountryTable, getJSONData, getJSONDataForCountry } = require('./lib/byCountry');
 const { getCompleteTable } = require('./lib/corona');
 
 app.get('/', (req, res) => {
+  const format = req.query.format ? req.query.format : '';
+
+  if (format.toLowerCase() === 'json') {
+    return getJSONData().then(result => {
+      return res.json(result);
+    }).catch(error => res.send(error));
+  }
+
   return getCompleteTable().then(result => {
     return res.send(result);
   }).catch(error => res.send(error));
 });
 
 app.get('/:country', (req, res) => {
-  let { country } = req.params;
+  const { country } = req.params;
+  const format = req.query.format ? req.query.format : '';
+
   if (!country || country === 'all') {
+    if (format.toLowerCase() === 'json') {
+      return getJSONData().then(result => {
+        return res.json(result);
+      }).catch(error => res.send(error));
+    }
+
     return getCompleteTable().then(result => {
       return res.send(result);
     }).catch(error => res.send(error));
   }
+
+  if (format.toLowerCase() === 'json') {
+    return getJSONDataForCountry(country).then(result => {
+      return res.json(result);
+    }).catch(error => res.send(error));
+  }
+  
   return getCountryTable(country).then(result => {
     return res.send(result);
   }).catch(error => res.send(error));
 });
 
+
 app.listen(port, () => console.log(`Running on ${port}`));

lib/byCountry.js

@@ -61,6 +61,19 @@ function extraStats(dataArr) {
   );
 }
 
+exports.getJSONData = async () => {
+  const result = await axios('https://coronavirus-tracker-api.herokuapp.com/all');
+  return result.data;
+}
+
+exports.getJSONDataForCountry = async (country) => {
+  const result = await axios('https://coronavirus-tracker-api.herokuapp.com/all');
+  const { latest, confirmed, deaths, recovered } = result.data;
+  const countryData = getDataByState(confirmed, deaths, recovered, country)
+    .filter(obj => obj.country === country);
+  return countryData;
+}
+
 exports.getCountryTable = async (country) => {
   const head = [
     '',

package.json

@@ -7,6 +7,7 @@
     "corona": "./bin/index.js"
   },
   "scripts": {
+    "dev": "nodemon app.js",
     "start": "node app.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -25,5 +26,8 @@
     "humanize-number": "0.0.2",
     "lodash": "^4.17.15",
     "moment": "^2.24.0"
+  },
+  "devDependencies": {
+    "nodemon": "^2.0.2"
   }
 }