Merge pull request #8548 from ever-co/fix/improve-find-projects-by-em…

…ployee [Fix]: Improve find projects by employee
ever-co · Nov 24, 2024 · 9c42e26 · 9c42e26
2 parents 362f188 + 9589518
commit 9c42e26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/contracts/src/organization-projects.model.ts b/packages/contracts/src/organization-projects.model.ts
@@ -84,6 +84,7 @@ export interface IOrganizationProjectsFindInput
 	billingFlat?: boolean;
 	organizationTeamId?: ID;
 	members?: Partial<IOrganizationProjectEmployeeFindInput>;
+	relations?: string[];
 }
 
 export interface IOrganizationProjectCreateInput extends IOrganizationProjectBase, IMemberEntityBased {}

diff --git a/packages/core/src/organization-project/organization-project.service.ts b/packages/core/src/organization-project/organization-project.service.ts
@@ -313,7 +313,7 @@ export class OrganizationProjectService extends TenantAwareCrudService<Organizat
 	 */
 	async findByEmployee(employeeId: ID, input: IOrganizationProjectsFindInput): Promise<IOrganizationProject[]> {
 		const tenantId = RequestContext.currentTenantId() || input.tenantId; // Use the current tenant ID or fallback to input tenantId
-		const { organizationId, organizationContactId, organizationTeamId } = input;
+		const { organizationId, organizationContactId, organizationTeamId, relations = [] } = input;
 
 		// Create a query to fetch organization projects
 		const query = this.typeOrmRepository.createQueryBuilder(this.tableName);
@@ -327,7 +327,8 @@ export class OrganizationProjectService extends TenantAwareCrudService<Organizat
 				public: true,
 				owner: true,
 				taskListType: true
-			}
+			},
+			relations
 		});
 		query.innerJoin(`${query.alias}.members`, 'project_members').leftJoin(`${query.alias}.teams`, 'project_team');
 		query