Update endpoint

Author: jason-fox

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

@@ -79,6 +79,8 @@ 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) {
+
+    console.log(req.params)
     const response = Formatter.formatAsLDResponse(req, null, (name, type) => {
         return staticValues[type.toLowerCase()];
     });

context-provider/lib/formatter.js

@@ -88,6 +88,7 @@ function formatAsV2Response(req, inputData, attributeValueCallback) {
 // Formatting function for an NGSI v1 response to a context query.
 //
 function formatAsV1Response(req, inputData, attributeValueCallback) {
+    console.log(req.params.mapping)
     const mappedAttributes = parseMapping(req.params.mapping);
 
     const ngsiV1Response = {

context-provider/package.json

@@ -33,7 +33,7 @@
     "express": "~4.17.3",
     "express-session": "^1.17.2",
     "http-errors": "^2.0.0",
-    "jsonld": "^5.2.0",
+    "jsonld": "^8.3.3",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",

context-provider/routes/proxy-ld.js

@@ -70,11 +70,18 @@ function noOp(req, res) {
 }
 
 
-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/tweets/ngsi-ld/v1/entities', tweetDefaults, (req, res) => {
+    req.params.id = req.query.ids || '12345'
+    CatFactsNGSIProxy.getAsNgsiLD(req, res, true);
+}); 
+router.get('/random/tweets/ngsi-ld/v1/entities', tweetDefaults, (req, res) => {
+    req.params.id = req.query.ids || '12345'
+    RandomNGSIProxy.getAsNgsiLD(req, res, true);
+}); 
+router.get('/static/tweets/ngsi-ld/v1/entities', tweetDefaults, (req, res) => {
+    req.params.id = req.query.ids || '12345'
+    StaticNGSIProxy.getAsNgsiLD(req, res, true);
+});