Iss1019feat

config/config.keys.json

@@ -19,6 +19,7 @@
   "vaccine_coverage": "covidapi:vaccine_coverage",
   "vaccine_state_coverage": "covidapi:vaccine_state_coverage",
   "therapeutics": "covidapi:therapeutics",
+  "variants":"covidapi:variants",
   "influenza_ILINET": "influenza:ILINET",
   "influenza_USPHL": "influenza:USPHL",
   "influenza_USCL": "influenza:USCL"

config/index.js

@@ -38,6 +38,8 @@ config.therapeuticsInterval = process.env.THERAPEUTICS_INTERVAL || 864e5;
 config.ebolaInterval = process.env.EBOLA_INTERVAL || 864e5;
 // eslint-disable-next-line camelcase
 config.cdcInterval = process.env.CDC_INTERVAL || 864e5;
+// eslint-disable-next-line camelcase
+config.variantInterval = process.env.VARIANT_INTERVAL || 864e5;
 
 // SENTRY KEY (ONLY FOR PRODUCTION)
 // eslint-disable-next-line camelcase

routes/instances.js

@@ -12,6 +12,7 @@ const appleData = require('../scrapers/covid-19/appleMobilityData');
 const govData = require('../scrapers/covid-19/govScrapers/getGovData');
 const { getVaccineData, getVaccineCoverageData, getVaccineStateCoverageData } = require('../scrapers/covid-19/getVaccine');
 const getTherapeuticsData = require('../scrapers/covid-19/getTherapeutics');
+const variantsData = require('../scrapers/covid-19/getVariants');
 const getCDCDInfluenzaData = require('../scrapers/influenza/getCDC');
 
 // KEYS
@@ -72,6 +73,10 @@ module.exports = {
 			await getTherapeuticsData(keys, redis);
 			logger.info('Finished Therapeutics scraping!');
 		},
+		executeScraperVariants: async () => {
+			await variantsData(keys, redis);
+			logger.info('Finished Variants scraping!');
+		},
 		excecuteScraperInfluenza: async () => {
 			await getCDCDInfluenzaData(keys, redis);
 			logger.info('Finished CDC Influenza scraping!');

routes/v3/covid-19/apiVariants.js

@@ -0,0 +1,41 @@
+// *from here* This model comes from apiGov.js:
+
+// eslint-disable-next-line new-cap
+const router = require('express').Router();
+
+const nameUtils = require('../../../utils/nameUtils');
+const { wordToBoolean } = require('../../../utils/stringUtils');
+const { redis, keys } = require('../../instances');
+
+router.get('/v3/covid-19/variants/countries/:country?', async (req, res) => {
+	const { allowNull } = req.query;
+	const { country: countryName, yearWeek, variant  } = req.params;
+	if (countryName) {
+		const standardizedCountryName = nameUtils.getCountryData(countryName.trim()).country || countryName.trim();
+		const data = JSON.parse(await redis.hget(keys.variants, standardizedCountryName));
+		if (data) {
+			res.send(!wordToBoolean(allowNull) ? nameUtils.transformNull(data) : data);
+		} else {
+			res.status(404).send({ message: `Country '${standardizedCountryName}' not found or no data found for country` });
+		}
+	} else {
+		res.send((await redis.hkeys(keys.variants)).sort());
+	}
+});
+
+module.exports = router;
+
+// *to here*
+
+// Take this code below as an example:
+// router.get('/v3/covid-19/countries/:query', async (req, res) => {
+// 	const { yesterday, twoDaysAgo, strict, allowNull } = req.query;
+// 	const { query } = req.params;
+// 	let countries = JSON.parse(await redis.get(wordToBoolean(yesterday) ? keys.yesterday_countries : wordToBoolean(twoDaysAgo) ? keys.twoDaysAgo_countries : keys.countries))
+// 		.filter(country => country.country.toLowerCase() !== 'world').map(fixApostrophe);
+// 	countries = splitQuery(query)
+// 		.map(country => nameUtils.getWorldometersData(countries, country, strict !== 'false'))
+// 		.filter(value => value).map(country => !wordToBoolean(allowNull) ? nameUtils.transformNull(country) : country);
+// 	if (countries.length > 0) res.send(countries.length === 1 ? countries[0] : countries);
+// 	else res.status(404).send({ message: 'Country not found or doesn\'t have any cases' });
+// });