👌 Add Recovery Rate metric

utils/calcRecoveryRate.js

@@ -0,0 +1,41 @@
+/**
+ * Calculates the recovery rate and puts it in a nice looking string format.
+ * 
+ * @param  {int}     numDeaths     The number of deaths for a unit
+ * @param  {int}     numRecoveries The number of recoveries for a unit
+ * @return {String}  A parsed string percentage string of recoveries rounded to one decimal place.
+ */
+function calcRecoveryRate(numDeaths, numRecoveries) {
+    const factor = numRecoveries / (numDeaths + numRecoveries);
+    const percentage = (factor * 100).toFixed(1) + '%';
+    if(isNaN(factor) || factor === 0) {
+        return '-';
+    }else {
+        return percentage;
+    }
+}
+
+module.exports = {
+    /**
+     * 
+     * @param  {String} deaths A comma delineated number for number of deaths.
+     * @param  {String} recoveries A comma delineated number for number of recoveries.
+     * @return {String} A parsed string percentage string of recoveries rounded to one decimal place.
+     */
+    calculateWorldwideRecoveryRate: function(deaths, recoveries) {
+        const numDeaths = parseInt(deaths.replace(/,/g,''));
+		const numRecoveries = parseInt(recoveries.replace(/,/g,''));
+		return calcRecoveryRate(numDeaths, numRecoveries);
+    },
+
+    /**
+     * Calculates the recovery rate and puts it in a nice looking string format.
+     * 
+     * @param  {int}     numDeaths     The number of deaths for a unit
+     * @param  {int}     numRecoveries The number of recoveries for a unit
+     * @return {String}  A parsed string percentage string of recoveries rounded to one decimal place.
+     */
+    calculateRecoveryRate: function(numDeaths, numRecoveries) {
+        return calcRecoveryRate(numDeaths, numRecoveries);
+    }
+};

utils/getAll.js

@@ -0,0 +1,28 @@
+const axios = require("axios");
+const chalk = require("chalk");
+const comma = require("comma-number");
+const { sortKeys, sortOrders } = require("./table.js");
+const { calculateMultipleRecoveryRate } = require("./calcRecoveryRate");
+
+module.exports = async (spinner, table, states, country, options) => {
+	if (!country && !states) {
+		const api = await axios.get(`https://corona.lmao.ninja/countries`);
+		let all = api.data.map(one => Object.values(one));
+		all = calculateMultipleRecoveryRate(all);
+
+		const sortIndex = sortKeys.indexOf(options.sort);
+
+		if (sortIndex != -1) {
+			const dir = sortOrders[sortIndex];
+			all = all.sort((a, b) => (a[sortIndex] > b[sortIndex] ? dir : -dir));
+		}
+
+		all.map(one => {
+			one = one.map(d => comma(d));
+			return table.push(one);
+		});
+		spinner.stopAndPersist();
+		spinner.info(`${chalk.cyan(`Sorted by:`)} ${options.sort}`);
+		console.log(table.toString());
+	}
+};

utils/getCountries.js

@@ -4,6 +4,7 @@ const cyan = chalk.cyan;
 const dim = chalk.dim;
 const comma = require('comma-number');
 const { sortingKeys } = require('./table.js');
+const { calculateRecoveryRate } = require("./calcRecoveryRate");
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
 const orderBy = require('lodash.orderby');
@@ -43,6 +44,7 @@ module.exports = async (
 				comma(oneCountry.deaths),
 				comma(oneCountry.todayDeaths),
 				comma(oneCountry.recovered),
+				calculateRecoveryRate(oneCountry.deaths, oneCountry.recovered),
 				comma(oneCountry.active),
 				comma(oneCountry.critical),
 				comma(oneCountry.casesPerOneMillion)

utils/getCountry.js

@@ -1,7 +1,9 @@
-const chalk = require('chalk');
-const axios = require('axios');
+const chalk = require("chalk");
+const axios = require("axios");
+const logSymbols = require("log-symbols");
+const comma = require("comma-number");
+const { calculateRecoveryRate } = require("./calcRecoveryRate");
 const sym = require('log-symbols');
-const comma = require('comma-number');
 const red = chalk.red;
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
@@ -23,6 +25,10 @@ module.exports = async (spinner, table, states, countryName) => {
 			);
 			process.exit(0);
 		}
+		// let data = Object.values(api.data);
+		// data = calculateSingleRecoveryRate(data);
+		// data = data.map(d => comma(d));
+		// table.push(data);
 
 		table.push([
 			`—`,
@@ -32,6 +38,7 @@ module.exports = async (spinner, table, states, countryName) => {
 			comma(thisCountry.deaths),
 			comma(thisCountry.todayDeaths),
 			comma(thisCountry.recovered),
+			calculateRecoveryRate(thisCountry.deaths, thisCountry.recovered),
 			comma(thisCountry.active),
 			comma(thisCountry.critical),
 			comma(thisCountry.casesPerOneMillion)

utils/getWorldwide.js

@@ -2,6 +2,7 @@ const axios = require('axios');
 const comma = require('comma-number');
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
+const { calculateWorldwideRecoveryRate } = require('./calcRecoveryRate');
 
 module.exports = async (table, states) => {
 	const [err, all] = await to(axios.get(`https://corona.lmao.ninja/all`));
@@ -18,6 +19,7 @@ module.exports = async (table, states) => {
 			data[1],
 			`—`,
 			data[2],
+			calculateWorldwideRecoveryRate(data[1], data[2]),
 			`—`,
 			`—`,
 			`—`

utils/table.js

@@ -13,6 +13,7 @@ module.exports = {
 		`Deaths`,
 		`Deaths ${dim(`(today)`)}`,
 		`Recovered`,
+		`Recovery Rate`,
 		`Active`,
 		`Critical`,
 		`Per Million`
@@ -25,6 +26,7 @@ module.exports = {
 		`${red(`Deaths`)}`,
 		`${red(`Deaths (today)`)}`,
 		`${green(`Recovered`)}`,
+		`${green(`Recovery Rate`)}`,
 		`${yellow(`Active`)}`,
 		`${red(`Critical`)}`,
 		`Per Million`