@jambonz/time-series 0.2.7 → 0.2.9

package/index.js

@@ -55,7 +55,8 @@ const schemas = {
     tags: [
       'service_provider_sid',
       'account_sid',
-      'alert_type'
+      'alert_type',
+      'vendor'
     ]
   },
   call_counts: {
@@ -181,13 +182,12 @@ const createCallCountsCountQuery = ({days, start, end}) => {
 };
 
 /* for Service Provider */
-const createCdrQuerySP = ({page, page_size, trunk, direction, answered, from, to, days, start, end}) => {
+const createCdrQuerySP = ({page, page_size, trunk, direction, answered, filter, days, start, end}) => {
   let sql = 'SELECT * from cdrs WHERE service_provider_sid = $service_provider_sid ';
   if (trunk) sql += 'AND trunk = $trunk ';
   if (direction) sql += 'AND direction = $direction ';
   if (['true', 'false'].includes(answered)) sql += 'AND answered = $answered ';
-  if (from) sql += `AND "from" =~ /.*${from}.*/ `;
-  if (to) sql += `AND "to" =~ /.*${to}.*/ `;
+  if (filter) sql += `AND ("from" =~ /.*${filter}.*/ OR "to" =~ /.*${filter}.*/ OR call_sid = $filter) `;
   if (days) sql += 'AND time > $timestamp ';
   else {
     if (start) sql += 'AND time >= $start ';
@@ -198,13 +198,12 @@ const createCdrQuerySP = ({page, page_size, trunk, direction, answered, from, to
   if (page) sql += ' OFFSET $offset';
   return sql;
 };
-const createCdrCountQuerySP = ({trunk, direction, answered, from, to, days, start, end}) => {
+const createCdrCountQuerySP = ({trunk, direction, answered, filter, days, start, end}) => {
   let sql = 'SELECT COUNT(sip_callid) from cdrs WHERE service_provider_sid = $service_provider_sid ';
   if (trunk) sql += 'AND trunk = $trunk ';
   if (direction) sql += 'AND direction = $direction ';
   if (['true', 'false'].includes(answered)) sql += 'AND answered = $answered ';
-  if (from) sql += `AND "from" =~ /.*${from}.*/ `;
-  if (to) sql += `AND "to" =~ /.*${to}.*/ `;
+  if (filter) sql += `AND ("from" =~ /.*${filter}.*/ OR "to" =~ /.*${filter}.*/ OR call_sid = $filter) `;
   if (days) sql += 'AND time > $timestamp ';
   else {
     if (start) sql += 'AND time >= $start ';
@@ -214,13 +213,12 @@ const createCdrCountQuerySP = ({trunk, direction, answered, from, to, days, star
 };
 
 /* for Account */
-const createCdrQuery = ({page, page_size, trunk, direction, answered, from, to, days, start, end}) => {
+const createCdrQuery = ({page, page_size, trunk, direction, answered, filter, days, start, end}) => {
   let sql = 'SELECT * from cdrs WHERE account_sid = $account_sid ';
   if (trunk) sql += 'AND trunk = $trunk ';
   if (direction) sql += 'AND direction = $direction ';
   if (['true', 'false'].includes(answered)) sql += 'AND answered = $answered ';
-  if (from) sql += `AND "from" =~ /.*${from}.*/ `;
-  if (to) sql += `AND "to" =~ /.*${to}.*/ `;
+  if (filter) sql += `AND ("from" =~ /.*${filter}.*/ OR "to" =~ /.*${filter}.*/ OR call_sid = $filter) `;
   if (days) sql += 'AND time > $timestamp ';
   else {
     if (start) sql += 'AND time >= $start ';
@@ -231,13 +229,12 @@ const createCdrQuery = ({page, page_size, trunk, direction, answered, from, to,
   if (page) sql += ' OFFSET $offset';
   return sql;
 };
-const createCdrCountQuery = ({trunk, direction, answered, from, to, days, start, end}) => {
+const createCdrCountQuery = ({trunk, direction, answered, filter, days, start, end}) => {
   let sql = 'SELECT COUNT(sip_callid) from cdrs WHERE account_sid = $account_sid ';
   if (trunk) sql += 'AND trunk = $trunk ';
   if (direction) sql += 'AND direction = $direction ';
   if (['true', 'false'].includes(answered)) sql += 'AND answered = $answered ';
-  if (from) sql += `AND "from" =~ /.*${from}.*/ `;
-  if (to) sql += `AND "to" =~ /.*${to}.*/ `;
+  if (filter) sql += `AND ("from" =~ /.*${filter}.*/ OR "to" =~ /.*${filter}.*/ OR call_sid = $filter) `;
   if (days) sql += 'AND time > $timestamp ';
   else {
     if (start) sql += 'AND time >= $start ';
@@ -647,7 +644,8 @@ const writeAlerts = async(client, alerts) => {
       }
       let fields =  { message };
       if (target_sid) fields = Object.assign(fields, {target_sid});
-      const obj = {measurement: 'alerts', fields: fields, tags: { alert_type, service_provider_sid, account_sid }};
+      const obj = {measurement: 'alerts', fields: fields, tags: { alert_type, service_provider_sid, account_sid,
+        ...(vendor && {vendor})}};
       if (timestamp) obj.timestamp = timestamp;
       if (detail) obj.fields.detail = detail;
       return obj;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/time-series",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "write and query data to time series daetabase",
   "main": "index.js",
   "scripts": {

package/test/unit-tests.js

@@ -62,15 +62,17 @@ test('write timeseries data', async(t) => {
   //console.log(JSON.stringify(result));
   t.ok(result.data.length === 1, 'queried cdrs by account sid');
 
-  result = await queryCdrs({account_sid: 'xxxx', from: 'a', page: 1, page_size:25});
+  result = await queryCdrs({account_sid: 'xxxx', filter: 'a', page: 1, page_size:25});
   t.ok(result.data.length === 0, 'queried cdrs by from');
-  result = await queryCdrs({account_sid: 'xxxx', from: 'm', page: 1, page_size:25});
+  result = await queryCdrs({account_sid: 'xxxx', filter: 'm', page: 1, page_size:25});
   t.ok(result.data.length === 1, 'queried cdrs by from');
 
-  result = await queryCdrs({account_sid: 'xxxx', to: 'a', page: 1, page_size:25});
+  result = await queryCdrs({account_sid: 'xxxx', filter: 'a', page: 1, page_size:25});
   t.ok(result.data.length === 0, 'queried cdrs by to');
-  result = await queryCdrs({account_sid: 'xxxx', to: 'y', page: 1, page_size:25});
+  result = await queryCdrs({account_sid: 'xxxx', filter: 'y', page: 1, page_size:25});
   t.ok(result.data.length === 1, 'queried cdrs by to');
+  result = await queryCdrs({account_sid: 'yyyy', filter: 'bar', page: 1, page_size:25});
+  t.ok(result.data.length === 1, 'queried cdrs by callSid');
 
   result = await queryCdrs({account_sid: 'yyyy', trunk: 'twilio', page: 1, page_size:25});
   t.ok(result.data.length === 1, 'queried cdrs by trunk')
@@ -78,22 +80,22 @@ test('write timeseries data', async(t) => {
   result = await queryCdrsSP({service_provider_sid: 'zzzzz', page: 1, page_size:25});
   t.ok(result.data.length === 2, 'queried cdrs by service provider sid')
 
-  result = await queryCdrsSP({service_provider_sid: 'zzzzz', from: 'a', page: 1, page_size:25});
+  result = await queryCdrsSP({service_provider_sid: 'zzzzz', filter: 'a', page: 1, page_size:25});
   t.ok(result.data.length === 0, 'queried cdrs by service provider sid and from')
 
-  result = await queryCdrsSP({service_provider_sid: 'zzzzz', from: 'me', page: 1, page_size:25});
+  result = await queryCdrsSP({service_provider_sid: 'zzzzz', filter: 'me', page: 1, page_size:25});
   t.ok(result.data.length === 2, 'queried cdrs by service provider sid and from')
 
-  result = await queryCdrsSP({service_provider_sid: 'zzzzz', from: 'me2', page: 1, page_size:25});
+  result = await queryCdrsSP({service_provider_sid: 'zzzzz', filter: 'me2', page: 1, page_size:25});
   t.ok(result.data.length === 1, 'queried cdrs by service provider sid and from')
 
-  result = await queryCdrsSP({service_provider_sid: 'zzzzz', to: 'a', page: 1, page_size:25});
+  result = await queryCdrsSP({service_provider_sid: 'zzzzz', filter: 'a', page: 1, page_size:25});
   t.ok(result.data.length === 0, 'queried cdrs by service provider sid and to')
 
-  result = await queryCdrsSP({service_provider_sid: 'zzzzz', to: 'you', page: 1, page_size:25});
+  result = await queryCdrsSP({service_provider_sid: 'zzzzz', filter: 'you', page: 1, page_size:25});
   t.ok(result.data.length === 2, 'queried cdrs by service provider sid and to')
 
-  result = await queryCdrsSP({service_provider_sid: 'zzzzz', to: 'you2', page: 1, page_size:25});
+  result = await queryCdrsSP({service_provider_sid: 'zzzzz', filter: 'you2', page: 1, page_size:25});
   t.ok(result.data.length === 1, 'queried cdrs by service provider sid and ot')
 
   result = await writeAlerts([