refactor: removes removeById from model and renames findActiveEmailIn…

…boxes to findActive
RocketChat · May 28, 2024 · e1bbd83 · e1bbd83
1 parent 7df2f55
commit e1bbd83
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox.ts b/apps/meteor/server/features/EmailInbox/EmailInbox.ts
@@ -18,7 +18,7 @@ export type Inbox = {
 export const inboxes = new Map<string, Inbox>();
 
 export async function configureEmailInboxes(): Promise<void> {
-	const emailInboxesCursor = EmailInbox.findActiveEmailInboxes();
+	const emailInboxesCursor = EmailInbox.findActive();
 
 	logger.info('Clearing old email inbox registrations');
 	for (const { imap } of inboxes.values()) {

diff --git a/apps/meteor/server/models/raw/EmailInbox.ts b/apps/meteor/server/models/raw/EmailInbox.ts
@@ -1,6 +1,6 @@
 import type { IEmailInbox, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { IEmailInboxModel } from '@rocket.chat/model-typings';
-import type { Collection, Db, DeleteResult, FindCursor, IndexDescription, InsertOneResult, ModifyResult, UpdateFilter } from 'mongodb';
+import type { Collection, Db, FindCursor, IndexDescription, InsertOneResult, ModifyResult, UpdateFilter } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -17,10 +17,6 @@ export class EmailInboxRaw extends BaseRaw<IEmailInbox> implements IEmailInboxMo
 		return this.findOneAndUpdate({ _id: id, active: true }, { $set: { active: false } }, { returnDocument: 'after' });
 	}
 
-	async removeById(id: IEmailInbox['_id']): Promise<DeleteResult> {
-		return this.deleteOne({ _id: id });
-	}
-
 	async create(emailInbox: IEmailInbox): Promise<InsertOneResult<IEmailInbox>> {
 		return this.insertOne(emailInbox);
 	}
@@ -29,7 +25,7 @@ export class EmailInboxRaw extends BaseRaw<IEmailInbox> implements IEmailInboxMo
 		return this.findOneAndUpdate({ _id: id }, data, { returnDocument: 'after', projection: { _id: 1 } });
 	}
 
-	findActiveEmailInboxes(): FindCursor<IEmailInbox> {
+	findActive(): FindCursor<IEmailInbox> {
 		return this.find({ active: true });
 	}
 

diff --git a/packages/model-typings/src/models/IEmailInboxModel.ts b/packages/model-typings/src/models/IEmailInboxModel.ts
@@ -1,14 +1,13 @@
 import type { IEmailInbox } from '@rocket.chat/core-typings';
-import type { DeleteResult, FindCursor, InsertOneResult, ModifyResult, UpdateFilter } from 'mongodb';
+import type { FindCursor, InsertOneResult, ModifyResult, UpdateFilter } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
 
 export interface IEmailInboxModel extends IBaseModel<IEmailInbox> {
 	setDisabledById(id: IEmailInbox['_id']): Promise<ModifyResult<IEmailInbox>>;
-	removeById(id: IEmailInbox['_id']): Promise<DeleteResult>;
 	create(emailInbox: Omit<IEmailInbox, '_id'>): Promise<InsertOneResult<IEmailInbox>>;
 	updateById(id: IEmailInbox['_id'], data: UpdateFilter<IEmailInbox>): Promise<ModifyResult<IEmailInbox>>;
-	findActiveEmailInboxes(): FindCursor<IEmailInbox>;
+	findActive(): FindCursor<IEmailInbox>;
 	findByEmail(email: IEmailInbox['email']): Promise<IEmailInbox | null>;
 	findById(id: IEmailInbox['_id']): Promise<IEmailInbox | null>;
 }