Add more properties

Author: jason-fox

app/controllers/csv.js

@@ -39,7 +39,13 @@ function readCsvFile(path) {
     });
 }
 
-
+function tryParse(value) {
+    try {
+        return JSON.parse(value);
+    } catch (e) {
+        return value;
+    }
+}
 
 function createEntitiesFromRows(rows) {
     const allEntities = [];
@@ -55,14 +61,22 @@ function createEntitiesFromRows(rows) {
             const value = row[key];
             if (value !== '') {
                 switch (key) {
+                    case 'alternateName':
                     case 'birthdate':
                     case 'comment':
+                    case 'controlledProperty':
+                    case 'description':
+                    case 'deviceState':
                     case 'fedWith':
                     case 'givenName':
                     case 'legalId':
                     case 'name':
                     case 'species':
-                        entity[key] = { value, type: 'Property' };
+                    case 'soilTextureType':
+                    case 'status':
+                    case 'supportedProtocol':
+                    case 'agroVocConcept':
+                        entity[key] = { value: tryParse(value), type: 'Property' };
                         break;
 
                     case 'temperature':
@@ -76,6 +90,9 @@ function createEntitiesFromRows(rows) {
                     case 'heartRate':
                         entity[key] = { value: Number(value), type: 'Property', unitCode: '5K', observedAt: timestamp };
                         break;
+                    case 'humidity':
+                        entity[key] = { value: Number(value), type: 'Property', unitCode: 'P1', observedAt: timestamp };
+                        break;
                     case 'weight':
                         entity[key] = {
                             value: Number(value),
@@ -84,6 +101,13 @@ function createEntitiesFromRows(rows) {
                             observedAt: timestamp
                         };
                         break;
+                    case 'batteryLevel':
+                        entity[key] = {
+                            value: Number(value),
+                            type: 'Property',
+                            unitCode: 'C62'
+                        };
+                        break;
 
                     case 'jobTitle_name':
                         entity.jobTitle = {
@@ -125,32 +149,73 @@ function createEntitiesFromRows(rows) {
                     case 'phenologicalCondition':
                     case 'reproductiveCondition':
                     case 'sex':
-                        entity[key] = { vocab: value, type: 'VocabProperty' };
+                        entity[key] = { vocab: tryParse(value), type: 'VocabProperty' };
                         break;
                     case 'calvedBy':
+                    case 'controlledAsset':
+                    case 'deviceModel':
                     case 'cropType':
                     case 'owns':
                     case 'owner':
                     case 'ownedBy':
                     case 'siredBy':
-                        entity[key] = { object: value, type: 'Relationship' };
+                    case 'hasAgriSoil':
+                    case 'hasAgriCrop':
+                    case 'hasDevices':
+                    case 'hasAgriPest':
+                    case 'hasAgriParcel':
+                    case 'hasBuilding':
+                        entity[key] = { object: tryParse(value), type: 'Relationship' };
                         break;
                     case 'locatedAt':
                     case 'observation':
                     case 'prediction':
-                        entity[key] = { object: value, type: 'Relationship', observedAt: timestamp };
+                        entity[key] = { object: tryParse(value), type: 'Relationship', observedAt: timestamp };
                         break;
                     case 'id':
                     case 'type':
+                    case 'lat':
+                    case 'lng':
+                    case 'addressLocality':
+                    case 'addressRegion':
+                    case 'postalCode':
+                    case 'providedBy':
                         break;
                     default:
-                        //debug('unknown : ' + key);
+                        if (!key.includes('_')) {
+                            debug('unknown : ' + key);
+                        }
                         break;
                 }
             }
-
         });
 
+        switch (entity.type) {
+            case 'Animal':
+                if (row.providedBy) {
+                    if (entity.heartRate) {
+                        entity.heartRate.providedBy = {
+                            type: 'Relationship',
+                            object: row.providedBy
+                        };
+                    }
+                    if (entity.location) {
+                        entity.location.providedBy = {
+                            type: 'Relationship',
+                            object: row.providedBy
+                        };
+                    }
+                }
+                break;
+            case 'AgriParcel':
+                if (row.providedBy) {
+                    entity.humidity.providedBy = {
+                        type: 'Relationship',
+                        object: row.providedBy
+                    };
+                }
+        }
+
         allEntities.push(entity);
     });
     return allEntities;

app/lib/batchUpdate.js

@@ -1,5 +1,5 @@
 const CONTEXT_BROKER_URL = process.env.CONTEXT_BROKER || 'http://localhost:1026/ngsi-ld/v1';
-const LINKED_DATA = process.env.IOTA_JSON_LD_CONTEXT ||  'http://context/ngsi-context.jsonld';
+const LINKED_DATA = process.env.IOTA_JSON_LD_CONTEXT || 'http://context/ngsi-context.jsonld';
 const debug = require('debug')('tutorial:batchUpdate');
 
 async function parse(response) {

app/lib/upload.js

@@ -3,7 +3,7 @@ const path = require('path');
 const debug = require('debug')('tutorial:upload');
 
 const csvFilter = (req, file, callback) => {
-    debug(file)
+    debug(file);
     callback(null, true);
 };