Skip to content

(rcint-8738) edited fields will be turned to default value #1310

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
merged 4 commits into from
Sep 27, 2018
Merged

(rcint-8738) edited fields will be turned to default value #1310

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e0eaac
(rcint-8738) edited fields will be turned to default value
tuluxmu Sep 27, 2018
05b8563
(rcint-8738) edited fields should be turned into default value
tuluxmu Sep 27, 2018
8fdbce0
modify hook function
tuluxmu Sep 27, 2018
dfde61f
(rcint-8738) edited field will be turned to default value
tuluxmu Sep 27, 2018
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
34 changes: 23 additions & 11 deletions packages/ringcentral-integration/modules/CallLogger/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ export default class CallLogger extends LoggerBase {
getDataReducer,
identityFunction: callIdentityFunction,
});
this._storage = this::ensureExist(storage, 'storage');
this._callMonitor = this::ensureExist(callMonitor, 'callMonitor');
this._contactMatcher = this::ensureExist(contactMatcher, 'contactMatcher');
this._activityMatcher = this::ensureExist(activityMatcher, 'activityMatcher');
this._storage = this:: ensureExist(storage, 'storage');
this._callMonitor = this:: ensureExist(callMonitor, 'callMonitor');
this._contactMatcher = this:: ensureExist(contactMatcher, 'contactMatcher');
this._activityMatcher = this:: ensureExist(activityMatcher, 'activityMatcher');
this._callHistory = callHistory;
this._tabManager = tabManager;
this._storageKey = `${this._name}Data`;
Expand All @@ -77,6 +77,7 @@ export default class CallLogger extends LoggerBase {

this._lastProcessedCalls = null;
this._lastProcessedEndedCalls = null;
this._customMatcherHooks = [];
}

_onReset() {
Expand Down Expand Up @@ -142,7 +143,7 @@ export default class CallLogger extends LoggerBase {
...options,
call: {
...call,
duration: call::Object.prototype.hasOwnProperty('duration') ?
duration: call:: Object.prototype.hasOwnProperty('duration') ?
call.duration :
Math.round((Date.now() - call.startTime) / 1000),
result: call.result || call.telephonyStatus,
Expand All @@ -155,7 +156,7 @@ export default class CallLogger extends LoggerBase {
await this.log({
call: {
...call,
duration: call::Object.prototype.hasOwnProperty('duration') ?
duration: call:: Object.prototype.hasOwnProperty('duration') ?
call.duration :
Math.round((Date.now() - call.startTime) / 1000),
result: call.result || call.telephonyStatus,
Expand All @@ -165,13 +166,25 @@ export default class CallLogger extends LoggerBase {
triggerType
});
}
_activityMatcherCheck(sessionId) {
return (
!this._activityMatcher.dataMapping[sessionId] ||
!this._activityMatcher.dataMapping[sessionId].length
);
}
_customMatcherCheck(sessionId) {
return this._customMatcherHooks.some(hook => hook(sessionId));
}
addCustomMatcherHook(hook) {
this._customMatcherHooks.push(hook);
}
async _onNewCall(call, triggerType) {
if (await this._shouldLogNewCall(call)) {
// RCINT-3857 check activity in case instance was reloaded when call is still active
await this._activityMatcher.triggerMatch();
if (
!this._activityMatcher.dataMapping[call.sessionId] ||
!this._activityMatcher.dataMapping[call.sessionId].length
this._activityMatcherCheck(call.sessionId) &&
this._customMatcherCheck(call.sessionId)
) {
// is completely new, need entity information
await this._contactMatcher.triggerMatch();
Expand Down Expand Up @@ -207,8 +220,8 @@ export default class CallLogger extends LoggerBase {
});
} else {
// only update call information if call has been logged
await this._autoLogCall({
call,
await this._autoLogCall({
call,
triggerType
});
}
Expand Down Expand Up @@ -240,7 +253,6 @@ export default class CallLogger extends LoggerBase {

removeDuplicateSelfCalls(this._lastProcessedCalls).forEach((call) => {
const oldCallIndex = oldCalls.findIndex(item => item.sessionId === call.sessionId);

if (oldCallIndex === -1) {
this._onNewCall(call, callLoggerTriggerTypes.presenceUpdate);
} else {
Expand Down