fix: Room import doesn't honor the specified owner

.changeset/funny-cooks-sneeze.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed room owner specified on room import not being inserted as a room member or owner.

apps/meteor/app/importer/server/classes/ImportDataConverter.ts

@@ -1020,13 +1020,13 @@ export class ImportDataConverter {
 					return;
 				}
 				if (roomData.t === 'p') {
-					const user = await Users.findOneById(startedByUserId);
+					const user = await Users.findOneById(creatorId);
 					if (!user) {
 						throw new Error('importer-channel-invalid-creator');
 					}
-					roomInfo = await createPrivateGroupMethod(user, roomData.name, members, false, {}, {}, true);
+					roomInfo = await createPrivateGroupMethod(user, roomData.name, members, false, {}, {});
 				} else {
-					roomInfo = await createChannelMethod(startedByUserId, roomData.name, members, false, {}, {}, true);
+					roomInfo = await createChannelMethod(creatorId, roomData.name, members, false, {}, {});
 				}
 			}
 

apps/meteor/client/views/admin/rooms/EditRoom.tsx

@@ -182,7 +182,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
 							<Field>
 								<FieldLabel htmlFor={ownerField}>{t('Owner')}</FieldLabel>
 								<FieldRow>
-									<TextInput id={ownerField} readOnly value={room.u?.username} />
+									<TextInput id={ownerField} name='roomOwner' readOnly value={room.u?.username} />
 								</FieldRow>
 							</Field>
 						)}

apps/meteor/tests/e2e/fixtures/files/csv_import_rooms.csv

@@ -0,0 +1,4 @@
+"imported-csv-group","billy.bob","private",""
+"imported-csv-channel","billy.bob","public",""
+"imported-csv-with-members-group","billy.bob","private","billy.bob;billy.joe"
+"imported-csv-with-members-channel","billy.bob","public","billy.bob;billy.joe"

apps/meteor/tests/e2e/fixtures/files/csv_import_users.csv

@@ -0,0 +1,2 @@
+billy.bob, [email protected], Billy Bob Jr.
+billy.joe, [email protected], Billy Joe Jr.

apps/meteor/tests/e2e/fixtures/files/dm_messages.csv

@@ -0,0 +1,2 @@
+"billy.joe","billy.bob","1479162481336","this is a test message"
+"billy.bob","billy.joe","1479162481654","this is another message, a test message"

apps/meteor/tests/e2e/imports.spec.ts

@@ -9,20 +9,66 @@ import { test, expect } from './utils/test';
 
 test.use({ storageState: Users.admin.state });
 
+type csvRoomSpec = {
+	name: string;
+	ownerUsername: string;
+	visibility: 'public' | 'private';
+	members: string;
+};
+
 const rowUserName: string[] = [];
+const csvImportedUsernames: string[] = [];
+const dmMessages: string[] = [];
+const importedRooms: csvRoomSpec[] = [];
 const slackCsvDir = path.resolve(__dirname, 'fixtures', 'files', 'slack_export_users.csv');
+const zipCsvImportDir = path.resolve(__dirname, 'fixtures', 'files', 'csv_import.zip');
+
+// These files have the same content from users.csv, channels.csv and messages1.csv from the zip file
+// They have been extracted just so that we don't need to do that on the fly
+const usersCsvDir = path.resolve(__dirname, 'fixtures', 'files', 'csv_import_users.csv');
+const roomsCsvDir = path.resolve(__dirname, 'fixtures', 'files', 'csv_import_rooms.csv');
+const dmMessagesCsvDir = path.resolve(__dirname, 'fixtures', 'files', 'dm_messages.csv');
 
-const csvToJson = (): void => {
+const usersCsvsToJson = (): void => {
 	fs.createReadStream(slackCsvDir)
 		.pipe(parse({ delimiter: ',', from_line: 2 }))
 		.on('data', (rows) => {
 			rowUserName.push(rows[0]);
 		});
+	fs.createReadStream(usersCsvDir)
+		.pipe(parse({ delimiter: ',' }))
+		.on('data', (rows) => {
+			rowUserName.push(rows[0]);
+			csvImportedUsernames.push(rows[0]);
+		});
+};
+
+const countDmMessages = (): void => {
+	fs.createReadStream(dmMessagesCsvDir)
+		.pipe(parse({ delimiter: ',' }))
+		.on('data', (rows) => {
+			dmMessages.push(rows[3]);
+		});
+};
+
+const roomsCsvToJson = (): void => {
+	fs.createReadStream(roomsCsvDir)
+		.pipe(parse({ delimiter: ',' }))
+		.on('data', (rows) => {
+			importedRooms.push({
+				name: rows[0],
+				ownerUsername: rows[1],
+				visibility: rows[2],
+				members: rows[3],
+			});
+		});
 };
 
 test.describe.serial('imports', () => {
 	test.beforeAll(() => {
-		csvToJson();
+		usersCsvsToJson();
+		roomsCsvToJson();
+		countDmMessages();
 	});
 
 	test('expect import users data from slack', async ({ page }) => {
@@ -43,11 +89,70 @@ test.describe.serial('imports', () => {
 		});
 	});
 
-	test('expect to all users imported are actually listed as users', async ({ page }) => {
+	test('expect import users data from zipped CSV files', async ({ page }) => {
+		const poAdmin: Admin = new Admin(page);
+		await page.goto('/admin/import');
+
+		await poAdmin.btnImportNewFile.click();
+
+		await (await poAdmin.getOptionFileType('CSV')).click();
+
+		await poAdmin.inputFile.setInputFiles(zipCsvImportDir);
+		await poAdmin.btnImport.click();
+
+		await poAdmin.btnStartImport.click();
+
+		await expect(poAdmin.importStatusTableFirstRowCell).toBeVisible({
+			timeout: 30_000,
+		});
+	});
+
+	test('expect all imported users to be actually listed as users', async ({ page }) => {
 		await page.goto('/admin/users');
 
 		for (const user of rowUserName) {
 			expect(page.locator(`tbody tr td:first-child >> text="${user}"`));
 		}
 	});
+
+	test('expect all imported rooms to be actually listed as rooms with correct members count', async ({ page }) => {
+		const poAdmin: Admin = new Admin(page);
+		await page.goto('/admin/rooms');
+
+		for await (const room of importedRooms) {
+			await poAdmin.inputSearchRooms.fill(room.name);
+
+			const expectedMembersCount = room.members.split(';').filter((username) => username !== room.ownerUsername).length + 1;
+			expect(page.locator(`tbody tr td:nth-child(2) >> text="${ expectedMembersCount }"`));
+		}
+	});
+
+	test('expect all imported rooms to have correct room type and owner', async ({ page }) => {
+		const poAdmin: Admin = new Admin(page);
+		await page.goto('/admin/rooms');
+
+		for await (const room of importedRooms) {
+			await poAdmin.inputSearchRooms.fill(room.name);
+			await poAdmin.getRoomRow(room.name).click();
+
+			room.visibility === 'private' ? await expect(poAdmin.privateInput).toBeChecked() : await expect(poAdmin.privateInput).not.toBeChecked();
+			await expect(poAdmin.roomOwnerInput).toHaveValue(room.ownerUsername);
+		}
+	});
+
+	test('expect imported DM to be actually listed as a room with correct members and messages count', async ({ page }) => {
+		const poAdmin: Admin = new Admin(page);
+		await page.goto('/admin/rooms');
+
+		for await (const user of csvImportedUsernames) {
+			await poAdmin.inputSearchRooms.fill(user);
+			expect(page.locator(`tbody tr td:first-child >> text="${user}"`));
+
+			const expectedMembersCount = 2;
+			expect(page.locator(`tbody tr td:nth-child(2) >> text="${ expectedMembersCount }"`));
+
+			const expectedMessagesCount = dmMessages.length;
+			expect(page.locator(`tbody tr td:nth-child(3) >> text="${ expectedMessagesCount }"`));
+		}		
+	});
 });

apps/meteor/tests/e2e/page-objects/admin.ts

@@ -28,10 +28,18 @@ export class Admin {
 		return this.page.locator(`label >> text=Private`);
 	}
 
+	get privateInput(): Locator {
+		return this.page.locator('input[name="roomType"]');
+	}
+
 	get roomNameInput(): Locator {
 		return this.page.locator('input[name="roomName"]');
 	}
 
+	get roomOwnerInput(): Locator {
+		return this.page.locator('input[name="roomOwner"]');
+	}
+
 	get archivedLabel(): Locator {
 		return this.page.locator('label >> text=Archived');
 	}