Split out Animals from other devices.

Author: jason-fox

.gitignore

@@ -43,3 +43,5 @@ Dockerfile
 !forwarder/Dockerfile
 !iot-devices/Dockerfile
 iot-devices/init.sh
+iot-devices/animals.sh
+iot-devices/append.csv

iot-devices/app.js

@@ -5,6 +5,7 @@ const debug = require('debug')('devices:iot-device');
 const mqtt = require('mqtt');
 const logger = require('morgan');
 const IoTDevices = require('./models/devices');
+const Animals = require('./models/animals');
 const MyCache = require('./lib/cache');
 
 /* global MQTT_CLIENT */
@@ -72,7 +73,7 @@ iotRouter.put('/devices', (req, res) => {
 });
 
 iotRouter.get('/animals', (req, res) => {
-  const result = IoTDevices.fireAnimalCollars();
+  const result = Animals.fireAnimalCollars();
   res.status(result === false ? 401 : 204).send();
 });
 

iot-devices/controllers/iot/northbound.js

@@ -71,11 +71,11 @@ if (process.env.DUMMY_DEVICES_USER && process.env.DUMMY_DEVICES_PASSWORD) {
 module.exports = {
   sendMeasure(deviceId, state) {
     if (DEVICE_TRANSPORT === 'HTTP') {
-      debug('sendHTTPMeasure: ' + deviceId);
+      //debug('sendHTTPMeasure: ' + deviceId);
       Measure.sendAsHTTP(deviceId, state);
     }
     if (DEVICE_TRANSPORT === 'MQTT') {
-      debug('sendMQTTMeasure: ' + deviceId);
+      //debug('sendMQTTMeasure: ' + deviceId);
       Measure.sendAsMQTT(deviceId, state);
     }
   },

iot-devices/lib/ngsi-ld.js

@@ -1,4 +1,3 @@
-const debug = require('debug')('devices:writer');
 const JSONMeasure = require('../models/measure/json');
 const fs = require('fs');
 
@@ -8,18 +7,23 @@ const stream = HISTORY_LOG
   ? fs.createWriteStream(HISTORY_LOG, { flags: 'a' })
   : null;
 
-exports.write = function (deviceId, state, offset) {
+exports.write = function (deviceId, state) {
   if (!stream) {
     console.log(HISTORY_LOG);
     return;
   }
   if (!deviceId.startsWith('cow')) {
     return;
   }
+
+  if (state.d === 'MOUNTING') {
+    console.log('MOUNT');
+  }
+
   const data = JSON.parse(json.format(state, false));
   const animal = `urn:ngsi-ld:Animal:${deviceId}`;
   const device = `urn:ngsi-ld:Device:${deviceId}`;
-  const line = `${animal},Device,${data.bpm},Point,${data.gps},${device},${data.d},${data.o}`;
+  const line = `${animal},${data.bpm},${data.gps},${device},${data.d},${data.o}`;
 
   stream.write(line + '\n');
 };