Support queryEntity on proxy endpoints

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) {
+function getAsNgsiLD(req, res, asArray = false) {
     monitor('/ngsi-ld/v1/entities', 'Data requested from Cat Facts API', req.body);
     makeCatFactsRequest()
         .then((result) => {
@@ -120,7 +120,7 @@ function getAsNgsiLD(req, res) {
             } else {
                 res.set('Content-Type', 'application/ld+json');
             }
-            res.send(response);
+            res.send(asArray ? [response] :response);
         })
         .catch((err) => {
             debug(err);

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) {
+function getAsNgsiLD(req, res, asArray = false) {
     monitor('/ngsi-ld/v1/entities', 'Data requested from OpenWeatherMap API', req.body);
     makeWeatherRequest(req.params.queryString)
         .then((result) => {
@@ -121,7 +121,7 @@ function getAsNgsiLD(req, res) {
             } else {
                 res.set('Content-Type', 'application/ld+json');
             }
-            res.send(response);
+            res.send(asArray ? [response] :response);
         })
         .catch((err) => {
             debug(err);

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) {
+function getAsNgsiLD(req, res, 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) => {
@@ -73,7 +73,7 @@ function getAsNgsiLD(req, res) {
     } else {
         res.set('Content-Type', 'application/ld+json');
     }
-    res.send(response);
+    res.send(asArray ? [response] :response);
 }
 
 //

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) {
+function getAsNgsiLD(req, res, asArray = false) {
     const response = Formatter.formatAsLDResponse(req, null, (name, type) => {
         return staticValues[type.toLowerCase()];
     });
@@ -89,7 +89,7 @@ function getAsNgsiLD(req, res) {
         res.set('Content-Type', 'application/ld+json');
     }
 
-    res.send(response);
+    res.send(asArray ? [response] :response);
 }
 
 //

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) {
+function getAsNgsiLD(req, res, asArray = false) {
     monitor('/ngsi-ld/v1/entities', 'Data requested from Twitter API', req.body);
 
     makeTwitterRequest(
@@ -130,7 +130,7 @@ function getAsNgsiLD(req, res) {
             } else {
                 res.set('Content-Type', 'application/ld+json');
             }
-            res.send(response);
+            res.send(asArray ? [response] :response);
         },
         (err) => {
             debug(err);

context-provider/routes/proxy-ld.js

@@ -69,6 +69,15 @@ function noOp(req, res) {
     res.send();
 }
 
+
+router.get('/catfacts/:type/:mapping/ngsi-ld/v1/entities', CatFactsNGSIProxy.getAsNgsiLD, true);
+router.get('/random/:type/:mapping/ngsi-ld/v1/entities', RandomNGSIProxy.getAsNgsiLD, true);
+router.get('/static/:type/:mapping/ngsi-ld/v1/entities', StaticNGSIProxy.getAsNgsiLD, true);
+router.get('/twitter/:type/:mapping/:queryString/ngsi-ld/v1/entities', TwitterNGSIProxy.getAsNgsiLD, true);
+router.get('/weather/:type/:mapping/:queryString/ngsi-ld/v1/entities', WeatherNGSIProxy.getAsNgsiLD, 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);