Skip to content

better queries in websockets #2475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MilosKozak merged 1 commit into from
Feb 23, 2017
Merged

better queries in websockets #2475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions lib/websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down