bckelley/cgm-remote-monitor
1
0
Fork 0
mirror of https://github.com/bckelley/cgm-remote-monitor.git synced 2026-08-24 03:14:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MilosKozak/cgm-remote-monitor into dev

Browse Source
This commit is contained in:
MilosKozak
2017-02-24 12:06:41 +01:00
parent d9b812b8c4 4788eaf955
commit ad825756c4
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/websocket.js
+18 -8
View File
@@ -262,11 +262,16 @@ function init (env, ctx, server) {
// treatments deduping
if (data.collection === 'treatments') {
var query = {
created_at: data.data.created_at
, eventType: data.data.eventType
};
var query;
if (data.data.NSCLIENT_ID) {
query = { NSCLIENT_ID: data.data.NSCLIENT_ID };
} else {
query = {
created_at: data.data.created_at
, eventType: data.data.eventType
};
}
// try to find exact match
ctx.store.collection(collection).find(query).toArray(function findResult (err, array) {
if (err || array.length > 0) {
@@ -337,9 +342,14 @@ function init (env, ctx, server) {
});
// devicestatus deduping
} else if (data.collection === 'devicestatus') {
var queryDev = {
created_at: data.data.created_at
};
var queryDev;
if (data.data.NSCLIENT_ID) {
queryDev = { NSCLIENT_ID: data.data.NSCLIENT_ID };
} else {
queryDev = {
created_at: data.data.created_at
};
}
// try to find exact match
ctx.store.collection(collection).find(queryDev).toArray(function findResult (err, array) {