Amend call to formatter

Author: jason-fox

context-provider/controllers/proxy/catfacts-api.js

@@ -101,7 +101,7 @@ function getAsNGSIv2(req, res) {
 //
 // The /ngsi-ld/v1/entities/:id endpoint responds with data in the NGSI-LD format
 //
-function getAsNgsiLD(req, res, asArray = false) {
+function getAsNgsiLD(req, res, next, asArray = false) {
     monitor('/ngsi-ld/v1/entities', 'Data requested from Cat Facts API', req.body);
     makeCatFactsRequest()
         .then((result) => {

context-provider/controllers/proxy/openweathermap-api.js

@@ -101,7 +101,7 @@ function getAsNGSIv2(req, res) {
 //
 // The /ngsi-ld/v1/entities/:id endpoint responds with data in the NGSI-LD format
 //
-function getAsNgsiLD(req, res, asArray = false) {
+function getAsNgsiLD(req, res, next, asArray = false) {
     monitor('/ngsi-ld/v1/entities', 'Data requested from OpenWeatherMap API', req.body);
     makeWeatherRequest(req.params.queryString)
         .then((result) => {

context-provider/controllers/proxy/random-api.js

@@ -61,7 +61,7 @@ function getAsNGSIv2(req, res) {
 //
 // The /ngsi-ld/v1/entities/:id endpoint responds with data in the NGSI-LD format
 //
-function getAsNgsiLD(req, res, asArray = false) {
+function getAsNgsiLD(req, res, next, asArray = false) {
     monitor('/ngsi-ld/v1/entities', 'Data requested from Random API', req.body);
     res.set('Content-Type', 'application/ld+json');
     const response = Formatter.formatAsLDResponse(req, null, (name, type) => {

context-provider/controllers/proxy/static-api.js

@@ -78,7 +78,7 @@ function getAsNGSIv2(req, res) {
 //
 // The /ngsi-ld/v1/entities/:id endpoint responds with data in the NGSI-LD format
 //
-function getAsNgsiLD(req, res, asArray = false) {
+function getAsNgsiLD(req, res, next, asArray = false) {
     const response = Formatter.formatAsLDResponse(req, null, (name, type) => {
         return staticValues[type.toLowerCase()];
     });

context-provider/controllers/proxy/twitter-api.js

@@ -111,7 +111,7 @@ function getAsNGSIv2(req, res) {
 //
 // The /ngsi-ld/v1/entities/:id endpoint responds with data in the NGSI-LD format
 //
-function getAsNgsiLD(req, res, asArray = false) {
+function getAsNgsiLD(req, res, next, asArray = false) {
     monitor('/ngsi-ld/v1/entities', 'Data requested from Twitter API', req.body);
 
     makeTwitterRequest(

context-provider/routes/proxy-ld.js

@@ -69,22 +69,6 @@ function noOp(req, res) {
     res.send();
 }
 
-
-router.get('/catfacts/tweets/ngsi-ld/v1/entities', tweetDefaults, (req, res) => {
-    req.params.id = req.query.id || '12345'
-    CatFactsNGSIProxy.getAsNgsiLD(req, res, true);
-}); 
-router.get('/random/tweets/ngsi-ld/v1/entities', tweetDefaults, (req, res) => {
-    req.params.id = req.query.id || '12345'
-    RandomNGSIProxy.getAsNgsiLD(req, res, true);
-}); 
-router.get('/static/tweets/ngsi-ld/v1/entities', tweetDefaults, (req, res) => {
-    req.params.id = req.query.id || '12345'
-    StaticNGSIProxy.getAsNgsiLD(req, res, true);
-});
-
-
-
 router.get('/catfacts/:type/:mapping/ngsi-ld/v1/entities/:id', CatFactsNGSIProxy.getAsNgsiLD);
 router.get('/random/:type/:mapping/ngsi-ld/v1/entities/:id', RandomNGSIProxy.getAsNgsiLD);
 router.get('/static/:type/:mapping/ngsi-ld/v1/entities/:id', StaticNGSIProxy.getAsNgsiLD);
@@ -143,6 +127,23 @@ router.get('/static/weatherConditions/ngsi-ld/v1/entities/:id', weatherDefaults,
 router.get('/weather/weatherConditions/ngsi-ld/v1/entities/:id', weatherDefaults, WeatherNGSIProxy.getAsNgsiLD);
 
 // Convenience endpoints for tweets readings
+
+
+
+router.get('/catfacts/tweets/ngsi-ld/v1/entities/', tweetDefaults, (req, res, next) => {
+    req.params.id = req.query.id || '12345'
+    CatFactsNGSIProxy.getAsNgsiLD(req, res, next, true);
+}); 
+router.get('/random/tweets/ngsi-ld/v1/entities/', tweetDefaults, (req, res, next) => {
+    req.params.id = req.query.id || '12345'
+    RandomNGSIProxy.getAsNgsiLD(req, res, next, true);
+}); 
+router.get('/static/tweets/ngsi-ld/v1/entities/', tweetDefaults, (req, res, next) => {
+    req.params.id = req.query.id || '12345'
+    StaticNGSIProxy.getAsNgsiLD(req, res, next, true);
+});
+
+
 router.get('/random/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, RandomNGSIProxy.getAsNgsiLD);
 
 router.get('/static/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, StaticNGSIProxy.getAsNgsiLD);
@@ -151,6 +152,11 @@ router.get('/twitter/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, TwitterNGSI
 
 router.get('/catfacts/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, CatFactsNGSIProxy.getAsNgsiLD);
 
+
+
+
+
+
 // Not Supported Endpoints
 
 router.all('/:proxy/:attributes/ngsi-ld/v1/entities', notSupported);