Allow upload of tenant and of historical data.

Author: jason-fox

app/app.js

@@ -16,6 +16,7 @@ const mongoose = require('mongoose');
 const MongoStore = require('connect-mongo');
 
 const MONGO_DB = process.env.MONGO_URL || 'mongodb://localhost:27017';
+const sessionOff = process.env.SESSION_OFF || false;
 
 const connectWithRetry = () => {
     mongoose
@@ -32,7 +33,13 @@ const connectWithRetry = () => {
             setTimeout(connectWithRetry, 5000);
         });
 };
-connectWithRetry();
+
+if (!sessionOff) {
+    debug(`Enabling sessions`);
+    connectWithRetry();
+} else {
+    debug('Sessions are disabled.');
+}
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -44,29 +51,31 @@ app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(flash());
 
-if (process.env.NODE_ENV === 'production') {
-    // Use Mongo-DB to store session data.
-    app.use(
-        session({
-            resave: false,
-            saveUninitialized: true,
-            secret: SECRET,
-            store: MongoStore.create({
-                mongoUrl: MONGO_DB + '/sessions',
-                mongooseConnection: mongoose.connection,
-                ttl: 14 * 24 * 60 * 60 // save session for 14 days
+if (!sessionOff) {
+    if (process.env.NODE_ENV === 'production') {
+        // Use Mongo-DB to store session data.
+        app.use(
+            session({
+                resave: false,
+                saveUninitialized: true,
+                secret: SECRET,
+                store: MongoStore.create({
+                    mongoUrl: MONGO_DB + '/sessions',
+                    mongooseConnection: mongoose.connection,
+                    ttl: 14 * 24 * 60 * 60 // save session for 14 days
+                })
             })
-        })
-    );
-} else {
-    // Use Memstore for session data.
-    app.use(
-        session({
-            secret: SECRET,
-            resave: false,
-            saveUninitialized: true
-        })
-    );
+        );
+    } else {
+        // Use Memstore for session data.
+        app.use(
+            session({
+                secret: SECRET,
+                resave: false,
+                saveUninitialized: true
+            })
+        );
+    }
 }
 
 app.use(express.static(path.join(__dirname, 'public')));

app/controllers/csv.js

@@ -62,14 +62,20 @@ function createEntitiesFromRows(rows) {
         weight: 'KGM',
         batteryLevel: 'C68'
     };
-    const timestamp = new Date().toISOString();
+    const now = new Date();
+    const currentTimestamp = now.toISOString();
 
     rows.forEach((row) => {
         const entity = {
             id: row.id,
             type: row.type
         };
 
+        let timestamp = currentTimestamp;
+        if (row.offset) {
+            timestamp = new Date(now.getTime() + Number(row.offset) * 60000).toISOString();
+        }
+
         Object.keys(row).forEach((key) => {
             const value = row[key];
             if (value !== '') {
@@ -78,7 +84,7 @@ function createEntitiesFromRows(rows) {
                     case 'agroVocConcept':
                     case 'alternateName':
                     case 'birthdate':
-                    
+
                     case 'controlledProperty':
                     case 'dataProvider':
                     case 'dateIssued':
@@ -206,6 +212,7 @@ function createEntitiesFromRows(rows) {
                     case 'addressRegion':
                     case 'postalCode':
                     case 'providedBy':
+                    case 'offset':
                         break;
 
                     default:
@@ -257,10 +264,10 @@ function createEntitiesFromRows(rows) {
  * Create an array of promises to send data to the context broker.
  * Each insert represents a series of readings at a given timestamp
  */
-function createContextRequests(entities) {
+function createContextRequests(entities, tenant) {
     const promises = [];
     entities.forEach((entitiesAtTimeStamp) => {
-        promises.push(BatchUpdate.sendAsHTTP(entitiesAtTimeStamp));
+        promises.push(BatchUpdate.sendAsHTTP(entitiesAtTimeStamp, tenant));
     });
     return promises;
 }
@@ -293,7 +300,7 @@ const upload = (req, res) => {
                 batchEntities.push(chunk);
             }
 
-            return createContextRequests(batchEntities);
+            return createContextRequests(batchEntities, req.get('NGSILD-Tenant'));
         })
         .then(async (promises) => {
             const results = [];

app/controllers/ngsi-ld/animal.js

@@ -31,7 +31,7 @@ async function getAnimals(req, res) {
 
 function displayMap(req, res) {
     debug('displayMap');
-    return res.render('animalMap', {title: 'Animal Locations'});
+    return res.render('animalMap', { title: 'Animal Locations' });
 }
 
 // This function receives the details of a person from the context

app/lib/batchUpdate.js

@@ -18,12 +18,17 @@ function is2xxSuccessful(status) {
 }
 
 // measures sent over HTTP are POST requests with params
-function sendAsHTTP(state) {
+function sendAsHTTP(state, tenant) {
     const url = CONTEXT_BROKER_URL + '/entityOperations/upsert';
     const headers = {
         'Content-Type': 'application/json',
         Link: '<' + LINKED_DATA + '>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
     };
+
+    if (tenant) {
+        headers['NGSILD-Tenant'] = tenant;
+    }
+
     const body = Array.isArray(state) ? state : [state];
     try {
         return fetch(`${url}?${new URLSearchParams({ options: 'update' })}`, {