admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

4745 move common logic between messaging and calendar in packagestwenty serversrcmodulesconnected account (#4962)

Browse Source 
Closes #4745
This commit is contained in:
bosiraphael
2024-04-15 18:10:12 +02:00
committed by GitHub
parent d7d9f0c16b
commit 691454ef3b
20 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module.ts
View File

@ -1,16 +0,0 @@
import { Module } from '@nestjs/common';
import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
@Module({
imports: [
WorkspaceDataSourceModule,
ObjectMetadataRepositoryModule.forFeature([PersonObjectMetadata]),
],
providers: [AddPersonIdAndWorkspaceMemberIdService],
exports: [AddPersonIdAndWorkspaceMemberIdService],
})
export class AddPersonIdAndWorkspaceMemberIdModule {}

90
packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service.ts
View File

@ -1,90 +0,0 @@
import { Injectable } from '@nestjs/common';
import { EntityManager } from 'typeorm';
import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
import { PersonRepository } from 'src/modules/person/repositories/person.repository';
import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
@Injectable()
export class AddPersonIdAndWorkspaceMemberIdService {
constructor(
private readonly workspaceDataSourceService: WorkspaceDataSourceService,
@InjectObjectMetadataRepository(PersonObjectMetadata)
private readonly personRepository: PersonRepository,
) {}
private async getEmailPersonIdMap(
handles: string[],
workspaceId: string,
transactionManager?: EntityManager,
): Promise<Map<string, string>> {
const personIds = await this.personRepository.getByEmails(
handles,
workspaceId,
transactionManager,
);
return new Map(personIds.map((person) => [person.email, person.id]));
}
private async getEmailWorkspaceMemberIdMap(
handles: string[],
workspaceId: string,
transactionManager?: EntityManager,
): Promise<Map<string, string>> {
const dataSourceSchema =
this.workspaceDataSourceService.getSchemaName(workspaceId);
const workspaceMemberIds: {
id: string;
email: string;
}[] = await this.workspaceDataSourceService.executeRawQuery(
`SELECT "workspaceMember"."id", "connectedAccount"."handle" AS email FROM ${dataSourceSchema}."workspaceMember"
JOIN ${dataSourceSchema}."connectedAccount" ON ${dataSourceSchema}."workspaceMember"."id" = ${dataSourceSchema}."connectedAccount"."accountOwnerId"
WHERE ${dataSourceSchema}."connectedAccount"."handle" = ANY($1)`,
[handles],
workspaceId,
transactionManager,
);
return new Map(
workspaceMemberIds.map((workspaceMember) => [
workspaceMember.email,
workspaceMember.id,
]),
);
}
public async addPersonIdAndWorkspaceMemberId<T extends { handle: string }>(
objects: T[],
workspaceId: string,
transactionManager?: EntityManager,
): Promise<
(T & {
personId: string | null;
workspaceMemberId: string | null;
})[]
> {
const handles = objects.map((object) => object.handle);
const personIdMap = await this.getEmailPersonIdMap(
handles,
workspaceId,
transactionManager,
);
const workspaceMemberIdMap = await this.getEmailWorkspaceMemberIdMap(
handles,
workspaceId,
transactionManager,
);
return objects.map((object) => ({
...object,
personId: personIdMap.get(object.handle) || null,
workspaceMemberId: workspaceMemberIdMap.get(object.handle) || null,
}));
}
}