@jambonz/time-series 0.2.1 → 0.2.3

package/index.js

@@ -25,6 +25,7 @@ const schemas = {
     measurement: 'cdrs',
     fields: {
       call_sid: Influx.FieldType.STRING,
+      application_sid: Influx.FieldType.STRING,
       from: Influx.FieldType.STRING,
       to: Influx.FieldType.STRING,
       sip_callid: Influx.FieldType.STRING,
@@ -74,6 +75,15 @@ const schemas = {
     tags: [
       'service_provider_sid'
     ]
+  },
+  app_call_counts: {
+    measurement: 'app_call_counts',
+    fields: {
+      calls_in_progress: Influx.FieldType.INTEGER,
+    },
+    tags: [
+      'application_sid'
+    ]
   }
 };
 
@@ -95,6 +105,30 @@ const writeData = async(client) => {
   }
 };
 
+/* for application */
+const createCallCountsQueryApp = ({page, page_size, days, start, end}) => {
+  let sql = 'SELECT * from app_call_counts WHERE application_sid = $application_sid ';
+  if (days) sql += 'AND time > $timestamp ';
+  else {
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
+  }
+  sql += ' ORDER BY time DESC';
+  if (page_size) sql += ' LIMIT $page_size';
+  if (page) sql += ' OFFSET $offset';
+  return sql;
+};
+
+const createCallCountsCountQueryApp = ({days, start, end}) => {
+  let sql = 'SELECT COUNT(calls_in_progress) from app_call_counts WHERE application_sid = $application_sid ';
+  if (days) sql += 'AND time > $timestamp ';
+  else {
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
+  }
+  return sql;
+};
+
 /* for Service Provider */
 const createCallCountsQuerySP = ({page, page_size, days, start, end}) => {
   let sql = 'SELECT * from sp_call_counts WHERE service_provider_sid = $service_provider_sid ';
@@ -301,6 +335,58 @@ const writeCallCountSP = async(client, count) => {
   return;
 };
 
+const writeCallCountApp = async(client, count) => {
+  if (!client.locals.initialized) await initDatabase(client, 'app_call_counts');
+  const {application_sid, ...fields} = count;
+  const data = {
+    measurement: 'app_call_counts',
+    fields,
+    tags: {
+      application_sid
+    }
+  };
+  client.locals.data = [...client.locals.data, ...[data]];
+  if (client.locals.data.length >= client.locals.commitSize) {
+    await writeData(client);
+  }
+  return;
+};
+
+const queryCallCountsApp = async(client, opts) => {
+  if (!client.locals.initialized) await initDatabase(client, 'app_call_counts');
+  const response = {
+    total: 0,
+    page_size: opts.page_size,
+    page: opts.page,
+    data: []
+  };
+  const params = generateBindParameters(opts);
+  const sqlTotal = createCallCountsCountQueryApp(opts);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
+  //console.log(`sqlTotal: ${sqlTotal}, results: ${JSON.stringify(obj)}`);
+  if (!obj.results || !obj.results[0].series) return response;
+  response.total = obj.results[0].series[0].values[0][1];
+
+  const sql = createCallCountsQueryApp(opts);
+  const res = await client.queryRaw(sql, { placeholders: params});
+  //console.log(`sql: ${sqlTotal}, results: ${JSON.stringify(res)}`);
+  if (res.results[0].series && res.results[0].series.length) {
+    const {columns, values} = res.results[0].series[0];
+    const data = values.map((v) => {
+      const obj = {};
+      v.forEach((val, idx) => {
+        v.forEach((val, idx) => {
+          const key = columns[idx];
+          obj[key] = val;
+        });
+      });
+      return obj;
+    });
+    response.data = data;
+  }
+  return response;
+};
+
 const queryCallCountsSP = async(client, opts) => {
   if (!client.locals.initialized) await initDatabase(client, 'sp_call_counts');
   const response = {
@@ -450,6 +536,7 @@ const queryCdrs = async(client, opts) => {
 
   const sql = createCdrQuery(opts);
   const res = await client.queryRaw(sql, { placeholders: params});
+  //console.log(JSON.stringify(res.results[0]));
   if (res.results[0].series && res.results[0].series.length) {
     const {columns, values} = res.results[0].series[0];
     const data = values.map((v) => {
@@ -640,6 +727,8 @@ module.exports = (logger, opts) => {
   const alertClient = new Influx.InfluxDB({database: 'alerts', schemas: schemas.alerts, ...opts});
   const callCountClient = new Influx.InfluxDB({database: 'call_counts', schemas: schemas.call_counts, ...opts});
   const callCountSPClient = new Influx.InfluxDB({database: 'sp_call_counts', schemas: schemas.sp_call_counts, ...opts});
+  // eslint-disable-next-line max-len
+  const callCountAppClient = new Influx.InfluxDB({database: 'app_call_counts', schemas: schemas.app_call_counts, ...opts});
 
   cdrClient.locals = {
     db: 'cdrs',
@@ -657,6 +746,14 @@ module.exports = (logger, opts) => {
     commitInterval: opts.commitInterval || 10,
     data: []
   };
+  callCountAppClient.locals = {
+    db: 'app_call_counts',
+    initialized: false,
+    writing: false,
+    commitSize: opts.commitSize || 1,
+    commitInterval: opts.commitInterval || 10,
+    data: []
+  };
   callCountSPClient.locals = {
     db: 'sp_call_counts',
     initialized: false,
@@ -676,14 +773,18 @@ module.exports = (logger, opts) => {
 
   if (opts.commitSize > 1 && opts.commitInterval && opts.commitInterval > 2) {
     setInterval(writeData.bind(null, callCountClient), opts.commitInterval * 1000);
+    setInterval(writeData.bind(null, callCountSPClient), opts.commitInterval * 1000);
+    setInterval(writeData.bind(null, callCountAppClient), opts.commitInterval * 1000);
     setInterval(writeData.bind(null, cdrClient), opts.commitInterval * 1000);
     setInterval(writeData.bind(null, alertClient), opts.commitInterval * 1000);
   }
 
   return {
     writeCallCount: writeCallCount.bind(null, callCountClient),
+    writeCallCountApp: writeCallCountApp.bind(null, callCountAppClient),
     writeCallCountSP: writeCallCountSP.bind(null, callCountSPClient),
     queryCallCounts: queryCallCounts.bind(null, callCountClient),
+    queryCallCountsApp: queryCallCountsApp.bind(null, callCountAppClient),
     queryCallCountsSP: queryCallCountsSP.bind(null, callCountSPClient),
     writeCdrs: writeCdrs.bind(null, cdrClient),
     queryCdrsSP: queryCdrsSP.bind(null, cdrClient),

package/package.json

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

package/test/unit-tests.js

@@ -5,8 +5,10 @@ const consoleLogger = {error: console.error, info: console.log, debug: console.l
 const {
   writeCallCount,
   writeCallCountSP,
+  writeCallCountApp,
   queryCallCounts,
   queryCallCountsSP,
+  queryCallCountsApp,
   writeCdrs,
   queryCdrs,
   queryCdrsSP,
@@ -33,7 +35,6 @@ test('write timeseries data', async(t) => {
     trunk: 'device',
     service_provider_sid: 'zzzzz',
     account_sid: 'xxxx',
-    call_sid: 'foo'
   },
   {
     from: 'me2',
@@ -51,12 +52,13 @@ test('write timeseries data', async(t) => {
     trunk: 'twilio',
     service_provider_sid: 'zzzzz',
     account_sid: 'yyyy',
-    call_sid: 'bar'
+    call_sid: 'bar',
+    application_sid: 'app-sid'
   }]);
   t.pass('wrote cdr');
 
   result = await queryCdrs({account_sid: 'xxxx', page: 1, page_size:25});
-  //npm tesconsole.log(JSON.stringify(result));
+  //console.log(JSON.stringify(result));
   t.ok(result.data.length === 1, 'queried cdrs by account sid')
 
   result = await queryCdrs({account_sid: 'yyyy', trunk: 'twilio', page: 1, page_size:25});
@@ -203,6 +205,18 @@ test('write timeseries data', async(t) => {
     });
   t.pass('wrote call counts for service provider');
 
+  result = await writeCallCountApp(
+    {
+      calls_in_progress: 20,
+      application_sid: 'zzzzz'
+    });
+  result = await writeCallCountApp(
+    {
+      calls_in_progress: 21,
+      application_sid: 'zzzzz'
+    });
+  t.pass('wrote call counts for application');
+
   result = await queryCallCountsSP({service_provider_sid: 'zzzzz', page: 1, page_size: 25, days: 7});
   //console.log(JSON.stringify(result));
   t.ok(result.data.length === 2, 'queried call counts by service provider sid');
@@ -210,4 +224,9 @@ test('write timeseries data', async(t) => {
   result = await queryCallCounts({account_sid: 'yyyy', page: 1, page_size: 25, days: 7});
   //console.log(JSON.stringify(result));
   t.ok(result.data.length === 2, 'queried call counts by account_sid');
+
+  result = await queryCallCountsApp({application_sid: 'zzzzz', page: 1, page_size: 25, days: 7});
+  //console.log(JSON.stringify(result));
+  t.ok(result.data.length === 2 && result.data[0].calls_in_progress === 21, 'queried call counts by application_sid');
+
 });