@@ -4,7 +4,7 @@ import type { ILivechatDepartment, IUser, LivechatDepartmentDTO } from '@rocket.
44import { Random } from '@rocket.chat/random' ;
55import { expect } from 'chai' ;
66
7- import { api , credentials , methodCall , request } from '../api-data' ;
7+ import { api , credentials , request } from '../api-data' ;
88import { createAnAwayAgent , createAnOfflineAgent , createAnOnlineAgent } from './users' ;
99import type { WithRequiredProperty } from './utils' ;
1010
@@ -18,14 +18,15 @@ const NewDepartmentData = ((): Partial<ILivechatDepartment> => ({
1818} ) ) ( ) ;
1919
2020export const createDepartment = async (
21- departmentData : Partial < ILivechatDepartment > = NewDepartmentData ,
21+ departmentData ? : Partial < ILivechatDepartment > ,
2222 agents ?: { agentId : string ; count ?: string ; order ?: string } [ ] ,
2323) : Promise < ILivechatDepartment > => {
24+ const department = { ...NewDepartmentData , ...departmentData } ;
2425 const response = await request
2526 . post ( api ( 'livechat/department' ) )
2627 . set ( credentials )
2728 . send ( {
28- department : departmentData ,
29+ department,
2930 ...( agents && { agents } ) ,
3031 } )
3132 . expect ( 200 ) ;
@@ -43,60 +44,6 @@ const updateDepartment = async (departmentId: string, departmentData: Partial<Li
4344 return response . body . department ;
4445} ;
4546
46- export const createDepartmentWithMethod = ( {
47- initialAgents = [ ] ,
48- allowReceiveForwardOffline = false ,
49- fallbackForwardDepartment,
50- departmentsAllowedToForward,
51- name,
52- departmentUnit,
53- userCredentials = credentials ,
54- departmentId = '' ,
55- } : {
56- initialAgents ?: { agentId : string ; username : string } [ ] ;
57- allowReceiveForwardOffline ?: boolean ;
58- fallbackForwardDepartment ?: string ;
59- departmentsAllowedToForward ?: string [ ] ;
60- name ?: string ;
61- departmentUnit ?: { _id ?: string } ;
62- userCredentials ?: Credentials ;
63- departmentId ?: string ;
64- } = { } ) : Promise < ILivechatDepartment > =>
65- new Promise ( ( resolve , reject ) => {
66- void request
67- . post ( methodCall ( 'livechat:saveDepartment' ) )
68- . set ( userCredentials )
69- . send ( {
70- message : JSON . stringify ( {
71- method : 'livechat:saveDepartment' ,
72- params : [
73- departmentId ,
74- {
75- enabled : true ,
76- email : faker . internet . email ( ) ,
77- showOnRegistration : true ,
78- showOnOfflineForm : true ,
79- name : name || `new department ${ Date . now ( ) } ` ,
80- description : 'created from api' ,
81- allowReceiveForwardOffline,
82- fallbackForwardDepartment,
83- departmentsAllowedToForward,
84- } ,
85- initialAgents ,
86- departmentUnit ,
87- ] ,
88- id : 'id' ,
89- msg : 'method' ,
90- } ) ,
91- } )
92- . end ( ( err : any , res : any ) => {
93- if ( err ) {
94- return reject ( err ) ;
95- }
96- resolve ( JSON . parse ( res . body . message ) . result ) ;
97- } ) ;
98- } ) ;
99-
10047export type OnlineAgent = {
10148 user : WithRequiredProperty < IUser , 'username' > ;
10249 credentials : Credentials ;
@@ -105,7 +52,7 @@ export type OnlineAgent = {
10552export const createDepartmentWithAnOnlineAgent = async ( ) : Promise < { department : ILivechatDepartment ; agent : OnlineAgent } > => {
10653 const { user, credentials } = await createAnOnlineAgent ( ) ;
10754
108- const department = await createDepartmentWithMethod ( ) ;
55+ const department = await createDepartment ( ) ;
10956
11057 await addOrRemoveAgentFromDepartment ( department . _id , { agentId : user . _id , username : user . username } , true ) ;
11158
@@ -145,7 +92,7 @@ export const createDepartmentWith2OnlineAgents = async (): Promise<{
14592
14693export const createDepartmentWithAgent = async ( agent : OnlineAgent ) : Promise < { department : ILivechatDepartment ; agent : OnlineAgent } > => {
14794 const { user, credentials } = agent ;
148- const department = await createDepartmentWithMethod ( ) ;
95+ const department = await createDepartment ( ) ;
14996
15097 await addOrRemoveAgentFromDepartment ( department . _id , { agentId : user . _id , username : user . username } , true ) ;
15198
@@ -192,7 +139,7 @@ export const createDepartmentWithAnOfflineAgent = async ({
192139} > => {
193140 const { user, credentials } = await createAnOfflineAgent ( ) ;
194141
195- const department = ( await createDepartmentWithMethod ( {
142+ const department = ( await createDepartment ( {
196143 allowReceiveForwardOffline,
197144 fallbackForwardDepartment,
198145 departmentsAllowedToForward,
@@ -226,7 +173,7 @@ export const createDepartmentWithAnAwayAgent = async ({
226173} > => {
227174 const { user, credentials } = await createAnAwayAgent ( ) ;
228175
229- const department = ( await createDepartmentWithMethod ( {
176+ const department = ( await createDepartment ( {
230177 allowReceiveForwardOffline,
231178 fallbackForwardDepartment,
232179 departmentsAllowedToForward,
0 commit comments