Convert other indexes to same pattern

RocketChat · Apr 7, 2022 · 049a303 · 049a303
1 parent 8b970c5
commit 049a303
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 52 deletions.
diff --git a/app/models/server/raw/Banners.ts b/app/models/server/raw/Banners.ts
@@ -1,16 +1,12 @@
-import { Collection, Cursor, FindOneOptions, UpdateWriteOpResult, WithoutProjection, InsertOneWriteOpResult } from 'mongodb';
+import { Cursor, FindOneOptions, UpdateWriteOpResult, WithoutProjection, InsertOneWriteOpResult } from 'mongodb';
 
 import { BannerPlatform, IBanner } from '../../../../definition/IBanner';
 import { BaseRaw } from './BaseRaw';
 
 type T = IBanner;
 export class BannersRaw extends BaseRaw<T> {
-	constructor(public readonly col: Collection<T>, trash?: Collection<T>) {
-		super(col, trash);
-
-		this.col.createIndexes([{ key: { platform: 1, startAt: 1, expireAt: 1 } }]);
-
-		this.col.createIndexes([{ key: { platform: 1, startAt: 1, expireAt: 1, active: 1 } }]);
+	protected modelIndexes() {
+		return [{ key: { platform: 1, startAt: 1, expireAt: 1 } }, { key: { platform: 1, startAt: 1, expireAt: 1, active: 1 } }];
 	}
 
 	create(doc: IBanner): Promise<InsertOneWriteOpResult<IBanner>> {

diff --git a/app/models/server/raw/BannersDismiss.ts b/app/models/server/raw/BannersDismiss.ts
@@ -1,13 +1,11 @@
-import { Collection, Cursor, FindOneOptions, WithoutProjection } from 'mongodb';
+import { Cursor, FindOneOptions, WithoutProjection } from 'mongodb';
 
 import { IBannerDismiss } from '../../../../definition/IBanner';
 import { BaseRaw } from './BaseRaw';
 
 export class BannersDismissRaw extends BaseRaw<IBannerDismiss> {
-	constructor(public readonly col: Collection<IBannerDismiss>, trash?: Collection<IBannerDismiss>) {
-		super(col, trash);
-
-		this.col.createIndexes([{ key: { userId: 1, bannerId: 1 } }]);
+	modelIndexes() {
+		return [{ key: { userId: 1, bannerId: 1 } }];
 	}
 
 	findByUserIdAndBannerId(userId: string, bannerIds: string[]): Cursor<IBannerDismiss>;

diff --git a/app/models/server/raw/Nps.ts b/app/models/server/raw/Nps.ts
@@ -1,14 +1,12 @@
-import { UpdateWriteOpResult, Collection } from 'mongodb';
+import { UpdateWriteOpResult } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 import { INps, NPSStatus } from '../../../../definition/INps';
 
 type T = INps;
 export class NpsRaw extends BaseRaw<T> {
-	constructor(public readonly col: Collection<T>, trash?: Collection<T>) {
-		super(col, trash);
-
-		this.col.createIndexes([{ key: { status: 1, expireAt: 1 } }]);
+	modelIndexes() {
+		return [{ key: { status: 1, expireAt: 1 } }];
 	}
 
 	// get expired surveys still in progress

diff --git a/app/models/server/raw/NpsVote.ts b/app/models/server/raw/NpsVote.ts
@@ -1,14 +1,12 @@
-import { ObjectId, Collection, Cursor, FindOneOptions, UpdateWriteOpResult, WithoutProjection } from 'mongodb';
+import { ObjectId, Cursor, FindOneOptions, UpdateWriteOpResult, WithoutProjection } from 'mongodb';
 
 import { INpsVote, INpsVoteStatus } from '../../../../definition/INps';
 import { BaseRaw } from './BaseRaw';
 
 type T = INpsVote;
 export class NpsVoteRaw extends BaseRaw<T> {
-	constructor(public readonly col: Collection<T>, trash?: Collection<T>) {
-		super(col, trash);
-
-		this.col.createIndexes([{ key: { npsId: 1, status: 1, sentAt: 1 } }, { key: { npsId: 1, identifier: 1 } }]);
+	modelIndexes() {
+		return [{ key: { npsId: 1, status: 1, sentAt: 1 } }, { key: { npsId: 1, identifier: 1 } }];
 	}
 
 	findNotSentByNpsId(npsId: string, options?: WithoutProjection<FindOneOptions<T>>): Cursor<T> {

diff --git a/app/models/server/raw/Team.ts b/app/models/server/raw/Team.ts
@@ -1,25 +1,11 @@
-import {
-	Collection,
-	WithoutProjection,
-	FindOneOptions,
-	Cursor,
-	UpdateWriteOpResult,
-	DeleteWriteOpResultObject,
-	FilterQuery,
-} from 'mongodb';
+import { WithoutProjection, FindOneOptions, Cursor, UpdateWriteOpResult, DeleteWriteOpResultObject, FilterQuery } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 import { ITeam, TEAM_TYPE } from '../../../../definition/ITeam';
 
 export class TeamRaw extends BaseRaw<ITeam> {
-	constructor(public readonly col: Collection<ITeam>, trash?: Collection<ITeam>) {
-		super(col, trash);
-
-		this.col.createIndex({ name: 1 }, { unique: true });
-
-		// this.col.createIndexes([
-		// 	{ key: { status: 1, expireAt: 1 } },
-		// ]);
+	protected modelIndexes() {
+		return [{ key: { name: 1 }, unique: true }];
 	}
 
 	findByNames(names: Array<string>): Cursor<ITeam>;

diff --git a/app/models/server/raw/TeamMember.ts b/app/models/server/raw/TeamMember.ts
@@ -1,5 +1,4 @@
 import {
-	Collection,
 	WithoutProjection,
 	FindOneOptions,
 	Cursor,
@@ -15,13 +14,16 @@ import type { IUser, IRole } from '../../../../definition/IUser';
 
 type T = ITeamMember;
 export class TeamMemberRaw extends BaseRaw<T> {
-	constructor(public readonly col: Collection<T>, trash?: Collection<T>) {
-		super(col, trash);
-
-		this.col.createIndexes([{ key: { teamId: 1 } }]);
-
-		// teamId => userId should be unique
-		this.col.createIndex({ teamId: 1, userId: 1 }, { unique: true });
+	protected modelIndexes() {
+		return [
+			{
+				key: { teamId: 1 },
+			},
+			{
+				key: { teamId: 1, userId: 1 },
+				unique: true,
+			},
+		];
 	}
 
 	findByUserId(userId: string): Cursor<ITeamMember>;

diff --git a/app/models/server/raw/WebdavAccounts.ts b/app/models/server/raw/WebdavAccounts.ts
@@ -1,18 +1,16 @@
 /**
  * Webdav Accounts model
  */
-import type { Collection, FindOneOptions, Cursor, DeleteWriteOpResultObject } from 'mongodb';
+import type { FindOneOptions, Cursor, DeleteWriteOpResultObject } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 import { IWebdavAccount } from '../../../../definition/IWebdavAccount';
 
 type T = IWebdavAccount;
 
 export class WebdavAccountsRaw extends BaseRaw<T> {
-	constructor(public readonly col: Collection<T>, trash?: Collection<T>) {
-		super(col, trash);
-
-		this.col.createIndex({ userId: 1 });
+	protected modelIndexes() {
+		return [{ key: { userId: 1 } }];
 	}
 
 	findOneByIdAndUserId(_id: string, userId: string, options: FindOneOptions<T>): Promise<T | null> {