Merge branch 'develop' into new-action-to-publish-releases

RocketChat · Jun 13, 2023 · 34cf790 · 34cf790
2 parents 9d5053b + d34ce15
commit 34cf790
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts
@@ -9,7 +9,7 @@ import {
 } from '@rocket.chat/models';
 import { api } from '@rocket.chat/core-services';
 import type { Document } from 'mongodb';
-import type { ILivechatInquiryRecord, IOmnichannelRoom, IOmnichannelServiceLevelAgreements } from '@rocket.chat/core-typings';
+import type { IOmnichannelRoom, IOmnichannelServiceLevelAgreements, InquiryWithAgentInfo } from '@rocket.chat/core-typings';
 
 import { memoizeDebounce } from './debounceByParams';
 import { settings } from '../../../../../app/settings/server';
@@ -31,12 +31,6 @@ type QueueInfo = {
 	statistics: Document;
 	numberMostRecentChats: number;
 };
-
-type InquiryWithExtraData = Pick<ILivechatInquiryRecord, '_id' | 'rid' | 'name' | 'ts' | 'status' | 'department'> & {
-	position: number;
-	defaultAgent?: { username: string; agentId: string };
-};
-
 export const getMaxNumberSimultaneousChat = async ({ agentId, departmentId }: { agentId?: string; departmentId?: string }) => {
 	if (departmentId) {
 		const department = await LivechatDepartmentRaw.findOneById(departmentId);
@@ -106,10 +100,14 @@ const normalizeQueueInfo = async ({
 	return { spot, message, estimatedWaitTimeSeconds };
 };
 
-export const dispatchInquiryPosition = async (inquiry: InquiryWithExtraData, queueInfo?: QueueInfo) => {
+export const dispatchInquiryPosition = async (inquiry: Omit<InquiryWithAgentInfo, 'v'>, queueInfo?: QueueInfo) => {
 	const { position, department } = inquiry;
+	// Avoid broadcasting if no position was determined
+	if (position === undefined) {
+		return;
+	}
 	const data = await normalizeQueueInfo({ position, queueInfo, department });
-	const propagateInquiryPosition = (inquiry: InquiryWithExtraData) => {
+	const propagateInquiryPosition = (inquiry: Omit<InquiryWithAgentInfo, 'v'>) => {
 		void api.broadcast('omnichannel.room', inquiry.rid, {
 			type: 'queueData',
 			data,
@@ -146,7 +144,7 @@ const dispatchWaitingQueueStatus = async (department?: string) => {
 // but we don't need to notify _each_ change that takes place, just their final position
 export const debouncedDispatchWaitingQueueStatus = memoizeDebounce(dispatchWaitingQueueStatus, 1200);
 
-export const processWaitingQueue = async (department: string | undefined, inquiry: InquiryWithExtraData) => {
+export const processWaitingQueue = async (department: string | undefined, inquiry: InquiryWithAgentInfo) => {
 	const queue = department || 'Public';
 	helperLogger.debug(`Processing items on queue ${queue}`);
 

diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts
@@ -16,6 +16,7 @@ import type {
 	IOmnichannelRoom,
 	IOmnichannelServiceLevelAgreements,
 	LivechatDepartmentDTO,
+	InquiryWithAgentInfo,
 } from '@rocket.chat/core-typings';
 
 import { hasLicense } from '../../../license/server/license';
@@ -386,7 +387,7 @@ const queueWorker: QueueWorker = {
 				return;
 			}
 
-			const result = await processWaitingQueue(queue, nextInquiry);
+			const result = await processWaitingQueue(queue, nextInquiry as InquiryWithAgentInfo);
 
 			if (!result) {
 				await LivechatInquiry.unlock(nextInquiry._id);

diff --git a/packages/core-typings/src/IInquiry.ts b/packages/core-typings/src/IInquiry.ts
@@ -55,3 +55,8 @@ export interface ILivechatInquiryRecord extends IRocketChatRecord {
 	slaId?: string;
 	estimatedWaitingTimeQueue: IOmnichannelServiceLevelAgreements['dueTimeInMinutes'];
 }
+
+export type InquiryWithAgentInfo = Pick<ILivechatInquiryRecord, '_id' | 'rid' | 'name' | 'ts' | 'status' | 'department' | 'v'> & {
+	position?: number;
+	defaultAgent?: { username: string; agentId: string };
+};