Merge 7b6703d into 2517894

ensky · Jan 25, 2021 · b9ad2a9 · b9ad2a9
2 parents 2517894 + 7b6703d
commit b9ad2a9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/data/taiwan-holiday-cache.json b/data/taiwan-holiday-cache.json
diff --git a/lib/opendata-tw.js b/lib/opendata-tw.js
@@ -23,6 +23,7 @@ class OpendataTW {
 };
 
 // TODO: fetch method rather than url
-OpendataTW.url = 'https://data.ntpc.gov.tw/api/datasets/308DCD75-6434-45BC-A95F-584DA4FED251/json?size=2000';
+OpendataTW.urlFirst1000 = 'https://data.taipei/api/v1/dataset/b0011e96-3fc3-43ec-8bf5-07fb46dd22bb?scope=resourceAquire&q=&limit=1000=&offset=0';
+OpendataTW.urlSecond1000 = "https://data.taipei/api/v1/dataset/b0011e96-3fc3-43ec-8bf5-07fb46dd22bb?scope=resourceAquire&q=&limit=1000=&offset=1000";
 
 module.exports = OpendataTW;
diff --git a/lib/taiwan-holiday.js b/lib/taiwan-holiday.js
@@ -19,12 +19,15 @@ var TaiwanHoliday = {
 		this.cache = new Cache(path.resolve(temp_dir, 'taiwan-holiday-cache.json'));
 		return this.cache.load()
 			.catch(() => {
-				var ret;
-
-				return request(OpendataTW.url)
-					.then((str) => ret = JSON.parse(str))
-					.then((result) => this.cache.save(result))
-					.then(() => ret);
+				return Promise.all([request(OpendataTW.urlFirst1000), request(OpendataTW.urlSecond1000)])
+					.then(results => results.reduce((result, currentResult) => {
+						let json = JSON.parse(currentResult)
+						return result.concat(json.result.results)
+					}, []))
+					.then((result) => {
+						this.cache.save(result);
+						return result;
+					});
 			})
 			.then((json) => {
 				engine = new OpendataTW(json);