Skip to content

[FIX] Queued Omnichannel webhook being triggered unnecessarily #17661

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
renatobecker merged 2 commits into from
May 17, 2020
Merged

[FIX] Queued Omnichannel webhook being triggered unnecessarily #17661

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24fad34
Fix the Livechat queued webhook.
renatobecker May 15, 2020
1d64052
Merge branch 'develop' into omnichannel/fix-queued-webhook-event
renatobecker May 17, 2020
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: 6 additions & 3 deletions app/livechat/server/lib/QueueManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@ export const QueueManager = {
}

inquiry = await callbacks.run('livechat.beforeRouteChat', inquiry, agent);
if (inquiry.status !== 'ready') {
if (inquiry.status === 'ready') {
return RoutingManager.delegateInquiry(inquiry, agent);
}

if (inquiry.status === 'queued') {
Meteor.defer(() => callbacks.run('livechat.chatQueued', room));
return room;
}

return RoutingManager.delegateInquiry(inquiry, agent);
return room;
},
};
3 changes: 3 additions & 0 deletions app/livechat/server/lib/routing/ManualSelection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Livechat } from '../Livechat';
import { RoutingManager } from '../RoutingManager';
import { sendNotification } from '../../../../lib/server';
import { LivechatRooms, LivechatInquiry, Users } from '../../../../models/server';
import { callbacks } from '../../../../callbacks/server';

/* Manual Selection Queuing Method:
*
Expand Down Expand Up @@ -82,6 +83,8 @@ class ManualSelection {
});
});

Meteor.defer(() => callbacks.run('livechat.chatQueued', room));

return agent;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ callbacks.add('livechat.beforeRouteChat', async (inquiry) => {
dispatchInquiryPosition(inq);
}

checkWaitingQueue(department);
await checkWaitingQueue(department);

return LivechatInquiry.findOneById(_id);
}, callbacks.priority.HIGH, 'livechat-before-routing-chat');
4 changes: 2 additions & 2 deletions ee/app/livechat-enterprise/server/lib/Helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const processWaitingQueue = async (department) => {
await dispatchWaitingQueueStatus(departmentId);
};

export const checkWaitingQueue = (department) => {
export const checkWaitingQueue = async (department) => {
if (!settings.get('Livechat_waiting_queue')) {
return;
}
Expand All @@ -128,7 +128,7 @@ export const checkWaitingQueue = (department) => {
return processWaitingQueue();
}

departments.forEach((department) => processWaitingQueue(department));
return Promise.all(departments.forEach((department) => processWaitingQueue(department)));
};

export const allowAgentSkipQueue = (agent) => {
Expand Down