jenkins-bot has submitted this change and it was merged. Change subject: Add "random" payload to aggregated response ......................................................................
Add "random" payload to aggregated response Bug: T135209 Change-Id: Id435a1ebcd1f9a7386f0ebe5b2c22f5eb033c163 --- M routes/aggregated.js M spec.yaml 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Mholloway: Looks good to me, approved jenkins-bot: Verified diff --git a/routes/aggregated.js b/routes/aggregated.js index 1e59ae8..cbf524f 100644 --- a/routes/aggregated.js +++ b/routes/aggregated.js @@ -12,6 +12,7 @@ var media = require('../lib/feed/media'); var mostRead = require('../lib/feed/most-read'); var featured = require('../lib/feed/featured'); +var random = require('../lib/feed/random'); /** * The main router object @@ -32,15 +33,15 @@ return BBPromise.props({ tfa: featured.promise(app, req), mostread: mostRead.promise(app, dateUtil.yesterday(req)), - //random: random.promise(app, req), + random: random.promise(app, req) //news: news.promise(app, req), //image: media.featuredImagePromise(app, req), //video: media.featuredVideoPromise(app, req) }) .then(function (response) { var aggregate = { tfa: response.tfa.payload, + random: response.random.payload, mostread: response.mostread.payload, - random: 'Good random article here', news: 'Articles in the news here', image: 'Today\'s featured image here', video: 'Today\'s featured video here' @@ -58,4 +59,4 @@ api_version: 1, router: router }; -}; \ No newline at end of file +}; diff --git a/spec.yaml b/spec.yaml index 2e36b90..6e719d1 100644 --- a/spec.yaml +++ b/spec.yaml @@ -108,7 +108,8 @@ mostread: date: /.+/ articles: [ /.+/ ] - random: /.+/ + random: + title: /.+/ news: /.+/ image: /.+/ video: /.+/ -- To view, visit https://gerrit.wikimedia.org/r/295547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id435a1ebcd1f9a7386f0ebe5b2c22f5eb033c163 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Mhurd <mh...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits