Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nervous-wombats-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': major
---

Removes deprecated `livechat:saveDepartment` method
1 change: 0 additions & 1 deletion apps/meteor/app/livechat/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import './hooks/saveLastMessageToInquiry';
import './hooks/afterUserActions';
import './hooks/afterAgentRemoved';
import './hooks/afterSaveOmnichannelMessage';
import './methods/saveDepartment';
import './methods/sendMessageLivechat';
import './methods/sendFileLivechatMessage';
import './lib/QueueManager';
Expand Down
51 changes: 0 additions & 51 deletions apps/meteor/app/livechat/server/methods/saveDepartment.ts

This file was deleted.

69 changes: 8 additions & 61 deletions apps/meteor/tests/data/livechat/department.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { ILivechatDepartment, IUser, LivechatDepartmentDTO } from '@rocket.
import { Random } from '@rocket.chat/random';
import { expect } from 'chai';

import { api, credentials, methodCall, request } from '../api-data';
import { api, credentials, request } from '../api-data';
import { createAnAwayAgent, createAnOfflineAgent, createAnOnlineAgent } from './users';
import type { WithRequiredProperty } from './utils';

Expand All @@ -18,14 +18,15 @@ const NewDepartmentData = ((): Partial<ILivechatDepartment> => ({
}))();

export const createDepartment = async (
departmentData: Partial<ILivechatDepartment> = NewDepartmentData,
departmentData?: Partial<ILivechatDepartment>,
agents?: { agentId: string; count?: string; order?: string }[],
): Promise<ILivechatDepartment> => {
const department = { ...NewDepartmentData, ...departmentData };
const response = await request
.post(api('livechat/department'))
.set(credentials)
.send({
department: departmentData,
department,
...(agents && { agents }),
})
.expect(200);
Expand All @@ -43,60 +44,6 @@ const updateDepartment = async (departmentId: string, departmentData: Partial<Li
return response.body.department;
};

export const createDepartmentWithMethod = ({
initialAgents = [],
allowReceiveForwardOffline = false,
fallbackForwardDepartment,
departmentsAllowedToForward,
name,
departmentUnit,
userCredentials = credentials,
departmentId = '',
}: {
initialAgents?: { agentId: string; username: string }[];
allowReceiveForwardOffline?: boolean;
fallbackForwardDepartment?: string;
departmentsAllowedToForward?: string[];
name?: string;
departmentUnit?: { _id?: string };
userCredentials?: Credentials;
departmentId?: string;
} = {}): Promise<ILivechatDepartment> =>
new Promise((resolve, reject) => {
void request
.post(methodCall('livechat:saveDepartment'))
.set(userCredentials)
.send({
message: JSON.stringify({
method: 'livechat:saveDepartment',
params: [
departmentId,
{
enabled: true,
email: faker.internet.email(),
showOnRegistration: true,
showOnOfflineForm: true,
name: name || `new department ${Date.now()}`,
description: 'created from api',
allowReceiveForwardOffline,
fallbackForwardDepartment,
departmentsAllowedToForward,
},
initialAgents,
departmentUnit,
],
id: 'id',
msg: 'method',
}),
})
.end((err: any, res: any) => {
if (err) {
return reject(err);
}
resolve(JSON.parse(res.body.message).result);
});
});

export type OnlineAgent = {
user: WithRequiredProperty<IUser, 'username'>;
credentials: Credentials;
Expand All @@ -105,7 +52,7 @@ export type OnlineAgent = {
export const createDepartmentWithAnOnlineAgent = async (): Promise<{ department: ILivechatDepartment; agent: OnlineAgent }> => {
const { user, credentials } = await createAnOnlineAgent();

const department = await createDepartmentWithMethod();
const department = await createDepartment();

await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true);

Expand Down Expand Up @@ -145,7 +92,7 @@ export const createDepartmentWith2OnlineAgents = async (): Promise<{

export const createDepartmentWithAgent = async (agent: OnlineAgent): Promise<{ department: ILivechatDepartment; agent: OnlineAgent }> => {
const { user, credentials } = agent;
const department = await createDepartmentWithMethod();
const department = await createDepartment();

await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true);

Expand Down Expand Up @@ -192,7 +139,7 @@ export const createDepartmentWithAnOfflineAgent = async ({
}> => {
const { user, credentials } = await createAnOfflineAgent();

const department = (await createDepartmentWithMethod({
const department = (await createDepartment({
allowReceiveForwardOffline,
fallbackForwardDepartment,
departmentsAllowedToForward,
Expand Down Expand Up @@ -226,7 +173,7 @@ export const createDepartmentWithAnAwayAgent = async ({
}> => {
const { user, credentials } = await createAnAwayAgent();

const department = (await createDepartmentWithMethod({
const department = (await createDepartment({
allowReceiveForwardOffline,
fallbackForwardDepartment,
departmentsAllowedToForward,
Expand Down
Loading
Loading