changes requested

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

Author: abhinavkrin

apps/meteor/app/lib/server/functions/syncRolePrioritiesForRoomIfRequired.ts

@@ -10,11 +10,9 @@ export const calculateRoomRolePriorityFromRoles = (roles: IRole['_id'][]) => {
 };
 
 const READ_BATCH_SIZE = 1000;
-const WRITE_BATCH_SIZE = 1000;
 
 async function assignRoomRolePrioritiesFromMap(userIdAndroomRolePrioritiesMap: Map<IUser['_id'], IUser['roomRolePriorities']>) {
-	let bulk = Users.col.initializeUnorderedBulkOp();
-	let counter = 0;
+	const bulk = Users.col.initializeUnorderedBulkOp();
 
 	for await (const [userId, roomRolePriorities] of userIdAndroomRolePrioritiesMap.entries()) {
 		userIdAndroomRolePrioritiesMap.delete(userId);
@@ -32,31 +30,19 @@ async function assignRoomRolePrioritiesFromMap(userIdAndroomRolePrioritiesMap: M
 			bulk.find({ _id: userId }).updateOne({
 				$set: updateFields,
 			});
-
-			counter++;
-
-			if (counter >= WRITE_BATCH_SIZE) {
-				// Execute the bulk operation for the current batch
-				await bulk.execute();
-				bulk = Users.col.initializeUnorderedBulkOp();
-				counter = 0;
-			}
 		}
 	}
 
-	// Execute any remaining operations
-	if (counter > 0) {
+	if (bulk.length > 0) {
 		await bulk.execute();
 	}
-
-	return userIdAndroomRolePrioritiesMap;
 }
 
 export const syncRolePrioritiesForRoomIfRequired = async (rid: IRoom['_id']) => {
-	let userIdAndroomRolePrioritiesMap = new Map<IUser['_id'], IUser['roomRolePriorities']>();
+	const userIdAndroomRolePrioritiesMap = new Map<IUser['_id'], IUser['roomRolePriorities']>();
 
 	if (await Rooms.hasCreatedRolePrioritiesForRoom(rid)) {
-		return false;
+		return;
 	}
 
 	const cursor = Subscriptions.find(
@@ -79,15 +65,10 @@ export const syncRolePrioritiesForRoomIfRequired = async (rid: IRoom['_id']) =>
 		const existingPriorities = userIdAndroomRolePrioritiesMap.get(userId) || {};
 		existingPriorities[roomId] = priority;
 		userIdAndroomRolePrioritiesMap.set(userId, existingPriorities);
-
-		if (userIdAndroomRolePrioritiesMap.size >= WRITE_BATCH_SIZE) {
-			userIdAndroomRolePrioritiesMap = await assignRoomRolePrioritiesFromMap(userIdAndroomRolePrioritiesMap);
-		}
 	}
 
 	// Flush any remaining priorities in the map
 	await assignRoomRolePrioritiesFromMap(userIdAndroomRolePrioritiesMap);
 
 	await Rooms.markRolePrioritesCreatedForRoom(rid);
-	return true;
 };

packages/model-typings/src/models/IRoomsModel.ts

@@ -314,5 +314,5 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 	countByBroadcast(options?: CountDocumentsOptions): Promise<number>;
 	countByE2E(options?: CountDocumentsOptions): Promise<number>;
 	markRolePrioritesCreatedForRoom(rid: IRoom['_id']): Promise<UpdateResult>;
-	hasCreatedRolePrioritiesForRoom(rid: IRoom['_id']): Promise<boolean>;
+	hasCreatedRolePrioritiesForRoom(rid: IRoom['_id']): Promise<number>;
 }

packages/model-typings/src/models/IUsersModel.ts

@@ -253,12 +253,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 	removeRoomByRoomIds(rids: string[]): Promise<UpdateResult | Document>;
 	addRoomRolePriorityByUserId(userId: string, rid: string, rolePriority: number): Promise<UpdateResult>;
 	removeRoomRolePriorityByUserId(userId: string, rid: string): Promise<UpdateResult>;
-	assignRoomRolePrioritiesByUserIdPriorityMap(
-		rolePrioritiesMap: Record<string, number>,
-		rid: string,
-	): Promise<{
-		modifiedCount: number;
-	}>;
+	assignRoomRolePrioritiesByUserIdPriorityMap(rolePrioritiesMap: Record<string, number>, rid: string): Promise<number>;
 	unassignRoomRolePrioritiesByRoomId(rid: string): Promise<UpdateResult>;
 	getLoginTokensByUserId(userId: string): FindCursor<ILoginToken>;
 	addPersonalAccessTokenToUser(data: { userId: string; loginTokenObject: IPersonalAccessToken }): Promise<UpdateResult>;

packages/models/src/models/Rooms.ts

@@ -2212,6 +2212,6 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 	}
 
 	async hasCreatedRolePrioritiesForRoom(rid: IRoom['_id']) {
-		return (await this.findOne({ _id: rid, rolePrioritiesCreated: true })) !== null;
+		return this.countDocuments({ _id: rid, rolePrioritiesCreated: true });
 	}
 }

packages/models/src/models/Users.js

@@ -1615,10 +1615,10 @@ export class UsersRaw extends BaseRaw {
 
 		if (bulk.length > 0) {
 			const result = await bulk.execute();
-			return { modifiedCount: result.modifiedCount };
+			return result.modifiedCount;
 		}
 
-		return { modifiedCount: 0 };
+		return 0;
 	}
 
 	unassignRoomRolePrioritiesByRoomId(rid) {

packages/rest-typings/src/v1/rooms.ts

@@ -843,7 +843,7 @@ export type RoomsEndpoints = {
 
 	'/v1/rooms.membersOrderedByRole': {
 		GET: (params: RoomsMembersOrderedByRoleProps) => PaginatedResult<{
-			members: (IUser & { roles: IRole['_id'][] })[];
+			members: (IUser & { roles?: IRole['_id'][] })[];
 		}>;
 	};
 };