Skip to content

Regression: Remove symbols from number before storing PBX event #26969

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
tassoevan merged 2 commits into from
Sep 29, 2022
Merged

Regression: Remove symbols from number before storing PBX event #26969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02c2c0b
Remove symbols from number b4 storing pbx event. Update query to supp…
KevLehman Sep 28, 2022
9d0522d
Merge branch 'develop' into regression/symbols-on-pbx-event-number
tassoevan Sep 29, 2022
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
9 changes: 8 additions & 1 deletion apps/meteor/server/services/omnichannel-voip/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,16 @@ export class OmnichannelVoipService extends ServiceClassInternal implements IOmn
*/

// Use latest queue caller join event
const numericPhone = guest?.phone?.[0]?.phoneNumber.replace(/\D/g, '');
const callStartPbxEvent = await PbxEvents.findOne(
{
phone: guest?.phone?.[0]?.phoneNumber,
$or: [
{
phone: numericPhone, // Incoming calls will have phone number (connectedlinenum) without any symbol
},
{ phone: `*${numericPhone}` }, // Outgoing calls will have phone number (connectedlinenum) with * prefix
{ phone: `+${numericPhone}` }, // Just in case
],
event: {
$in: ['QueueCallerJoin', 'DialEnd', 'DialState'],
},
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/server/services/voip/connector/asterisk/ami/ContinuousMonitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export class ContinuousMonitor extends Command {
return;
}

if (event.dialstatus.toLowerCase() !== 'answer' && event.dialstatus.toLowerCase() !== 'ringing') {
if (!['answer', 'ringing'].includes(event.dialstatus.toLowerCase())) {
this.logger.warn(`Received unexpected event ${event.event} dialstatus = ${event.dialstatus}`);
return;
}
Expand All @@ -283,7 +283,7 @@ export class ContinuousMonitor extends Command {
uniqueId: `${event.event}-${event.calleridnum}-${event.channel}-${event.destchannel}-${event.uniqueid}`,
event: event.event,
ts: new Date(),
phone: event?.connectedlinenum,
phone: event?.connectedlinenum.replace(/\D/g, ''), // Remove all non-numeric characters
callUniqueId: event.uniqueid,
callUniqueIdFallback: event.linkedid,
agentExtension: event.calleridnum,
Expand Down