fix: ProjectRepository.getPersonalProjectForUser[OrFail] not taking t…

…he type or the role of the user to the project into account (#8676)

packages/cli/src/databases/repositories/project.repository.ts

@@ -9,10 +9,14 @@ export class ProjectRepository extends Repository<Project> {
 	}
 
 	async getPersonalProjectForUser(userId: string) {
-		return await this.findOne({ where: { projectRelations: { userId } } });
+		return await this.findOne({
+			where: { type: 'personal', projectRelations: { userId, role: 'project:personalOwner' } },
+		});
 	}
 
 	async getPersonalProjectForUserOrFail(userId: string) {
-		return await this.findOneOrFail({ where: { projectRelations: { userId } } });
+		return await this.findOneOrFail({
+			where: { type: 'personal', projectRelations: { userId, role: 'project:personalOwner' } },
+		});
 	}
 }

packages/cli/test/integration/database/repositories/project.repository.test.ts

@@ -0,0 +1,116 @@
+import Container from 'typedi';
+import { createOwner } from '../../shared/db/users';
+import * as testDb from '../../shared/testDb';
+import { ProjectRepository } from '@/databases/repositories/project.repository';
+import { EntityNotFoundError } from '@n8n/typeorm';
+import { createProject } from '../../shared/db/projects';
+
+describe('ProjectRepository', () => {
+	beforeAll(async () => {
+		await testDb.init();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['User', 'Workflow', 'Project']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('getPersonalProjectForUser', () => {
+		it('returns the personal project', async () => {
+			//
+			// ARRANGE
+			//
+			const owner = await createOwner();
+			const ownerPersonalProject = await Container.get(ProjectRepository).findOneByOrFail({
+				projectRelations: { userId: owner.id },
+			});
+
+			//
+			// ACT
+			//
+			const personalProject = await Container.get(ProjectRepository).getPersonalProjectForUser(
+				owner.id,
+			);
+
+			//
+			// ASSERT
+			//
+			if (!personalProject) {
+				fail('Expected personalProject to be defined.');
+			}
+			expect(personalProject).toBeDefined();
+			expect(personalProject.id).toBe(ownerPersonalProject.id);
+		});
+
+		it('does not return non personal projects', async () => {
+			//
+			// ARRANGE
+			//
+			const owner = await createOwner();
+			await Container.get(ProjectRepository).delete({});
+			await createProject(owner);
+
+			//
+			// ACT
+			//
+			const personalProject = await Container.get(ProjectRepository).getPersonalProjectForUser(
+				owner.id,
+			);
+
+			//
+			// ASSERT
+			//
+			expect(personalProject).toBeNull();
+		});
+	});
+
+	describe('getPersonalProjectForUserOrFail', () => {
+		it('returns the personal project', async () => {
+			//
+			// ARRANGE
+			//
+			const owner = await createOwner();
+			const ownerPersonalProject = await Container.get(ProjectRepository).findOneByOrFail({
+				projectRelations: { userId: owner.id },
+			});
+
+			//
+			// ACT
+			//
+			const personalProject = await Container.get(
+				ProjectRepository,
+			).getPersonalProjectForUserOrFail(owner.id);
+
+			//
+			// ASSERT
+			//
+			if (!personalProject) {
+				fail('Expected personalProject to be defined.');
+			}
+			expect(personalProject).toBeDefined();
+			expect(personalProject.id).toBe(ownerPersonalProject.id);
+		});
+
+		it('does not return non personal projects', async () => {
+			//
+			// ARRANGE
+			//
+			const owner = await createOwner();
+			await Container.get(ProjectRepository).delete({});
+			await createProject(owner);
+
+			//
+			// ACT
+			//
+			const promise = Container.get(ProjectRepository).getPersonalProjectForUserOrFail(owner.id);
+
+			//
+			// ASSERT
+			//
+			await expect(promise).rejects.toThrowError(EntityNotFoundError);
+		});
+	});
+});

packages/cli/test/integration/shared/db/projects.ts

@@ -0,0 +1,28 @@
+import Container from 'typedi';
+import { ProjectRepository } from '@/databases/repositories/project.repository';
+import type { DeepPartial } from 'ts-essentials';
+import type { Project } from '@/databases/entities/Project';
+import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
+import type { User } from '@/databases/entities/User';
+
+export async function createProject(user: User, project?: DeepPartial<Project>) {
+	const projectRepository = Container.get(ProjectRepository);
+	const projectRelationRepository = Container.get(ProjectRelationRepository);
+
+	const savedProject = await projectRepository.save(
+		projectRepository.create({
+			name: 'project name',
+			type: 'team',
+			...project,
+		}),
+	);
+	await projectRelationRepository.save(
+		projectRelationRepository.create({
+			userId: user.id,
+			projectId: savedProject.id,
+			role: 'project:personalOwner',
+		}),
+	);
+
+	return savedProject;
+}

packages/cli/test/integration/shared/testDb.ts

@@ -93,11 +93,12 @@ const repositories = [
 	'AuthProviderSyncHistory',
 	'Credentials',
 	'EventDestinations',
+	'Execution',
 	'ExecutionData',
 	'ExecutionMetadata',
-	'Execution',
 	'InstalledNodes',
 	'InstalledPackages',
+	'Project',
 	'Role',
 	'Settings',
 	'SharedCredentials',