From 18258b053e8d3ca0269446f177990c4fd1fad682 Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Thu, 12 May 2022 11:40:05 -0600 Subject: [PATCH] remove old collection files --- apps/meteor/app/models/server/index.js | 2 - .../models/server/models/OmnichannelQueue.js | 9 -- .../app/models/server/raw/OmnichannelQueue.ts | 98 ------------------- apps/meteor/app/models/server/raw/index.ts | 3 - 4 files changed, 112 deletions(-) delete mode 100644 apps/meteor/app/models/server/models/OmnichannelQueue.js delete mode 100644 apps/meteor/app/models/server/raw/OmnichannelQueue.ts diff --git a/apps/meteor/app/models/server/index.js b/apps/meteor/app/models/server/index.js index 24957884d25d..a2d27f7f5656 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 OmnichannelQueue from './models/OmnichannelQueue'; import ImportData from './models/ImportData'; export { AppsLogsModel } from './models/apps-logs-model'; @@ -38,6 +37,5 @@ export { LivechatRooms, LivechatVisitors, LivechatInquiry, - OmnichannelQueue, ImportData, }; diff --git a/apps/meteor/app/models/server/models/OmnichannelQueue.js b/apps/meteor/app/models/server/models/OmnichannelQueue.js deleted file mode 100644 index fb37a83af6d7..000000000000 --- a/apps/meteor/app/models/server/models/OmnichannelQueue.js +++ /dev/null @@ -1,9 +0,0 @@ -import { Base } from './_Base'; - -export class OmnichannelQueue extends Base { - constructor() { - super('omnichannel_queue'); - } -} - -export default new OmnichannelQueue(); diff --git a/apps/meteor/app/models/server/raw/OmnichannelQueue.ts b/apps/meteor/app/models/server/raw/OmnichannelQueue.ts deleted file mode 100644 index ef79f55baca0..000000000000 --- a/apps/meteor/app/models/server/raw/OmnichannelQueue.ts +++ /dev/null @@ -1,98 +0,0 @@ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ -import type { IOmnichannelQueueStatus } from '@rocket.chat/core-typings'; - -import { BaseRaw } from './BaseRaw'; - -const UNIQUE_QUEUE_ID = 'queue'; -export class OmnichannelQueueRaw extends BaseRaw { - initQueue() { - return this.col.updateOne( - { - _id: UNIQUE_QUEUE_ID, - }, - { - $unset: { - stoppedAt: 1, - }, - $set: { - startedAt: new Date(), - locked: false, - }, - }, - { - upsert: true, - }, - ); - } - - stopQueue() { - return this.col.updateOne( - { - _id: UNIQUE_QUEUE_ID, - }, - { - $set: { - stoppedAt: new Date(), - locked: false, - }, - }, - ); - } - - async lockQueue() { - const date = new Date(); - const result = await this.col.findOneAndUpdate( - { - _id: UNIQUE_QUEUE_ID, - $or: [ - { - locked: true, - lockedAt: { - $lte: new Date(date.getTime() - 5000), - }, - }, - { - locked: false, - }, - ], - }, - { - $set: { - locked: true, - // apply 5 secs lock lifetime - lockedAt: new Date(), - }, - }, - { - sort: { - _id: 1, - }, - }, - ); - - return result.value; - } - - async unlockQueue() { - const result = await this.col.findOneAndUpdate( - { - _id: UNIQUE_QUEUE_ID, - }, - { - $set: { - locked: false, - }, - $unset: { - lockedAt: 1, - }, - }, - { - sort: { - _id: 1, - }, - }, - ); - - return result.value; - } -} diff --git a/apps/meteor/app/models/server/raw/index.ts b/apps/meteor/app/models/server/raw/index.ts index 5213d78ffcf3..e65472046bba 100644 --- a/apps/meteor/app/models/server/raw/index.ts +++ b/apps/meteor/app/models/server/raw/index.ts @@ -33,7 +33,6 @@ import { MessagesRaw } from './Messages'; import { NotificationQueueRaw } from './NotificationQueue'; import { OAuthAppsRaw } from './OAuthApps'; import { OEmbedCacheRaw } from './OEmbedCache'; -import { OmnichannelQueueRaw } from './OmnichannelQueue'; import { PermissionsRaw } from './Permissions'; import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred'; import { ReadReceiptsRaw } from './ReadReceipts'; @@ -61,7 +60,6 @@ import LivechatInquiryModel from '../models/LivechatInquiry'; import LivechatRoomsModel from '../models/LivechatRooms'; import LivechatVisitorsModel from '../models/LivechatVisitors'; import MessagesModel from '../models/Messages'; -import OmnichannelQueueModel from '../models/OmnichannelQueue'; import RoomsModel from '../models/Rooms'; import SettingsModel from '../models/Settings'; import SubscriptionsModel from '../models/Subscriptions'; @@ -87,7 +85,6 @@ export const LivechatVisitors = new LivechatVisitorsRaw(LivechatVisitorsModel.mo export const LivechatInquiry = new LivechatInquiryRaw(LivechatInquiryModel.model.rawCollection(), trashCollection); export const LivechatBusinessHours = new LivechatBusinessHoursRaw(LivechatBusinessHoursModel.model.rawCollection(), trashCollection); // export const Roles = new RolesRaw(RolesModel.model.rawCollection(), { Users, Subscriptions }, trashCollection); -export const OmnichannelQueue = new OmnichannelQueueRaw(OmnichannelQueueModel.model.rawCollection(), trashCollection); export const ImportData = new ImportDataRaw(ImportDataModel.model.rawCollection(), trashCollection); const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo;