koodiklinikka/koodiklinikka.fi-api
1
0
Fork 0
mirror of https://github.com/koodiklinikka/koodiklinikka.fi-api.git synced 2026-03-18 12:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed feeds endpoint to use Promise.props to make the result more reasonable to work with

Browse Source
This commit is contained in:
Juuso Tapaninen
2015-01-28 01:19:37 +02:00
parent 8006814e45
commit c71b3b6541
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -22,7 +22,7 @@
"bluebird": "^2.9.3", "bluebird": "^2.9.3",
"body-parser": "^1.10.1", "body-parser": "^1.10.1",
"express": "^4.11.0", "express": "^4.11.0",
"lodash": "^2.4.1", "lodash": "3.0.0",
"node-twitter": "0.5.2", "node-twitter": "0.5.2",
"superagent": "^0.21.0", "superagent": "^0.21.0",
"validator": "^3.27.0" "validator": "^3.27.0"

6
routes/feeds.js
View File

@@ -2,6 +2,7 @@
var request = require('superagent'); var request = require('superagent');
var cache = require('apicache').middleware; var cache = require('apicache').middleware;
var Promise = require('bluebird');
var twitter = require('../feeds/twitter'); var twitter = require('../feeds/twitter');
var github = require('../feeds/github'); var github = require('../feeds/github');
@@ -11,7 +12,10 @@ module.exports = function (app) {
* Endpoint for fetching different information feeds (Twitter, GitHub etc.) * Endpoint for fetching different information feeds (Twitter, GitHub etc.)
*/ */
app.get('/feeds', cache('3 hours'), function(req, res, next) { app.get('/feeds', cache('3 hours'), function(req, res, next) {
Promise.all([twitter.getTweets(), github.getEvents()]).then(function(data) { Promise.props({
twitter: twitter.getTweets(),
github: github.getEvents()
}).then(function(data) {
res.status(200).send(data); res.status(200).send(data);
}, function(err) { }, function(err) {
next(err); next(err);