From 328bc2c40f65a8e3c1b655d184d9bb97ccf8f481 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kevin.aleman@rocket.chat>
Date: Thu, 12 Oct 2023 12:59:53 -0600
Subject: [PATCH] unarchiveDepartment

---
 .../livechat/imports/server/rest/departments.ts  |  7 ++-----
 apps/meteor/app/livechat/server/lib/Livechat.js  | 16 ----------------
 .../app/livechat/server/lib/LivechatTyped.ts     | 12 ++++++++++++
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/apps/meteor/app/livechat/imports/server/rest/departments.ts b/apps/meteor/app/livechat/imports/server/rest/departments.ts
index 01d0b57f7965..095baefaa294 100644
--- a/apps/meteor/app/livechat/imports/server/rest/departments.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/departments.ts
@@ -208,11 +208,8 @@ API.v1.addRoute(
 	},
 	{
 		async post() {
-			if (await Livechat.unarchiveDepartment(this.urlParams._id)) {
-				return API.v1.success();
-			}
-
-			return API.v1.failure();
+			await LivechatTs.unarchiveDepartment(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
index f0f1b15fd88a..e1d6626c7ddb 100644
--- a/apps/meteor/app/livechat/server/lib/Livechat.js
+++ b/apps/meteor/app/livechat/server/lib/Livechat.js
@@ -717,22 +717,6 @@ export const Livechat = {
 		return ret;
 	},
 
-	async unarchiveDepartment(_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',
-			});
-		}
-
-		// TODO: these kind of actions should be on events instead of here
-		await LivechatDepartmentAgents.enableAgentsByDepartmentId(_id);
-		return LivechatDepartmentRaw.unarchiveDepartment(_id);
-	},
-
 	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
index 1932eca1f84d..afb649488300 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -905,6 +905,18 @@ class LivechatClass {
 
 		await callbacks.run('livechat.afterDepartmentArchived', department);
 	}
+
+	async unarchiveDepartment(_id: string) {
+		const department = await LivechatDepartment.findOneById(_id, { projection: { _id: 1 } });
+
+		if (!department) {
+			throw new Meteor.Error('department-not-found');
+		}
+
+		// TODO: these kind of actions should be on events instead of here
+		await Promise.all([LivechatDepartmentAgents.enableAgentsByDepartmentId(_id), LivechatDepartment.unarchiveDepartment(_id)]);
+		return true;
+	}
 }
 
 export const Livechat = new LivechatClass();