Add new getDirectByUserIds method

RocketChat · Jan 5, 2023 · 3cdc0ad · 3cdc0ad
1 parent 94fdaf0
commit 3cdc0ad
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/src/definition/accessors/IRoomRead.ts b/src/definition/accessors/IRoomRead.ts
@@ -62,6 +62,13 @@ export interface IRoomRead {
      */
     getDirectByUsernames(usernames: Array<string>): Promise<IRoom>;
 
+    /**
+     * Gets a direct room with all user ids
+     * @param userIds all user ids belonging to the direct room
+     * @returns the room
+     */
+    getDirectByUserIds(userIds: Array<string>): Promise<IRoom>;
+
     /**
      * Get a list of the moderators of a given room
      *

diff --git a/src/server/accessors/RoomRead.ts b/src/server/accessors/RoomRead.ts
@@ -36,6 +36,10 @@ export class RoomRead implements IRoomRead {
         return this.roomBridge.doGetDirectByUsernames(usernames, this.appId);
     }
 
+    public getDirectByUserIds(userIds: Array<string>): Promise<IRoom> {
+        return this.roomBridge.doGetDirectByUserIds(userIds, this.appId);
+    }
+
     public getModerators(roomId: string): Promise<Array<IUser>> {
         return this.roomBridge.doGetModerators(roomId, this.appId);
     }

diff --git a/src/server/bridges/RoomBridge.ts b/src/server/bridges/RoomBridge.ts
@@ -37,6 +37,12 @@ export abstract class RoomBridge extends BaseBridge {
         }
     }
 
+    public async doGetDirectByUserIds(userIds: Array<string>, appId: string): Promise<IRoom | undefined> {
+        if (this.hasReadPermission(appId)) {
+            return this.getDirectByUserIds(userIds, appId);
+        }
+    }
+
     public async doGetDirectByUsernames(usernames: Array<string>, appId: string): Promise<IRoom | undefined> {
         if (this.hasReadPermission(appId)) {
             return this.getDirectByUsernames(usernames, appId);
@@ -97,6 +103,7 @@ export abstract class RoomBridge extends BaseBridge {
     protected abstract getCreatorById(roomId: string, appId: string): Promise<IUser | undefined>;
     protected abstract getCreatorByName(roomName: string, appId: string): Promise<IUser | undefined>;
     protected abstract getDirectByUsernames(usernames: Array<string>, appId: string): Promise<IRoom | undefined>;
+    protected abstract getDirectByUserIds(userIds: Array<string>, appId: string): Promise<IRoom | undefined>;
     protected abstract getMembers(roomId: string, appId: string): Promise<Array<IUser>>;
     protected abstract update(room: IRoom, members: Array<string>, appId: string): Promise<void>;
     protected abstract createDiscussion(

diff --git a/src/server/rooms/Room.ts b/src/server/rooms/Room.ts
@@ -19,9 +19,6 @@ export class Room implements IRoom {
     public lastModifiedAt?: Date;
     public customFields?: { [key: string]: any };
     public userIds?: Array<string>;
-    // private _USERNAMES: Array<string>;
-
-    // private [PrivateManager]: AppManager;
 
     public constructor(room: IRoom, manager: AppManager) {
         Object.assign(this, room);

diff --git a/tests/server/accessors/RoomRead.spec.ts b/tests/server/accessors/RoomRead.spec.ts
@@ -31,6 +31,9 @@ export class RoomReadAccessorTestFixture {
             doGetCreatorByName(name, appId): Promise<IUser> {
                 return Promise.resolve(theUser);
             },
+            doGetDirectByUserIds(userIds, appId): Promise<IRoom> {
+                return Promise.resolve(theRoom);
+            },
             doGetDirectByUsernames(usernames, appId): Promise<IRoom> {
                 return Promise.resolve(theRoom);
             },
@@ -56,6 +59,8 @@ export class RoomReadAccessorTestFixture {
         Expect(await rr.getCreatorUserByName('testing')).toBe(this.user);
         Expect(await rr.getDirectByUsernames([this.user.username])).toBeDefined();
         Expect(await rr.getDirectByUsernames([this.user.username])).toBe(this.room);
+        Expect(await rr.getDirectByUserIds([this.user.id])).toBeDefined();
+        Expect(await rr.getDirectByUserIds([this.user.id])).toBe(this.room);
     }
 
     @AsyncTest()

diff --git a/tests/test-data/bridges/roomBridge.ts b/tests/test-data/bridges/roomBridge.ts
@@ -28,6 +28,10 @@ export class TestsRoomBridge extends RoomBridge {
         throw new Error('Method not implemented');
     }
 
+    public getDirectByUserIds(userIds: Array<string>, appId: string): Promise<IRoom> {
+        throw new Error('Method not implemented');
+    }
+
     public getMembers(roomName: string, appId: string): Promise<Array<IUser>> {
         throw new Error('Method not implemented.');
     }