added daily and weekly delta columns

Author: sagarkarira

lib/byCountry.js

@@ -2,53 +2,26 @@ const Table = require('cli-table3');
 const axios = require('axios');
 const _ = require('lodash');
 const chalk = require('chalk');
-const emojiFlags = require('emoji-flags');
-const h = require('humanize-number');
+const helpers = require('./helpers');
+const {
+  getCountry,
+  getConfirmed,
+  getActive,
+  getDeaths,
+  getRecovered,
+  getMortalityPer,
+  getRecoveredPer,
+  getEmoji,
+  calActive,
+  calMortalityPer,
+  calRecoveredPer,
+  getOneDayChange,
+  getOneWeekChange,
+  getRateOfGrowth,
+  getTotalStats,
+} = require('./helpers');
 
-function getConfirmed(confirmed) {
-  return {
-    content: chalk.blueBright(h(confirmed)),
-    hAlign: 'right',
-  };
-}
 
-function getRecoverd(recovered) {
-  return {
-    content: chalk.yellowBright(h(recovered)),
-    hAlign: 'right',
-  };
-}
-
-function getDeaths(deaths) {
-  return {
-    content: chalk.grey(h(deaths)),
-    hAlign: 'right',
-  }
-}
-
-function getActive(confirmed, recovered, deaths) {
-  return {
-    content: h(confirmed - recovered - deaths),
-    hAlign: 'right'
-  }
-}
-
-function getMortalityRate(deaths, confirmed, average = null) {
-  const mortalityRate = ((deaths / confirmed) * 100).toFixed(2);
-  return chalk.redBright(mortalityRate);
-}
-
-function getRecoveredRate(recovered, confirmed, average = null) {
-  const recoveredRate = ((recovered / confirmed) * 100).toFixed(2);
-  return chalk.greenBright(recoveredRate);
-}
-
-function getEmoji(countryCode) {
-  if (countryCode && emojiFlags.countryCode(countryCode)) {
-    return emojiFlags.countryCode(countryCode).emoji;
-  }
-  return '';
-}
 
 function getDataByCountry(confirmed, deaths, recovered) {
   const countryMap = {};
@@ -66,17 +39,48 @@ function getDataByCountry(confirmed, deaths, recovered) {
         confirmed: confirmedMap[mapKey].latest,
         recovered: recoveredMap[mapKey].latest,
         deaths: deathsMap[mapKey].latest,
+        confirmedByDay: helpers.historyObjToArr(confirmedMap[mapKey].history),
+        recoveredByDay: helpers.historyObjToArr(recoveredMap[mapKey].history),
+        deathsByDay: helpers.historyObjToArr(recoveredMap[mapKey].history),
       };
     } else {
       countryMap[countryName].confirmed += confirmedMap[mapKey].latest;
       countryMap[countryName].recovered += recoveredMap[mapKey].latest;
       countryMap[countryName].deaths += deathsMap[mapKey].latest;
+      countryMap[countryName].confirmedByDay = helpers.addArr(
+        countryMap[countryName].confirmedByDay,
+        helpers.historyObjToArr(confirmedMap[mapKey].history)
+      );
+      countryMap[countryName].recoveredByDay = helpers.addArr(
+        countryMap[countryName].recoveredByDay,
+        helpers.historyObjToArr(recoveredMap[mapKey].history)
+      );
+      countryMap[countryName].deathsByDay = helpers.addArr(
+        countryMap[countryName].deathsByDay,
+        helpers.historyObjToArr(deathsMap[mapKey].history)
+      );
     }
   });
-  const countryArr = Object.keys(countryMap).map(key => countryMap[key]);
+  const countryArr = extraStats(
+    Object.keys(countryMap).map(key => countryMap[key])
+  );
   return _.sortBy(countryArr, (o) => -o.confirmed)
 }
 
+function getDateByState(confirmed, deaths, recovered) {
+
+}
+
+function extraStats(dataArr) {
+  return dataArr.map(obj => Object.assign({}, obj,
+    {
+      active: calActive(obj),
+      mortalityPer: calMortalityPer(obj),
+      recoveredPer: calRecoveredPer(obj),
+    })
+  );
+}
+
 exports.getCompleteTable = async () => {
   const head = [
     '',
@@ -87,41 +91,51 @@ exports.getCompleteTable = async () => {
     'Active 😷',
     'Mortality %',
     'Recovered %',
-    'Flag 🏳'
+    '1 Day 🔺',
+    '1 Week 🔺',
+    // 'RoG',
+    '🏳',
   ];
   const table = new Table({
     head,
     chars: { 'top': '═' , 'top-mid': '╤' , 'top-left': '╔' , 'top-right': '╗'
          , 'bottom': '═' , 'bottom-mid': '╧' , 'bottom-left': '╚' , 'bottom-right': '╝'
          , 'left': '║' , 'left-mid': '╟' , 'mid': '─' , 'mid-mid': '┼'
-         , 'right': '║' , 'right-mid': '╢' , 'middle': '│' }
+         , 'right': ' ║' , 'right-mid': '╢' , 'middle': '│' }
   });
   const result = await axios('https://coronavirus-tracker-api.herokuapp.com/all');
   const { latest, confirmed, deaths, recovered } = result.data;
   const countryData = getDataByCountry(confirmed, deaths, recovered)
+  const worldStats = getTotalStats(countryData);
   table.push({
     '': [
       'World',
-      getConfirmed(latest.confirmed),
-      getRecoverd(latest.recovered),
-      getDeaths(latest.deaths),
-      getActive(latest.confirmed, latest.recovered, latest.deaths),
-      getMortalityRate(latest.deaths, latest.confirmed),
-      getRecoveredRate(latest.recovered, latest.confirmed),
+      getConfirmed(worldStats.confirmed),
+      getRecovered(worldStats.recovered),
+      getDeaths(worldStats.deaths),
+      getActive(worldStats.active),
+      getMortalityPer(worldStats.mortalityPer),
+      getRecoveredPer(worldStats.recoveredPer),
+      getOneDayChange(worldStats),
+      getOneWeekChange(worldStats),
+      // '',
       '🌎'
     ]
   })
   let rank = 1;
   countryData.forEach(cd => {
     const countryEmoji = getEmoji(cd.countryCode);
     const values = [
-      chalk.cyanBright(cd.country),
+      getCountry(cd.country),
       getConfirmed(cd.confirmed),
-      getRecoverd(cd.recovered),
+      getRecovered(cd.recovered),
       getDeaths(cd.deaths),
       getActive(cd.confirmed, cd.recovered, cd.deaths),
-      getMortalityRate(cd.deaths, cd.confirmed),
-      getRecoveredRate(cd.deaths, cd.confirmed),
+      getMortalityPer(cd.mortalityPer),
+      getRecoveredPer(cd.recoveredPer),
+      getOneDayChange(cd),
+      getOneWeekChange(cd),
+      // getRateOfGrowth(cd),
       getEmoji(cd.countryCode),
     ]
     table.push({ [rank++]: values })

lib/corona.js

@@ -0,0 +1,146 @@
+const chalk = require('chalk');
+const h = require('humanize-number');
+const emojiFlags = require('emoji-flags');
+const _ = require('lodash');
+const moment = require('moment');
+const e = exports;
+
+e.getCountry = (country) => {
+  return chalk.cyan.bold(country);
+};
+
+e.getState = (state) => {
+  if (state) {
+    return chalk.red(state);
+  }
+  return chalk.red('ALL');
+};
+
+e.getConfirmed = (confirmed) => {
+  return {
+    content: chalk.blueBright(h(confirmed)),
+    hAlign: 'right',
+  };
+};
+
+e.getRecovered = (recovered) => {
+  return {
+    content: chalk.yellowBright(h(recovered)),
+    hAlign: 'right',
+  };
+};
+
+e.getDeaths = (deaths) => {
+  return {
+    content: chalk.whiteBright(h(deaths)),
+    hAlign: 'right',
+  };
+};
+
+e.getActive = (active) => {
+  return {
+    content: chalk.magentaBright(h(active)),
+    hAlign: 'right'
+  };
+};
+
+e.getMortalityPer = (mortalityPer) => ({
+  content: chalk.redBright(mortalityPer),
+  hAlign: 'right',
+});
+
+e.getRecoveredPer = (recoveredPer) => ({
+  content: chalk.greenBright(recoveredPer),
+  hAlign: 'right',
+});
+
+e.getEmoji = (countryCode) => {
+  if (countryCode && emojiFlags.countryCode(countryCode)) {
+    return emojiFlags.countryCode(countryCode).emoji;
+  }
+  return '';
+};
+
+e.calActive = ({ confirmed, recovered, deaths }) => confirmed - (recovered + deaths);
+e.calMortalityPer = ({ confirmed, deaths }) => ((deaths / confirmed) * 100).toFixed(2);
+e.calRecoveredPer = ({ confirmed, recovered }) => ((recovered / confirmed) * 100).toFixed(2);
+
+/**
+   historyObj = {
+    "1/22/20": 0,
+    "1/23/20": 1,
+    "1/24/20": 4,
+    "1/25/20": 7,
+  }
+  Returns sorted arr of above elements - [0, 1, 4, 7]
+ */
+e.historyObjToArr = (historyObj) => {
+  const sortedTimestampArr = _.sortBy(
+    Object.keys(historyObj).map(date => new Date(date).getTime()),
+    Number
+  );
+  return sortedTimestampArr.map(timestamp => {
+    const dateFormatted = moment(timestamp).format('M/D/YY');
+    return historyObj[dateFormatted];
+  });
+};
+
+/**
+ * Given both arr1 and arr2 has same number of elements
+ * Returns -> sum[n] = arr1[n] + arr2[n]
+ *
+*/
+e.addArr = (arr1, arr2) => {
+  if (arr1.length === 0 ) {
+    return arr2;
+  }
+  if (arr2.length === 0) {
+    return arr1;
+  }
+  return arr1.map((val, index) => arr1[index] + arr2[index]);
+};
+
+e.getOneDayChange = ({ confirmedByDay }) => {
+  const present = confirmedByDay.length - 1;
+  const dailyChange = confirmedByDay[present] - confirmedByDay[present - 1];
+  return {
+    content: `${h(dailyChange)}🔺`,
+    hAlign: 'right',
+  };
+};
+
+e.getOneWeekChange = ({ confirmedByDay }) => {
+  const present = confirmedByDay.length - 1;
+  const weeklyChange = confirmedByDay[present] - confirmedByDay[present - 7];
+  return {
+    content: `${h(weeklyChange)}🔺`,
+    hAlign: 'right',
+  };
+};
+
+e.getRateOfGrowth = ( { confirmedByDay }) => {
+  return confirmedByDay[0];
+};
+
+e.getTotalStats = (countryData) => {
+  const worldStats = countryData.reduce((acc, countryObj) => {
+    acc.confirmed += countryObj.confirmed;
+    acc.recovered += countryObj.recovered;
+    acc.deaths += countryObj.deaths;
+    acc.confirmedByDay = e.addArr( acc.confirmedByDay, countryObj.confirmedByDay);
+    acc.recoveredByDay = e.addArr( acc.recoveredByDay, countryObj.recoveredByDay);
+    acc.deathsByDay = e.addArr( acc.deathsByDay, countryObj.deathsByDay);
+    return acc;
+  }, {
+    confirmed: 0,
+    recovered: 0,
+    deaths: 0,
+    confirmedByDay: [],
+    recoveredByDay: [],
+    deathsByDay: [],
+  });
+  worldStats.active = e.calActive(worldStats);
+  worldStats.recoveredPer = e.calRecoveredPer(worldStats);
+  worldStats.mortalityPer = e.calMortalityPer(worldStats);
+  return worldStats;
+}

lib/helpers.js

@@ -4,7 +4,7 @@ Track coronavirus from cli
 
 ## Screenshot
 
-<img src="./screenshot.png" width="960" height="720">
+<img src="https://i.ibb.co/wYyB8XG/screenshot.png" width="960" height="720">
 
 ### Prerequisites
 
@@ -32,6 +32,6 @@ corona
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
+This project is licensed under the MIT License