archiveDepartment

RocketChat · Oct 12, 2023 · 2048242 · 2048242
1 parent 7a0e2fc
commit 2048242
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/apps/meteor/app/livechat/imports/server/rest/departments.ts b/apps/meteor/app/livechat/imports/server/rest/departments.ts
@@ -17,6 +17,7 @@ import {
 } from '../../../server/api/lib/departments';
 import { DepartmentHelper } from '../../../server/lib/Departments';
 import { Livechat } from '../../../server/lib/Livechat';
+import { Livechat as LivechatTs } from '../../../server/lib/LivechatTyped';
 
 API.v1.addRoute(
 	'livechat/department',
@@ -192,7 +193,7 @@ API.v1.addRoute(
 	},
 	{
 		async post() {
-			await Livechat.archiveDepartment(this.urlParams._id);
+			await LivechatTs.archiveDepartment(this.urlParams._id);
 
 			return API.v1.success();
 		},

diff --git a/apps/meteor/app/livechat/server/lib/Livechat.js b/apps/meteor/app/livechat/server/lib/Livechat.js
@@ -733,24 +733,6 @@ export const Livechat = {
 		return LivechatDepartmentRaw.unarchiveDepartment(_id);
 	},
 
-	async archiveDepartment(_id) {
-		check(_id, String);
-
-		const department = await LivechatDepartmentRaw.findOneById(_id, { projection: { _id: 1 } });
-
-		if (!department) {
-			throw new Meteor.Error('department-not-found', 'Department not found', {
-				method: 'livechat:removeDepartment',
-			});
-		}
-
-		await LivechatDepartmentAgents.disableAgentsByDepartmentId(_id);
-		await LivechatDepartmentRaw.archiveDepartment(_id);
-
-		this.logger.debug({ msg: 'Running livechat.afterDepartmentArchived callback for department:', departmentId: _id });
-		await callbacks.run('livechat.afterDepartmentArchived', department);
-	},
-
 	showConnecting() {
 		const { showConnecting } = RoutingManager.getConfig();
 		return showConnecting;

diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -893,6 +893,18 @@ class LivechatClass {
 			sort: { ts: 1 },
 		}).toArray();
 	}
+
+	async archiveDepartment(_id: string) {
+		const department = await LivechatDepartment.findOneById(_id, { projection: { _id: 1 } });
+
+		if (!department) {
+			throw new Error('department-not-found');
+		}
+
+		await Promise.all([LivechatDepartmentAgents.disableAgentsByDepartmentId(_id), LivechatDepartment.archiveDepartment(_id)]);
+
+		await callbacks.run('livechat.afterDepartmentArchived', department);
+	}
 }
 
 export const Livechat = new LivechatClass();
diff --git a/packages/model-typings/src/models/ILivechatDepartmentModel.ts b/packages/model-typings/src/models/ILivechatDepartmentModel.ts
@@ -71,4 +71,6 @@ export interface ILivechatDepartmentModel extends IBaseModel<ILivechatDepartment
 	checkIfMonitorIsMonitoringDepartmentById(monitorId: string, departmentId: string): Promise<boolean>;
 	countArchived(): Promise<number>;
 	findEnabledInIds(departmentsIds: string[], options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
+	archiveDepartment(_id: string): Promise<Document | UpdateResult>;
+	unarchiveDepartment(_id: string): Promise<Document | UpdateResult>;
 }