Chore: More Omnichannel tests (#26691)

Co-authored-by: Cauê Felchar <[email protected]>
RocketChat · Aug 26, 2022 · 4344746 · 4344746
1 parent 74ea125
commit 4344746
Show file tree

Hide file tree

Showing 8 changed files with 724 additions and 203 deletions.
diff --git a/apps/meteor/app/lib/server/functions/loadMessageHistory.ts b/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
@@ -11,13 +11,15 @@ export function loadMessageHistory({
 	limit = 20,
 	ls,
 	showThreadMessages = true,
+	offset = 0,
 }: {
 	userId: string;
 	rid: string;
 	end: string;
 	limit: number;
 	ls: string;
 	showThreadMessages: boolean;
+	offset: number;
 }) {
 	const room = Rooms.findOneById(rid, { fields: { sysMes: 1 } });
 
@@ -28,6 +30,7 @@ export function loadMessageHistory({
 			ts: -1,
 		},
 		limit,
+		skip: offset,
 		fields: {},
 	};
 

diff --git a/apps/meteor/app/livechat/server/api/v1/config.js b/apps/meteor/app/livechat/server/api/v1/config.js
@@ -9,34 +9,30 @@ const cachedSettings = mem(settings, { maxAge: 1000, cacheKey: JSON.stringify })
 
 API.v1.addRoute('livechat/config', {
 	async get() {
-		try {
-			check(this.queryParams, {
-				token: Match.Maybe(String),
-				department: Match.Maybe(String),
-				businessUnit: Match.Maybe(String),
-			});
-			const enabled = Livechat.enabled();
-
-			if (!enabled) {
-				return API.v1.success({ config: { enabled: false } });
-			}
-
-			const { token, department, businessUnit } = this.queryParams;
-
-			const config = await cachedSettings({ businessUnit });
-
-			const status = Livechat.online(department);
-			const guest = token && (await Livechat.findGuest(token));
-
-			const room = guest && findOpenRoom(token);
-			const agent = guest && room && room.servedBy && findAgent(room.servedBy._id);
-
-			const extra = await getExtraConfigInfo(room);
-			return API.v1.success({
-				config: { ...config, online: status, guest, room, agent, ...extra },
-			});
-		} catch (e) {
-			return API.v1.failure(e);
+		check(this.queryParams, {
+			token: Match.Maybe(String),
+			department: Match.Maybe(String),
+			businessUnit: Match.Maybe(String),
+		});
+		const enabled = Livechat.enabled();
+
+		if (!enabled) {
+			return API.v1.success({ config: { enabled: false } });
 		}
+
+		const { token, department, businessUnit } = this.queryParams;
+
+		const config = await cachedSettings({ businessUnit });
+
+		const status = Livechat.online(department);
+		const guest = token && (await Livechat.findGuest(token));
+
+		const room = guest && findOpenRoom(token);
+		const agent = guest && room && room.servedBy && findAgent(room.servedBy._id);
+
+		const extra = await getExtraConfigInfo(room);
+		return API.v1.success({
+			config: { ...config, online: status, guest, room, agent, ...extra },
+		});
 	},
 });