@app-connect/core 1.7.5 → 1.7.8

package/handlers/admin.js

@@ -5,6 +5,8 @@ const oauth = require('../lib/oauth');
 const { RingCentral } = require('../lib/ringcentral');
 const { Connector } = require('../models/dynamo/connectorSchema');
 
+const CALL_AGGREGATION_GROUPS = ["Company", "CompanyNumbers", "Users", "Queues", "IVRs", "IVAs", "SharedLines", "UserGroups", "Sites", "Departments"]
+
 async function validateAdminRole({ rcAccessToken }) {
     const rcExtensionResponse = await axios.get(
         'https://platform.ringcentral.com/restapi/v1.0/account/~/extension/~',
@@ -72,7 +74,7 @@ async function updateServerLoggingSettings({ user, additionalFieldValues }) {
     return {};
 }
 
-async function getAdminReport({ rcAccountId, timezone, timeFrom, timeTo }) {
+async function getAdminReport({ rcAccountId, timezone, timeFrom, timeTo, groupBy }) {
     try {
         if (!process.env.RINGCENTRAL_SERVER || !process.env.RINGCENTRAL_CLIENT_ID || !process.env.RINGCENTRAL_CLIENT_SECRET) {
             return {
@@ -99,29 +101,39 @@ async function getAdminReport({ rcAccountId, timezone, timeFrom, timeTo }) {
             token: { access_token: adminConfig.adminAccessToken, token_type: 'Bearer' },
             timezone,
             timeFrom,
-            timeTo
+            timeTo,
+            groupBy: groupBy == 'undefined' ? CALL_AGGREGATION_GROUPS[0] : groupBy
         });
-        var dataCounter = callsAggregationData.data.records[0].counters;
-        var inboundCallCount = dataCounter.callsByDirection.values.inbound;
-        var outboundCallCount = dataCounter.callsByDirection.values.outbound;
-        var answeredCallCount = dataCounter.callsByResponse.values.answered;
-        // keep 2 decimal places
-        var answeredCallPercentage = inboundCallCount === 0 ? '0%' : `${((answeredCallCount / inboundCallCount) * 100).toFixed(2)}%`;
-
-        var dataTimer = callsAggregationData.data.records[0].timers;
-        // keep 2 decimal places
-        var totalTalkTime = (dataTimer.allCalls.values / 60).toFixed(2);
-        // keep 2 decimal places
-        var averageTalkTime = (totalTalkTime / (inboundCallCount + outboundCallCount)).toFixed(2);
-        return {
-            callLogStats: {
+        var callLogStats = [];
+        var itemKeys = [];
+        for (const record of callsAggregationData.data.records) {
+            if(!record?.info?.name){
+                continue;
+            }
+            itemKeys.push(record.info.name);
+            var dataCounter = record.counters;
+            var inboundCallCount = dataCounter.callsByDirection.values.inbound;
+            var outboundCallCount = dataCounter.callsByDirection.values.outbound;
+            var answeredCallCount = dataCounter.callsByResponse.values.answered;
+            // keep 2 decimal places
+            var answeredCallPercentage = inboundCallCount === 0 ? '0%' : `${((answeredCallCount / inboundCallCount) * 100).toFixed(2)}%`;
+            var totalTalkTime = Number(record.timers.allCalls.values) === 0 ? 0 : Number(record.timers.allCalls.values).toFixed(2);
+            var averageTalkTime = Number(totalTalkTime) === 0 ? 0 : (Number(totalTalkTime) / (inboundCallCount + outboundCallCount)).toFixed(2);
+            callLogStats.push({
+                name: record.info.name,
                 inboundCallCount,
                 outboundCallCount,
                 answeredCallCount,
                 answeredCallPercentage,
                 totalTalkTime,
                 averageTalkTime
-            }
+            });
+        }
+        return {
+            callLogStats,
+            itemKeys,
+            groupedBy: callsAggregationData.data.groupedBy,
+            groupKeys: CALL_AGGREGATION_GROUPS
         };
     } catch (error) {
         console.error(error);

package/handlers/calldown.js

@@ -53,8 +53,41 @@ async function markCalled({ jwtToken, id, lastCallAt }) {
     return { successful: true };
 }
 
+async function update({ jwtToken, id, updateData }) {
+    const unAuthData = jwt.decodeJwt(jwtToken);
+    if (!unAuthData?.id) throw new Error('Unauthorized');
+    
+    // Prepare the update object with only valid fields
+    const allowedFields = ['contactId', 'contactType', 'contactName', 'phoneNumber', 'status', 'scheduledAt', 'lastCallAt', 'note'];
+    const updateObject = {};
+    
+    // Filter and prepare update data
+    Object.keys(updateData).forEach(key => {
+        if (allowedFields.includes(key)) {
+            let value = updateData[key];
+            
+            // Handle date fields
+            if ((key === 'scheduledAt' || key === 'lastCallAt') && value) {
+                value = new Date(value);
+            }
+            
+            updateObject[key] = value;
+        }
+    });
+    
+    // If no valid fields to update, throw error
+    if (Object.keys(updateObject).length === 0) {
+        throw new Error('No valid fields to update');
+    }
+    
+    const [affected] = await CallDownListModel.update(updateObject, { where: { id, userId: unAuthData.id } });
+    if (!affected) throw new Error('Not found');
+    return { successful: true };
+}
+
 exports.schedule = schedule;
 exports.list = list;
 exports.remove = remove;
 exports.markCalled = markCalled;
+exports.update = update;
 

package/handlers/contact.js

@@ -3,8 +3,11 @@ const { UserModel } = require('../models/userModel');
 const errorMessage = require('../lib/generalErrorMessage');
 const connectorRegistry = require('../connector/registry');
 const { Connector } = require('../models/dynamo/connectorSchema');
+const { DebugTracer } = require('../lib/debugTracer');
 
-async function findContact({ platform, userId, phoneNumber, overridingFormat, isExtension }) {
+async function findContact({ platform, userId, phoneNumber, overridingFormat, isExtension, tracer }) {
+    tracer?.trace('handler.findContact:entered', { platform, userId, phoneNumber });
+    
     try {
         let user = await UserModel.findOne({
             where: {
@@ -12,7 +15,10 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
                 platform
             }
         });
+        tracer?.trace('handler.findContact:userFound', { user });
+        
         if (!user || !user.accessToken) {
+            tracer?.trace('handler.findContact:noUser', { userId });
             return {
                 successful: false,
                 returnMessage: {
@@ -26,26 +32,36 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
         let proxyConfig = null;
         if (proxyId) {
             proxyConfig = await Connector.getProxyConfig(proxyId);
+            tracer?.trace('handler.findContact:proxyConfig', { proxyConfig });
         }
         const platformModule = connectorRegistry.getConnector(platform);
         const authType = await platformModule.getAuthType({ proxyId, proxyConfig });
+        tracer?.trace('handler.findContact:authType', { authType });
+        
         let authHeader = '';
         switch (authType) {
             case 'oauth':
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
                 authHeader = `Bearer ${user.accessToken}`;
+                tracer?.trace('handler.findContact:oauthAuth', { authHeader });
                 break;
             case 'apiKey':
                 const basicAuth = platformModule.getBasicAuth({ apiKey: user.accessToken });
                 authHeader = `Basic ${basicAuth}`;
+                tracer?.trace('handler.findContact:apiKeyAuth', {});
                 break;
         }
-        const { successful, matchedContactInfo, returnMessage, extraDataTracking } = await platformModule.findContact({ user, authHeader, phoneNumber, overridingFormat, isExtension, proxyConfig });
+        
+        const { successful, matchedContactInfo, returnMessage, extraDataTracking } = await platformModule.findContact({ user, authHeader, phoneNumber, overridingFormat, isExtension, proxyConfig, tracer });
+        tracer?.trace('handler.findContact:platformFindResult', { successful, matchedContactInfo });
+        
         if (matchedContactInfo != null && matchedContactInfo?.filter(c => !c.isNewContact)?.length > 0) {
+            tracer?.trace('handler.findContact:contactsFound', { count: matchedContactInfo.length });
             return { successful, returnMessage, contact: matchedContactInfo, extraDataTracking };
         }
         else {
+            tracer?.trace('handler.findContact:noContactsMatched', { matchedContactInfo });
             if (returnMessage) {
                 return {
                     successful,
@@ -78,6 +94,8 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
         }
     } catch (e) {
         console.error(`platform: ${platform} \n${e.stack} \n${JSON.stringify(e.response?.data)}`);
+        tracer?.traceError('handler.findContact:error', e, { platform, statusCode: e.response?.status });
+        
         if (e.response?.status === 429) {
             return {
                 successful: false,