CR suggestions: Move type out of core package

RocketChat · May 24, 2022 · 3d3d470 · 3d3d470
1 parent c61d590
commit 3d3d470
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/services/voipService.ts b/apps/meteor/ee/app/livechat-enterprise/server/services/voipService.ts
@@ -1,5 +1,6 @@
-import { IRoomClosingInfo, IOmniRoomClosingMessage } from '@rocket.chat/core-typings';
+import { IRoomClosingInfo } from '@rocket.chat/core-typings';
 
+import { IOmniRoomClosingMessage } from '../../../../../server/services/omnichannel-voip/internalTypes';
 import { OmnichannelVoipService } from '../../../../../server/services/omnichannel-voip/service';
 import { overwriteClassOnLicense } from '../../../license/server';
 

diff --git a/apps/meteor/server/services/omnichannel-voip/internalTypes.ts b/apps/meteor/server/services/omnichannel-voip/internalTypes.ts
@@ -1,3 +1,5 @@
+import { IMessage } from '@rocket.chat/core-typings';
+
 export type FindVoipRoomsParams = {
 	agents?: string[];
 	open?: boolean;
@@ -13,3 +15,5 @@ export type FindVoipRoomsParams = {
 		offset?: number;
 	};
 };
+
+export type IOmniRoomClosingMessage = Pick<IMessage, 't' | 'groupable'> & Partial<Pick<IMessage, 'msg'>>;
diff --git a/apps/meteor/server/services/omnichannel-voip/service.ts b/apps/meteor/server/services/omnichannel-voip/service.ts
@@ -7,7 +7,6 @@ import type {
 	IRoomCreationResponse,
 	IUser,
 	ILivechatAgent,
-	IOmniRoomClosingMessage,
 } from '@rocket.chat/core-typings';
 import {
 	ILivechatVisitor,
@@ -28,7 +27,7 @@ import { UsersRaw } from '../../../app/models/server/raw/Users';
 import { VoipRoomsRaw } from '../../../app/models/server/raw/VoipRooms';
 import { PbxEventsRaw } from '../../../app/models/server/raw/PbxEvents';
 import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
-import { FindVoipRoomsParams } from './internalTypes';
+import { FindVoipRoomsParams, IOmniRoomClosingMessage } from './internalTypes';
 import { api } from '../../sdk/api';
 import { calculateOnHoldTimeForRoom } from './helper';
 

diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts
@@ -252,5 +252,3 @@ export type IMessageInbox = IMessage & {
 
 export const isIMessageInbox = (message: IMessage): message is IMessageInbox => 'email' in message;
 export const isVoipMessage = (message: IMessage): message is IVoipMessage => 'voipData' in message;
-
-export type IOmniRoomClosingMessage = Pick<IMessage, 't' | 'groupable'> & Partial<Pick<IMessage, 'msg'>>;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -252,5 +252,3 @@ export type IMessageInbox = IMessage & {

		export const isIMessageInbox = (message: IMessage): message is IMessageInbox => 'email' in message;
		export const isVoipMessage = (message: IMessage): message is IVoipMessage => 'voipData' in message;

		export type IOmniRoomClosingMessage = Pick<IMessage, 't' \| 'groupable'> & Partial<Pick<IMessage, 'msg'>>;