From b46ed73d15742b6d72120a4b8fbd92938252c389 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <woho@hottis.de>
Date: Mon, 26 Feb 2018 13:13:05 +0100
Subject: [PATCH] occupant name

---
 dist/main.js   | 8 +++++++-
 geofences.conf | 5 ++++-
 src/main.ts    | 8 +++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index e03a17f..fcba4a6 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -3,13 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express = require("express");
 const logger = require("./log");
 const bodyParser = require("body-parser");
+const config = require("./config");
 const app = express();
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
 app.post('/', (req, res) => {
     const reqData = req.body;
+    const deviceId = reqData.device;
+    let occupantName = 'unknown';
+    if (deviceId in config.dict.occupants) {
+        occupantName = config.dict.occupants[deviceId];
+    }
     const direction = (reqData.entry == '1') ? 'arrives' : 'leaves';
-    logger.info(`${reqData.device} ${direction}`);
+    logger.info(`${deviceId} (${occupantName}) ${direction}`);
     logger.info(JSON.stringify(reqData));
     res.send('OK');
 });
diff --git a/geofences.conf b/geofences.conf
index 3ecbbbd..eb65c47 100644
--- a/geofences.conf
+++ b/geofences.conf
@@ -6,5 +6,8 @@
     "smtpHost": "localhost",
     "smtpPort": 25,
     "smtpSender": "geofences@hottis.de",
-    "smtpReceiver": "woho@hottis.de"
+    "smtpReceiver": "woho@hottis.de",
+    "occupants": {
+        "386D105B-80D0-4708-95AB-77B4D1E36D0E": "Wolfgang"
+    }
 }
diff --git a/src/main.ts b/src/main.ts
index d8bebd2..560861e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,6 +2,7 @@ import * as http from 'http'
 import * as express from 'express'
 import * as logger from './log'
 import * as bodyParser from 'body-parser'
+import * as config from './config'
 
 const app = express()
 app.use(bodyParser.urlencoded({ extended: false }));
@@ -10,8 +11,13 @@ app.use(bodyParser.json());
 
 app.post('/', (req, res) => {
     const reqData = req.body
+    const deviceId = reqData.device
+    let occupantName : string = 'unknown'
+    if (deviceId in config.dict.occupants) {
+        occupantName = config.dict.occupants[deviceId]
+    }
     const direction : string = (reqData.entry == '1') ? 'arrives' : 'leaves'
-    logger.info(`${reqData.device} ${direction}`)
+    logger.info(`${deviceId} (${occupantName}) ${direction}`)
     logger.info(JSON.stringify(reqData))
     res.send('OK')
 })