[IMPROVE] Replace livechat:queue subscription (#15612)
* Replace livechat:queue subscription * Refactor livechat queue screen * Fix some style stuff. * Rename old class name. * Display the user avatar on the livechat queue list.pull/15940/head
Marcos Spessatto Defendi
6 years ago
committed by
Renato Becker
parent
7b76bf362d
commit
accb833be6
@ -1,3 +0,0 @@ |
||||
import { Mongo } from 'meteor/mongo'; |
||||
|
||||
export const LivechatQueueUser = new Mongo.Collection('livechatQueueUser'); |
||||
@ -0,0 +1,23 @@ |
||||
import { API } from '../../../../api'; |
||||
import { findQueueMetrics } from '../../../server/api/lib/queue'; |
||||
|
||||
API.v1.addRoute('livechat/queue', { authRequired: true }, { |
||||
get() { |
||||
const { offset, count } = this.getPaginationItems(); |
||||
const { sort } = this.parseJsonQuery(); |
||||
const { agentId, includeOfflineAgents, departmentId } = this.requestParams(); |
||||
const users = Promise.await(findQueueMetrics({ |
||||
userId: this.userId, |
||||
agentId, |
||||
includeOfflineAgents: includeOfflineAgents === 'true', |
||||
departmentId, |
||||
pagination: { |
||||
offset, |
||||
count, |
||||
sort, |
||||
}, |
||||
})); |
||||
|
||||
return API.v1.success(users); |
||||
}, |
||||
}); |
||||
@ -0,0 +1,25 @@ |
||||
import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission'; |
||||
import { LivechatRooms } from '../../../../models/server/raw'; |
||||
|
||||
export async function findQueueMetrics({ userId, agentId, includeOfflineAgents, departmentId, pagination: { offset, count, sort } }) { |
||||
if (!await hasPermissionAsync(userId, 'view-l-room')) { |
||||
throw new Error('error-not-authorized'); |
||||
} |
||||
|
||||
const queue = await LivechatRooms.getQueueMetrics({ departmentId, |
||||
agentId, |
||||
includeOfflineAgents, |
||||
options: { |
||||
sort: sort || { chats: 1 }, |
||||
offset, |
||||
count, |
||||
} }); |
||||
const total = (await LivechatRooms.getQueueMetrics({ departmentId, agentId, includeOfflineAgents })).length; |
||||
|
||||
return { |
||||
queue, |
||||
count: queue.length, |
||||
offset, |
||||
total, |
||||
}; |
||||
} |
||||
@ -1,5 +1,14 @@ |
||||
import { BaseRaw } from './BaseRaw'; |
||||
|
||||
export class LivechatDepartmentAgentsRaw extends BaseRaw { |
||||
findUsersInQueue(usersList, options) { |
||||
const query = {}; |
||||
|
||||
if (Array.isArray(usersList) && usersList.length) { |
||||
query.username = { |
||||
$in: usersList, |
||||
}; |
||||
} |
||||
return this.find(query, options); |
||||
} |
||||
} |
||||
|
||||
@ -1,5 +1,97 @@ |
||||
import { BaseRaw } from './BaseRaw'; |
||||
|
||||
export class LivechatRoomsRaw extends BaseRaw { |
||||
|
||||
getQueueMetrics({ departmentId, agentId, includeOfflineAgents, options = {} }) { |
||||
const match = { $match: { t: 'l', open: true, servedBy: { $exists: true } } }; |
||||
const matchUsers = { $match: {} }; |
||||
if (departmentId) { |
||||
match.$match.departmentId = departmentId; |
||||
} |
||||
if (agentId) { |
||||
matchUsers.$match['user._id'] = agentId; |
||||
} |
||||
if (!includeOfflineAgents) { |
||||
matchUsers.$match['user.status'] = { $ne: 'offline' }; |
||||
matchUsers.$match['user.statusLivechat'] = { $eq: 'available' }; |
||||
} |
||||
const departmentsLookup = { |
||||
$lookup: { |
||||
from: 'rocketchat_livechat_department', |
||||
localField: 'departmentId', |
||||
foreignField: '_id', |
||||
as: 'departments', |
||||
}, |
||||
}; |
||||
const departmentsUnwind = { |
||||
$unwind: { |
||||
path: '$departments', |
||||
preserveNullAndEmptyArrays: true, |
||||
}, |
||||
}; |
||||
const departmentsGroup = { |
||||
$group: { |
||||
_id: { |
||||
departmentId: '$departmentId', |
||||
name: '$departments.name', |
||||
room: '$$ROOT', |
||||
}, |
||||
}, |
||||
}; |
||||
const usersLookup = { |
||||
$lookup: { |
||||
from: 'users', |
||||
localField: '_id.room.servedBy._id', |
||||
foreignField: '_id', |
||||
as: 'user', |
||||
}, |
||||
}; |
||||
const usersUnwind = { |
||||
$unwind: { |
||||
path: '$user', |
||||
preserveNullAndEmptyArrays: true, |
||||
}, |
||||
}; |
||||
const usersGroup = { |
||||
$group: { |
||||
_id: { |
||||
userId: '$user._id', |
||||
username: '$user.username', |
||||
status: '$user.status', |
||||
departmentId: '$_id.departmentId', |
||||
departmentName: '$_id.name', |
||||
}, |
||||
chats: { $sum: 1 }, |
||||
}, |
||||
}; |
||||
const project = { |
||||
$project: { |
||||
_id: 0, |
||||
user: { |
||||
_id: '$_id.userId', |
||||
username: '$_id.username', |
||||
status: '$_id.status', |
||||
}, |
||||
department: { |
||||
_id: { $ifNull: ['$_id.departmentId', null] }, |
||||
name: { $ifNull: ['$_id.departmentName', null] }, |
||||
}, |
||||
chats: 1, |
||||
}, |
||||
}; |
||||
const firstParams = [match, departmentsLookup, departmentsUnwind, departmentsGroup, usersLookup, usersUnwind]; |
||||
if (Object.keys(matchUsers.$match)) { |
||||
firstParams.push(matchUsers); |
||||
} |
||||
const params = [...firstParams, usersGroup, project]; |
||||
if (options.offset) { |
||||
params.push({ $skip: options.offset }); |
||||
} |
||||
if (options.count) { |
||||
params.push({ $limit: options.count }); |
||||
} |
||||
if (options.sort) { |
||||
params.push({ $sort: { name: 1 } }); |
||||
} |
||||
return this.col.aggregate(params).toArray(); |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,46 @@ |
||||
import { getCredentials, api, request, credentials } from '../../../data/api-data.js'; |
||||
import { updatePermission, updateSetting } from '../../../data/permissions.helper'; |
||||
|
||||
describe('LIVECHAT - Queue', function() { |
||||
this.retries(0); |
||||
|
||||
before((done) => getCredentials(done)); |
||||
|
||||
before((done) => { |
||||
updateSetting('Livechat_enabled', true).then(done); |
||||
}); |
||||
|
||||
describe('livechat/queue', () => { |
||||
it('should return an "unauthorized error" when the user does not have the necessary permission', (done) => { |
||||
updatePermission('view-l-room', []) |
||||
.then(() => { |
||||
request.get(api('livechat/queue')) |
||||
.set(credentials) |
||||
.expect('Content-Type', 'application/json') |
||||
.expect(400) |
||||
.expect((res) => { |
||||
expect(res.body).to.have.property('success', false); |
||||
expect(res.body.error).to.be.equal('error-not-authorized'); |
||||
}) |
||||
.end(done); |
||||
}); |
||||
}); |
||||
it('should return an array of queued metrics', (done) => { |
||||
updatePermission('view-l-room', ['admin']) |
||||
.then(() => { |
||||
request.get(api('livechat/queue')) |
||||
.set(credentials) |
||||
.expect('Content-Type', 'application/json') |
||||
.expect(200) |
||||
.expect((res) => { |
||||
expect(res.body).to.have.property('success', true); |
||||
expect(res.body.queue).to.be.an('array'); |
||||
expect(res.body).to.have.property('offset'); |
||||
expect(res.body).to.have.property('total'); |
||||
expect(res.body).to.have.property('count'); |
||||
}) |
||||
.end(done); |
||||
}); |
||||
}); |
||||
}); |
||||
}); |
||||
Loading…
Reference in new issue