diff --git a/apps/meteor/app/livechat/imports/server/rest/messages.js b/apps/meteor/app/livechat/imports/server/rest/messages.js deleted file mode 100644 index 27b9d33b762..00000000000 --- a/apps/meteor/app/livechat/imports/server/rest/messages.js +++ /dev/null @@ -1,31 +0,0 @@ -import { check } from 'meteor/check'; - -import { API } from '../../../../api/server'; -import { findExternalMessages } from '../../../server/api/lib/messages'; - -API.v1.addRoute( - 'livechat/messages.external/:roomId', - { authRequired: true }, - { - get() { - check(this.urlParams, { - roomId: String, - }); - const { offset, count } = this.getPaginationItems(); - const { sort } = this.parseJsonQuery(); - - const departments = Promise.await( - findExternalMessages({ - roomId: this.urlParams.roomId, - pagination: { - offset, - count, - sort, - }, - }), - ); - - return API.v1.success(departments); - }, - }, -); diff --git a/apps/meteor/app/livechat/server/api.js b/apps/meteor/app/livechat/server/api.js index 2b7bdb2671c..9e2902ad30b 100644 --- a/apps/meteor/app/livechat/server/api.js +++ b/apps/meteor/app/livechat/server/api.js @@ -9,7 +9,6 @@ import '../imports/server/rest/rooms.js'; import '../imports/server/rest/appearance.js'; import '../imports/server/rest/triggers.js'; import '../imports/server/rest/integrations.js'; -import '../imports/server/rest/messages.js'; import '../imports/server/rest/visitors.js'; import '../imports/server/rest/visitors.ts'; import '../imports/server/rest/dashboards.js'; diff --git a/apps/meteor/app/livechat/server/api/lib/messages.js b/apps/meteor/app/livechat/server/api/lib/messages.js deleted file mode 100644 index 0260d195a6f..00000000000 --- a/apps/meteor/app/livechat/server/api/lib/messages.js +++ /dev/null @@ -1,20 +0,0 @@ -import { LivechatExternalMessage } from '../../../../models/server/raw'; - -export async function findExternalMessages({ roomId, pagination: { offset, count, sort } }) { - const cursor = await LivechatExternalMessage.findByRoomId(roomId, { - sort: sort || { ts: -1 }, - skip: offset, - limit: count, - }); - - const total = await cursor.count(); - - const messages = await cursor.toArray(); - - return { - messages, - count: messages.length, - offset, - total, - }; -} diff --git a/apps/meteor/app/models/server/index.js b/apps/meteor/app/models/server/index.js index 5a8153afe33..9d31a7a7d4c 100644 --- a/apps/meteor/app/models/server/index.js +++ b/apps/meteor/app/models/server/index.js @@ -12,7 +12,6 @@ import LivechatDepartmentAgents from './models/LivechatDepartmentAgents'; import LivechatRooms from './models/LivechatRooms'; import LivechatVisitors from './models/LivechatVisitors'; import LivechatInquiry from './models/LivechatInquiry'; -import LivechatExternalMessage from './models/LivechatExternalMessages'; import OmnichannelQueue from './models/OmnichannelQueue'; import ImportData from './models/ImportData'; @@ -35,7 +34,6 @@ export { LivechatDepartmentAgents, LivechatRooms, LivechatVisitors, - LivechatExternalMessage, LivechatInquiry, OmnichannelQueue, ImportData, diff --git a/apps/meteor/app/models/server/models/LivechatExternalMessages.js b/apps/meteor/app/models/server/models/LivechatExternalMessages.js deleted file mode 100644 index 4c13f0c233c..00000000000 --- a/apps/meteor/app/models/server/models/LivechatExternalMessages.js +++ /dev/null @@ -1,18 +0,0 @@ -import { Base } from './_Base'; - -export class LivechatExternalMessage extends Base { - constructor() { - super('livechat_external_message'); - - this.tryEnsureIndex({ rid: 1 }); - } - - // FIND - findByRoomId(roomId, sort = { ts: -1 }) { - const query = { rid: roomId }; - - return this.find(query, { sort }); - } -} - -export default new LivechatExternalMessage(); diff --git a/apps/meteor/app/models/server/raw/LivechatExternalMessages.js b/apps/meteor/app/models/server/raw/LivechatExternalMessages.js deleted file mode 100644 index 642bb43d657..00000000000 --- a/apps/meteor/app/models/server/raw/LivechatExternalMessages.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseRaw } from './BaseRaw'; - -export class LivechatExternalMessageRaw extends BaseRaw { - findByRoomId(roomId, options) { - const query = { rid: roomId }; - - return this.find(query, options); - } -} diff --git a/apps/meteor/app/models/server/raw/index.ts b/apps/meteor/app/models/server/raw/index.ts index f7a62d09382..5213d78ffcf 100644 --- a/apps/meteor/app/models/server/raw/index.ts +++ b/apps/meteor/app/models/server/raw/index.ts @@ -24,7 +24,6 @@ import { LivechatBusinessHoursRaw } from './LivechatBusinessHours'; import { LivechatCustomFieldRaw } from './LivechatCustomField'; import { LivechatDepartmentAgentsRaw } from './LivechatDepartmentAgents'; import { LivechatDepartmentRaw } from './LivechatDepartment'; -import { LivechatExternalMessageRaw } from './LivechatExternalMessages'; import { LivechatInquiryRaw } from './LivechatInquiry'; import { LivechatRoomsRaw } from './LivechatRooms'; import { LivechatTriggerRaw } from './LivechatTrigger'; @@ -58,7 +57,6 @@ import LivechatBusinessHoursModel from '../models/LivechatBusinessHours'; import LivechatCustomFieldModel from '../models/LivechatCustomField'; import LivechatDepartmentAgentsModel from '../models/LivechatDepartmentAgents'; import LivechatDepartmentModel from '../models/LivechatDepartment'; -import LivechatExternalMessagesModel from '../models/LivechatExternalMessages'; import LivechatInquiryModel from '../models/LivechatInquiry'; import LivechatRoomsModel from '../models/LivechatRooms'; import LivechatVisitorsModel from '../models/LivechatVisitors'; @@ -85,7 +83,6 @@ export const LivechatDepartmentAgents = new LivechatDepartmentAgentsRaw( ); export const LivechatRooms = new LivechatRoomsRaw(LivechatRoomsModel.model.rawCollection(), trashCollection); export const Messages = new MessagesRaw(MessagesModel.model.rawCollection(), trashCollection); -export const LivechatExternalMessage = new LivechatExternalMessageRaw(LivechatExternalMessagesModel.model.rawCollection(), trashCollection); export const LivechatVisitors = new LivechatVisitorsRaw(LivechatVisitorsModel.model.rawCollection(), trashCollection); export const LivechatInquiry = new LivechatInquiryRaw(LivechatInquiryModel.model.rawCollection(), trashCollection); export const LivechatBusinessHours = new LivechatBusinessHoursRaw(LivechatBusinessHoursModel.model.rawCollection(), trashCollection); diff --git a/apps/meteor/tests/end-to-end/api/livechat/messages.js b/apps/meteor/tests/end-to-end/api/livechat/messages.js deleted file mode 100644 index f748ab1bdf1..00000000000 --- a/apps/meteor/tests/end-to-end/api/livechat/messages.js +++ /dev/null @@ -1,32 +0,0 @@ -import { expect } from 'chai'; - -import { getCredentials, api, request, credentials } from '../../../data/api-data.js'; -import { updateSetting } from '../../../data/permissions.helper'; - -describe('LIVECHAT - messages', function () { - this.retries(0); - - before((done) => getCredentials(done)); - - before((done) => { - updateSetting('Livechat_enabled', true).then(done); - }); - - describe('livechat/messages.external', () => { - it('should return an array of messages', (done) => { - request - .get(api('livechat/messages.external/roomId')) - .set(credentials) - .expect('Content-Type', 'application/json') - .expect(200) - .expect((res) => { - expect(res.body).to.have.property('success', true); - expect(res.body.messages).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); - }); - }); -});