@jambonz/time-series 0.1.10 → 0.2.0

package/index.js

@@ -33,6 +33,7 @@ const schemas = {
       trace_id: Influx.FieldType.STRING
     },
     tags: [
+      'service_provider_sid',
       'account_sid',
       'host',
       'trunk',
@@ -47,6 +48,7 @@ const schemas = {
       detail: Influx.FieldType.STRING,
     },
     tags: [
+      'service_provider_sid',
       'account_sid',
       'alert_type'
     ]
@@ -57,6 +59,7 @@ const schemas = {
       calls_in_progress: Influx.FieldType.INTEGER,
     },
     tags: [
+      'service_provider_sid',
       'account_sid'
     ]
   }
@@ -80,87 +83,165 @@ const writeData = async(client) => {
   }
 };
 
-const createCallCountsQuery = ({account_sid, page, page_size, days, start, end}) => {
-  let sql = `SELECT * from call_counts WHERE account_sid = '${account_sid}'`;
-  if (days) sql += `AND time > now() - ${days}d `;
+/* for Service Provider */
+const createCallCountsQuerySP = ({page, page_size, days, start, end}) => {
+  let sql = 'SELECT * from call_counts WHERE service_provider_sid = $service_provider_sid ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    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 ${(page - 1) * page_size}`;
-  //console.log(sql);
+  if (page_size) sql += ' LIMIT $page_size';
+  if (page) sql += ' OFFSET $offset';
   return sql;
 };
 
-const createCallCountsCountQuery = ({account_sid, days, start, end}) => {
-  let sql = `SELECT COUNT(calls_in_progress) from call_counts WHERE account_sid = '${account_sid}' `;
-  if (days) sql += `AND time > now() - ${days}d `;
+const createCallCountsCountQuerySP = ({days, start, end}) => {
+  let sql = 'SELECT COUNT(calls_in_progress) from call_counts WHERE service_provider_sid = $service_provider_sid ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
   }
-  //console.log(sql);
   return sql;
 };
 
-const createCdrQuery = ({account_sid, page, page_size, trunk, direction, answered, 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 (days) sql += `AND time > now() - ${days}d `;
+/* for Account */
+const createCallCountsQuery = ({page, page_size, days, start, end}) => {
+  let sql = 'SELECT * from call_counts WHERE account_sid = $account_sid ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    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 ${(page - 1) * page_size}`;
-  //console.log(sql);
+  if (page_size) sql += ' LIMIT $page_size';
+  if (page) sql += ' OFFSET $offset';
   return sql;
 };
-const createCdrCountQuery = ({account_sid, trunk, direction, answered, 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 (days) sql += `AND time > now() - ${days}d `;
+
+const createCallCountsCountQuery = ({days, start, end}) => {
+  let sql = 'SELECT COUNT(calls_in_progress) from call_counts WHERE account_sid = $account_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 createCdrQuerySP = ({page, page_size, trunk, direction, answered, 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 (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 createCdrCountQuerySP = ({trunk, direction, answered, 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 (days) sql += 'AND time > $timestamp ';
+  else {
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
+  }
+  return sql;
+};
+
+/* for Account */
+const createCdrQuery = ({page, page_size, trunk, direction, answered, 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 (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 createCdrCountQuery = ({trunk, direction, answered, 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 (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
   }
-  //console.log(sql);
   return sql;
 };
 
-const createAlertsQuery = ({account_sid, target_sid, alert_type, page, page_size, days, start, end}) => {
-  let sql = `SELECT * FROM alerts WHERE account_sid = '${account_sid}' `;
-  if (target_sid) sql += `AND target_sid = '${target_sid}' `;
-  if (alert_type) sql += `AND alert_type = '${alert_type}' `;
-  if (days) sql += `AND time > now() - ${days}d `;
+/* for Service Provider */
+const createAlertsQuerySP = ({target_sid, alert_type, page, page_size, days, start, end}) => {
+  let sql = 'SELECT * FROM alerts WHERE service_provider_sid = $service_provider_sid ';
+  if (target_sid) sql += 'AND target_sid = $target_sid ';
+  if (alert_type) sql += 'AND alert_type = $alert_type ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    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 ${(page - 1) * page_size}`;
-  //console.log(sql);
+  if (page_size) sql += ' LIMIT $page_size';
+  if (page) sql += ' OFFSET $offset';
   return sql;
 };
 
-const createAlertsCountQuery = ({account_sid, target_sid, alert_type, days, start, end}) => {
-  let sql = `SELECT COUNT(message) FROM alerts WHERE account_sid = '${account_sid}' `;
-  if (target_sid) sql += `AND target_sid = '${target_sid}' `;
-  if (alert_type) sql += `AND alert_type = '${alert_type}' `;
-  if (days) sql += `AND time > now() - ${days}d `;
+const createAlertsCountQuerySP = ({target_sid, alert_type, days, start, end}) => {
+  let sql = 'SELECT COUNT(message) FROM alerts WHERE service_provider_sid = $service_provider_sid ';
+  if (target_sid) sql += 'AND target_sid = $target_sid ';
+  if (alert_type) sql += 'AND alert_type = $alert_type ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
+  }
+  return sql;
+};
+
+/* for Account */
+const createAlertsQuery = ({target_sid, alert_type, page, page_size, days, start, end}) => {
+  let sql = 'SELECT * FROM alerts WHERE account_sid = $account_sid ';
+  if (target_sid) sql += 'AND target_sid = $target_sid ';
+  if (alert_type) sql += 'AND alert_type = $alert_type ';
+  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 createAlertsCountQuery = ({target_sid, alert_type, days, start, end}) => {
+  let sql = 'SELECT COUNT(message) FROM alerts WHERE account_sid = $account_sid ';
+  if (target_sid) sql += 'AND target_sid = $target_sid ';
+  if (alert_type) sql += 'AND alert_type = $alert_type ';
+  if (days) sql += 'AND time > $timestamp ';
+  else {
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
   }
-  //console.log(sql);
   return sql;
 };
 
@@ -174,11 +255,12 @@ const initDatabase = async(client, dbName) => {
 
 const writeCallCount = async(client, count) => {
   if (!client.locals.initialized) await initDatabase(client, 'call_counts');
-  const {account_sid, ...fields} = count;
+  const {service_provider_sid, account_sid, ...fields} = count;
   const data = {
     measurement: 'call_counts',
     fields,
     tags: {
+      service_provider_sid,
       account_sid
     }
   };
@@ -189,6 +271,41 @@ const writeCallCount = async(client, count) => {
   return;
 };
 
+const queryCallCountsSP = async(client, opts) => {
+  if (!client.locals.initialized) await initDatabase(client, 'call_counts');
+  const response = {
+    total: 0,
+    page_size: opts.page_size,
+    page: opts.page,
+    data: []
+  };
+  const params = generateBindParameters(opts);
+  const sqlTotal = createCallCountsCountQuerySP(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 = createCallCountsQuerySP(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 queryCallCounts = async(client, opts) => {
   if (!client.locals.initialized) await initDatabase(client, 'call_counts');
   const response = {
@@ -197,14 +314,15 @@ const queryCallCounts = async(client, opts) => {
     page: opts.page,
     data: []
   };
+  const params = generateBindParameters(opts);
   const sqlTotal = createCallCountsCountQuery(opts);
-  const obj = await client.queryRaw(sqlTotal);
+  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 = createCallCountsQuery(opts);
-  const res = await client.queryRaw(sql);
+  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];
@@ -227,7 +345,7 @@ const writeCdrs = async(client, cdrs) => {
   if (!client.locals.initialized) await initDatabase(client, 'cdrs');
   cdrs = (Array.isArray(cdrs) ? cdrs : [cdrs])
     .map((cdr) => {
-      const {direction, host, trunk, account_sid, answered, attempted_at, ...fields} = cdr;
+      const {direction, host, trunk, service_provider_sid, account_sid, answered, attempted_at, ...fields} = cdr;
       return {
         measurement: 'cdrs',
         timestamp: new Date(attempted_at),
@@ -236,6 +354,7 @@ const writeCdrs = async(client, cdrs) => {
           direction,
           host,
           trunk,
+          service_provider_sid,
           account_sid,
           answered
         }
@@ -249,6 +368,41 @@ const writeCdrs = async(client, cdrs) => {
   return;
 };
 
+const queryCdrsSP = async(client, opts) => {
+  if (!client.locals.initialized) await initDatabase(client, 'cdrs');
+  const response = {
+    total: 0,
+    page_size: opts.page_size,
+    page: opts.page,
+    data: []
+  };
+  const params = generateBindParameters(opts);
+  const sqlTotal = createCdrCountQuerySP(opts);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
+  //console.log(`sql: ${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 = createCdrQuerySP(opts);
+  const res = await client.queryRaw(sql, { placeholders: params});
+  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) => {
+        const key = 'time' === columns[idx] ? 'attempted_at' : columns[idx];
+        let retvalue = val;
+        if (['answered_at', 'terminated_at'].includes(key)) retvalue = new Date(val);
+        if (key === 'answered') retvalue = 'true' === val ? true : false;
+        obj[key] = retvalue;
+      });
+      return obj;
+    });
+    response.data = data;
+  }
+  return response;
+};
+
 const queryCdrs = async(client, opts) => {
   if (!client.locals.initialized) await initDatabase(client, 'cdrs');
   const response = {
@@ -257,14 +411,15 @@ const queryCdrs = async(client, opts) => {
     page: opts.page,
     data: []
   };
+  const params = generateBindParameters(opts);
   const sqlTotal = createCdrCountQuery(opts);
-  const obj = await client.queryRaw(sqlTotal);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
   //console.log(`sql: ${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 = createCdrQuery(opts);
-  const res = await client.queryRaw(sql);
+  const res = await client.queryRaw(sql, { placeholders: params});
   if (res.results[0].series && res.results[0].series.length) {
     const {columns, values} = res.results[0].series[0];
     const data = values.map((v) => {
@@ -287,7 +442,18 @@ const writeAlerts = async(client, alerts) => {
   if (!client.locals.initialized) await initDatabase(client, 'alerts');
   alerts = (Array.isArray(alerts) ? alerts : [alerts])
     .map((alert) => {
-      const {alert_type, account_sid, target_sid, url, status, vendor, count, detail, timestamp} = alert;
+      const {
+        alert_type,
+        service_provider_sid,
+        account_sid,
+        target_sid,
+        url,
+        status,
+        vendor,
+        count,
+        detail,
+        timestamp
+      } = alert;
       let message = alert.message;
       if (!message) {
         switch (alert_type) {
@@ -337,7 +503,7 @@ 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, account_sid }};
+      const obj = {measurement: 'alerts', fields: fields, tags: { alert_type, service_provider_sid, account_sid }};
       if (timestamp) obj.timestamp = timestamp;
       if (detail) obj.fields.detail = detail;
       return obj;
@@ -350,6 +516,46 @@ const writeAlerts = async(client, alerts) => {
   return;
 };
 
+const generateBindParameters = (opts) => {
+  const params = {...opts};
+  if (opts.days) params.timestamp = Date.now() * 1000000 - opts.days * 24 * 60 * 60 * 1000000000;
+  if (opts.page) params.offset = opts.page  - 1 >= 0 && opts.page_size >= 0 ? (opts.page  - 1) * opts.page_size : 0;
+  if (opts.page_size) params.page_size = parseInt(opts.page_size);
+  return params;
+};
+
+const queryAlertsSP = async(client, opts) => {
+  if (!client.locals.initialized) await initDatabase(client, 'alerts');
+  const response = {
+    total: 0,
+    page_size: opts.page_size,
+    page: opts.page,
+    data: []
+  };
+  const params = generateBindParameters(opts);
+  const sqlTotal = createAlertsCountQuerySP(opts);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
+  //console.log(`query total alerts: ${sqlTotal}: ${JSON.stringify(obj)}`);
+  if (!obj.results || !obj.results[0].series) return response;
+  response.total = obj.results[0].series[0].values[0][1];
+
+  const sql = createAlertsQuerySP(opts);
+  const res = await client.queryRaw(sql, { placeholders: params});
+  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) => {
+        const key = columns[idx];
+        obj[key] = val;
+      });
+      return obj;
+    });
+    response.data = data;
+  }
+  return response;
+};
+
 const queryAlerts = async(client, opts) => {
   if (!client.locals.initialized) await initDatabase(client, 'alerts');
   const response = {
@@ -358,14 +564,15 @@ const queryAlerts = async(client, opts) => {
     page: opts.page,
     data: []
   };
+  const params = generateBindParameters(opts);
   const sqlTotal = createAlertsCountQuery(opts);
-  const obj = await client.queryRaw(sqlTotal);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
   //console.log(`query total alerts: ${sqlTotal}: ${JSON.stringify(obj)}`);
   if (!obj.results || !obj.results[0].series) return response;
   response.total = obj.results[0].series[0].values[0][1];
 
   const sql = createAlertsQuery(opts);
-  const res = await client.queryRaw(sql);
+  const res = await client.queryRaw(sql, { placeholders: params});
   if (res.results[0].series && res.results[0].series.length) {
     const {columns, values} = res.results[0].series[0];
     const data = values.map((v) => {
@@ -423,10 +630,13 @@ module.exports = (logger, opts) => {
   return {
     writeCallCount: writeCallCount.bind(null, callCountClient),
     queryCallCounts: queryCallCounts.bind(null, callCountClient),
+    queryCallCountsSP: queryCallCountsSP.bind(null, callCountClient),
     writeCdrs: writeCdrs.bind(null, cdrClient),
+    queryCdrsSP: queryCdrsSP.bind(null, cdrClient),
     queryCdrs: queryCdrs.bind(null, cdrClient),
     writeAlerts: writeAlerts.bind(null, alertClient),
     queryAlerts: queryAlerts.bind(null, alertClient),
+    queryAlertsSP: queryAlertsSP.bind(null, alertClient),
     AlertType: { ...AlertType }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/time-series",
-  "version": "0.1.10",
+  "version": "0.2.0",
   "description": "write and query data to time series daetabase",
   "main": "index.js",
   "scripts": {
@@ -12,7 +12,7 @@
   "license": "MIT",
   "dependencies": {
     "debug": "^4.3.1",
-    "influx": "^5.8.0"
+    "influx": "^5.9.3"
   },
   "devDependencies": {
     "eslint": "^7.23.0",

package/test/unit-tests.js

@@ -5,10 +5,13 @@ const consoleLogger = {error: console.error, info: console.log, debug: console.l
 const {
   writeCallCount,
   queryCallCounts,
+  queryCallCountsSP,
   writeCdrs,
   queryCdrs,
+  queryCdrsSP,
   writeAlerts,
   queryAlerts,
+  queryAlertsSP,
   AlertType
 } = require('..')(consoleLogger, '127.0.0.1', {commitSize: 1});
 
@@ -27,6 +30,7 @@ test('write timeseries data', async(t) => {
     host: '10.10.100.1',
     remote_host: '10.10.100.8',
     trunk: 'device',
+    service_provider_sid: 'zzzzz',
     account_sid: 'xxxx',
     call_sid: 'foo'
   },
@@ -44,6 +48,7 @@ test('write timeseries data', async(t) => {
     host: '10.10.100.1',
     remote_host: '10.10.100.8',
     trunk: 'twilio',
+    service_provider_sid: 'zzzzz',
     account_sid: 'yyyy',
     call_sid: 'bar'
   }]);
@@ -51,70 +56,85 @@ test('write timeseries data', async(t) => {
 
   result = await queryCdrs({account_sid: 'xxxx', page: 1, page_size:25});
   //npm tesconsole.log(JSON.stringify(result));
-  t.ok(result.data.length === 1, 'queried cdrs')
+  t.ok(result.data.length === 1, 'queried cdrs by account sid')
 
   result = await queryCdrs({account_sid: 'yyyy', trunk: 'twilio', page: 1, page_size:25});
   t.ok(result.data.length === 1, 'queried cdrs by trunk')
 
+  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 writeAlerts([
     {
       alert_type: AlertType.WEBHOOK_STATUS_FAILURE,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       url: 'http://foo.bar',
       status: 404
     },
     {
       alert_type: AlertType.WEBHOOK_CONNECTION_FAILURE,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       url: 'http://foo.bar'
     },
     {
       alert_type: AlertType.WEBHOOK_AUTH_FAILURE,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       url: 'http://foo.bar'
     },
     {
       alert_type: AlertType.INVALID_APP_PAYLOAD,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       target_sid: 'zzzz',
       message: 'invalid app payload'
     },
     {
       alert_type: AlertType.TTS_NOT_PROVISIONED,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       vendor: 'google'
     },
     {
       alert_type: AlertType.STT_NOT_PROVISIONED,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       vendor: 'google'
     },
     {
       alert_type: AlertType.TTS_FAILURE,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       vendor: 'google'
     },
     {
       alert_type: AlertType.STT_FAILURE,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       vendor: 'google'
     },
     {
       alert_type: AlertType.CARRIER_NOT_PROVISIONED,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
     },
     {
       alert_type: AlertType.CALL_LIMIT,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       count: 50,
     },
     {
       alert_type: AlertType.DEVICE_LIMIT,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       count: 250,
     },
     {
       alert_type: AlertType.API_LIMIT,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       count: 120,
     }
@@ -126,24 +146,40 @@ test('write timeseries data', async(t) => {
   t.ok(result.data.length === 12, 'queried alerts');
   t.ok(result.data[0].target_sid === null)
 
+  // Make sure that page, page_size and days support both string and int
+  result = await queryAlerts({account_sid: 'yyyy', page: '1', page_size: '10', days: '7'});
+  t.ok(result.data.length === 10, 'queried alerts');
+
+  result = await queryAlerts({account_sid: 'yyyy', page: '2', page_size: '10', days: '7'});
+  t.ok(result.data.length === 2, 'queried alerts');
+
   result = await queryAlerts({account_sid: 'yyyy', target_sid: 'zzzz', page: 1, page_size: 25, days: 7});
   t.ok(result.data.length === 1, 'queried alerts by target_sid');
   t.ok(result.data[0].target_sid === 'zzzz')
 
+  result = await queryAlertsSP({service_provider_sid: 'zzzzz', page: 1, page_size: 25, days: 7});
+  t.ok(result.data.length === 12, 'queried alerts by service_provider_sid');
+
   result = await writeCallCount(
     {
       calls_in_progress: 49,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy'
     });
   result = await writeCallCount(
     {
       calls_in_progress: 50,
+      service_provider_sid: 'zzzzz',
       account_sid: 'yyyy'
     });
   t.pass('wrote call counts');
 
   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');
+  t.ok(result.data.length === 2, 'queried call counts by account_sid');
+
+  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');
 
 });