apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: introduce new methods to fetch rooms on Livechat Bridge (#31538)

Browse Source 
Co-authored-by: Douglas Gubert <1810309+d-gubert@users.noreply.github.com>
pull/32003/head
Luis Mauro 2 years ago committed by GitHub
parent a22223860a
commit 5484c4111b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 60 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      .changeset/tiny-toes-fail.md
  2. 21
      apps/meteor/app/apps/server/bridges/livechat.ts
  3. 2
      apps/meteor/ee/server/services/package.json
  4. 2
      apps/meteor/package.json
  5. 11
      apps/meteor/server/models/raw/LivechatRooms.ts
  6. 2
      ee/apps/ddp-streamer/package.json
  7. 2
      ee/packages/presence/package.json
  8. 2
      packages/apps/package.json
  9. 2
      packages/core-services/package.json
  10. 2
      packages/core-typings/package.json
  11. 2
      packages/fuselage-ui-kit/package.json
  12. 1
      packages/model-typings/src/models/ILivechatRoomsModel.ts
  13. 2
      packages/rest-typings/package.json
  14. 26
      yarn.lock

5
.changeset/tiny-toes-fail.md
Unescape View File

@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---
Introduced new methods for Rocket.Chat Apps to interact with livechat: `findOpenRoomsByAgentId` and `countOpenRoomsByAgentId`

21
apps/meteor/app/apps/server/bridges/livechat.ts
Unescape View File

@ -138,6 +138,27 @@ export class AppLivechatBridge extends LivechatBridge {
return true;
}
protected async findOpenRoomsByAgentId(agentId: string, appId: string): Promise<ILivechatRoom[]> {
this.orch.debugLog(`The App ${appId} is looking for livechat rooms associated with agent ${agentId}`);
if (!agentId) {
throw new Error('Invalid agentId');
}
const rooms = await LivechatRooms.findOpenByAgent(agentId).toArray();
return Promise.all(rooms.map((room) => this.orch.getConverters()?.get('rooms').convertRoom(room) as Promise<ILivechatRoom>));
}
protected async countOpenRoomsByAgentId(agentId: string, appId: string): Promise<number> {
this.orch.debugLog(`The App ${appId} is counting livechat rooms associated with agent ${agentId}`);
if (!agentId) {
throw new Error('Invalid agentId');
}
return LivechatRooms.countOpenByAgent(agentId);
}
protected async findRooms(visitor: IVisitor, departmentId: string | null, appId: string): Promise<Array<ILivechatRoom>> {
this.orch.debugLog(`The App ${appId} is looking for livechat visitors.`);

2
apps/meteor/ee/server/services/package.json
Unescape View File

@ -18,7 +18,7 @@
"author": "Rocket.Chat",
"license": "MIT",
"dependencies": {
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",

2
apps/meteor/package.json
Unescape View File

@ -231,7 +231,7 @@
"@rocket.chat/agenda": "workspace:^",
"@rocket.chat/api-client": "workspace:^",
"@rocket.chat/apps": "workspace:^",
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/base64": "workspace:^",
"@rocket.chat/cas-validate": "workspace:^",
"@rocket.chat/core-services": "workspace:^",

11
apps/meteor/server/models/raw/LivechatRooms.ts
Unescape View File

@ -2264,6 +2264,17 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
);
}
countOpenByAgent(userId: string, extraQuery: Filter<IOmnichannelRoom> = {}) {
const query: Filter<IOmnichannelRoom> = {
't': 'l',
'open': true,
'servedBy._id': userId,
...extraQuery,
};
return this.col.countDocuments(query);
}
findOpenByAgent(userId: string, extraQuery: Filter<IOmnichannelRoom> = {}) {
const query: Filter<IOmnichannelRoom> = {
't': 'l',

2
ee/apps/ddp-streamer/package.json
Unescape View File

@ -15,7 +15,7 @@
],
"author": "Rocket.Chat",
"dependencies": {
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",

2
ee/packages/presence/package.json
Unescape View File

@ -6,7 +6,7 @@
"@babel/core": "~7.22.20",
"@babel/preset-env": "~7.22.20",
"@babel/preset-typescript": "~7.22.15",
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@types/node": "^14.18.63",

2
packages/apps/package.json
Unescape View File

@ -22,7 +22,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "^1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/model-typings": "workspace:^"
}

2
packages/core-services/package.json
Unescape View File

@ -34,7 +34,7 @@
"extends": "../../package.json"
},
"dependencies": {
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/icons": "^0.33.0",
"@rocket.chat/message-parser": "workspace:^",

2
packages/core-typings/package.json
Unescape View File

@ -23,7 +23,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/icons": "^0.33.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~"

2
packages/fuselage-ui-kit/package.json
Unescape View File

@ -61,7 +61,7 @@
"@babel/preset-env": "~7.22.20",
"@babel/preset-react": "~7.22.15",
"@babel/preset-typescript": "~7.22.15",
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.50.1",
"@rocket.chat/fuselage-hooks": "^0.33.0",

1
packages/model-typings/src/models/ILivechatRoomsModel.ts
Unescape View File

@ -230,6 +230,7 @@ export interface ILivechatRoomsModel extends IBaseModel<IOmnichannelRoom> {
data?: { departmentId: string },
): AggregationCursor<Pick<IOmnichannelRoom, 'ts' | 'departmentId' | 'open' | 'servedBy' | 'metrics' | 'msgs' | 'onHold'>>;
findOpenByAgent(userId: string, extraQuery?: Filter<IOmnichannelRoom>): FindCursor<IOmnichannelRoom>;
countOpenByAgent(userId: string, extraQuery?: Filter<IOmnichannelRoom>): Promise<number>;
changeAgentByRoomId(roomId: string, newAgent: { agentId: string; username: string }): Promise<UpdateResult>;
changeDepartmentIdByRoomId(roomId: string, departmentId: string): Promise<UpdateResult>;
saveCRMDataByRoomId(roomId: string, crmData: unknown): Promise<UpdateResult>;

2
packages/rest-typings/package.json
Unescape View File

@ -25,7 +25,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "1.41.0",
"@rocket.chat/apps-engine": "1.42.0-alpha.619",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~",

26
yarn.lock
Unescape View File

@ -8331,9 +8331,9 @@ __metadata:
languageName: unknown
linkType: soft
"@rocket.chat/apps-engine@npm:1.41.0, @rocket.chat/apps-engine@npm:^1.41.0":
version: 1.41.0
resolution: "@rocket.chat/apps-engine@npm:1.41.0"
"@rocket.chat/apps-engine@npm:1.42.0-alpha.619":
version: 1.42.0-alpha.619
resolution: "@rocket.chat/apps-engine@npm:1.42.0-alpha.619"
dependencies:
adm-zip: ^0.5.9
cryptiles: ^4.1.3
@ -8345,7 +8345,7 @@ __metadata:
vm2: ^3.9.19
peerDependencies:
"@rocket.chat/ui-kit": "*"
checksum: 2e7fa2856bdbdc6b0dd2456e9aa5e5804a4198f8df0306a002c5e71681466d3fc2cb0a1253668d5e24fa21345a7dd7eed3458a257e1e4cc59a4e8a3876579aa5
checksum: 9acf0a435ec08bc17089dfe1852487d160a74e94e31fb7d541b3bba11f51bbd2a3c6cf7ca9546174f7f8b2ae82b9558069647e48e0eda4b48d31c8ed9d40aa54
languageName: node
linkType: hard
@ -8353,7 +8353,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/apps@workspace:packages/apps"
dependencies:
"@rocket.chat/apps-engine": ^1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/model-typings": "workspace:^"
"@types/jest": ~29.5.7
@ -8432,7 +8432,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ^0.33.0
@ -8458,7 +8458,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
dependencies:
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ^0.33.0
"@rocket.chat/message-parser": "workspace:^"
@ -8535,7 +8535,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
dependencies:
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/emitter": ~0.31.25
@ -8730,7 +8730,7 @@ __metadata:
"@babel/preset-env": ~7.22.20
"@babel/preset-react": ~7.22.15
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": ^0.50.1
"@rocket.chat/fuselage-hooks": ^0.33.0
@ -9166,7 +9166,7 @@ __metadata:
"@rocket.chat/agenda": "workspace:^"
"@rocket.chat/api-client": "workspace:^"
"@rocket.chat/apps": "workspace:^"
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/base64": "workspace:^"
"@rocket.chat/cas-validate": "workspace:^"
"@rocket.chat/core-services": "workspace:^"
@ -9788,7 +9788,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
@ -9903,7 +9903,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
dependencies:
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/message-parser": "workspace:^"
@ -36180,7 +36180,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
dependencies:
"@rocket.chat/apps-engine": 1.41.0
"@rocket.chat/apps-engine": 1.42.0-alpha.619
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/emitter": ~0.31.25

Write Preview
Loading…
Cancel
Save