chore: optimize getRoomsWithSingleOwner to stop cursor iteration after assigning new owner (RocketChat#37292)

abhinavkrin · web-flow · commit e14f95585f7f · 2025-11-03T17:57:35.000Z
diff --git a/apps/meteor/app/lib/server/functions/getRoomsWithSingleOwner.ts b/apps/meteor/app/lib/server/functions/getRoomsWithSingleOwner.ts
@@ -51,7 +51,7 @@ export async function getSubscribedRoomsForUserWithDetails(
 					u: { _id: uid },
 				} of subscribersCursor) {
 					// If we already changed the owner or this subscription is for the user we are removing, then don't try to give it ownership
-					if (roomData.shouldChangeOwner || uid === userId) {
+					if (uid === userId) {
 						continue;
 					}
 					const newOwner = await Users.findOneActiveById(uid, { projection: { _id: 1 } });
@@ -61,6 +61,7 @@ export async function getSubscribedRoomsForUserWithDetails(
 
 					roomData.newOwner = uid;
 					roomData.shouldChangeOwner = true;
+					break;
 				}
 
 				// If there's no subscriber available to be the new owner and it's not a public room, we can remove it.

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export async function getSubscribedRoomsForUserWithDetails(`
`51`	`51`	`u: { _id: uid },`
`52`	`52`	`} of subscribersCursor) {`
`53`	`53`	`// If we already changed the owner or this subscription is for the user we are removing, then don't try to give it ownership`
`54`		`- if (roomData.shouldChangeOwner \|\| uid === userId) {`
	`54`	`+ if (uid === userId) {`
`55`	`55`	`continue;`
`56`	`56`	`}`
`57`	`57`	`const newOwner = await Users.findOneActiveById(uid, { projection: { _id: 1 } });`
`@@ -61,6 +61,7 @@ export async function getSubscribedRoomsForUserWithDetails(`
`61`	`61`
`62`	`62`	`roomData.newOwner = uid;`
`63`	`63`	`roomData.shouldChangeOwner = true;`
	`64`	`+ break;`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`// If there's no subscriber available to be the new owner and it's not a public room, we can remove it.`