Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iss1019feat #1030

Merged
merged 21 commits into from
Feb 19, 2022
Merged

Iss1019feat #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
648e3e4
[FEAT] create the scraper in the getEuropeVariants.js file, modify th…
yosoycentli Jan 11, 2022
69e948a
[FEAT] create the scraper in the getEuropeVariants.js file, modify th…
yosoycentli Jan 11, 2022
51095ca
[MODIFY] Rename the getEuropeVariants to --> getVariants
yosoycentli Jan 12, 2022
c88a70a
[MODIFY] Add the line 22 variants to the json
yosoycentli Jan 12, 2022
12611a6
[MODIFY] change the values of keys.variants in the line 15 and 22
yosoycentli Jan 12, 2022
89d6cb2
[ADD/MODIFY] add the instance of the variant.js file and modify the g…
yosoycentli Jan 12, 2022
2dc3beb
[MODIFY] change a several files in order to connect the variant scrap…
yosoycentli Jan 13, 2022
ac42848
[MODIFY] now the scraper works and return the data in the correct format
yosoycentli Jan 14, 2022
614077c
[MODIFY] remove the parameters yearWeek and variant from router.get i…
yosoycentli Jan 17, 2022
5d133ed
[MODIFY] add test for the getVariants.js scraper and remove console.l…
yosoycentli Jan 17, 2022
2fb8e42
[MODIFY] add swagger documentation
yosoycentli Jan 18, 2022
77816d7
[MODIFY] fix swagger documentation
yosoycentli Jan 18, 2022
14ebd0e
Merge branch 'master' into iss1019feat
ebwinters Jan 19, 2022
c9c2f11
[MODIFY] fix eslint style problems
yosoycentli Jan 19, 2022
3478e5b
Merge branch 'iss1019feat' of github.com:yosoycentli/API into iss1019…
yosoycentli Jan 19, 2022
aecddba
Merge branch 'master' into iss1019feat
yosoycentli Jan 20, 2022
46bfc6a
[MODIFY] I commented the lines 2-5 in api_influenza.spec.js file to f…
yosoycentli Jan 25, 2022
e2a66aa
[MODIFY] I change the --timeout value from 200000 to 300000 for the '…
yosoycentli Feb 14, 2022
67b85e2
Merge branch 'master' into iss1019feat
ebwinters Feb 14, 2022
7442e60
[MODIFY] Put back the var in line 57 in order to get a right eslint p…
yosoycentli Feb 14, 2022
a4be9b4
Merge branch 'iss1019feat' of github.com:yosoycentli/API into iss1019…
yosoycentli Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion associateTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ const v3CovidTests = [
'tests/v3/covid-19/api_nyt.spec.js',
'tests/v3/covid-19/api_therapeutics.spec.js',
'tests/v3/covid-19/api_vaccine.spec.js',
'tests/v3/covid-19/api_worldometers.spec.js'
'tests/v3/covid-19/api_worldometers.spec.js',
'tests/v3/covid-19/api_variants.spec.js'
];

// Influenza tests are broken
Expand All @@ -41,6 +42,7 @@ const fileNameToTestMap = {
'apiWorldometers.js': ['tests/v2/api_worldometers.spec.js', 'tests/v3/covid-19/api_worldometers.spec.js'],
'apiTherapeutics.js': ['tests/v3/covid-19/api_therapeutics.spec.js'],
'apiVaccine.js': ['tests/v3/covid-19/api_vaccine.spec.js'],
'apiVariants.js': ['tests/v3/covid-19/api_variants.spec.js'],
'instances.js': allTests,
'appleMobilityData.js': ['tests/v2/api_apple.spec.js', 'tests/v3/covid-19/api_apple.spec.js'],
'getVaccine.js': ['tests/v3/covid-19/api_vaccine.spec.js'],
Expand Down
1 change: 1 addition & 0 deletions config/config.keys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
173 changes: 61 additions & 112 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"lint": "eslint '**/*.js'",
"lint:fix": "eslint ./**/*.js --fix",
"lint:win32": "eslint ./**/*.js",
"test": "mocha ./tests --exit --recursive --timeout 200000",
"test-single": "mocha $1 --exit --timeout 200000",
"test": "mocha ./tests --exit --recursive --timeout 300000",
"test-single": "mocha $1 --exit --timeout 300000",
"docker-start": "docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build",
"docker-down": "docker-compose -f docker-compose.yml -f docker-compose.prod.yml down --rmi all",
"docker-start-dev": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build",
Expand Down
Loading