4745 move common logic between messaging and calendar in packagestwen…

…ty serversrcmodulesconnected account (#4962) Closes #4745
twentyhq · Apr 15, 2024 · 691454e · 691454e
1 parent d7d9f0c
commit 691454e
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 19 deletions.
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/jobs.module.ts b/packages/twenty-server/src/engine/integrations/message-queue/jobs.module.ts
@@ -27,6 +27,8 @@ import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadat
 import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { CleanInactiveWorkspaceJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job';
+import { MatchParticipantJob } from 'src/modules/calendar-messaging-participant/jobs/match-participant.job';
+import { UnmatchParticipantJob } from 'src/modules/calendar-messaging-participant/jobs/unmatch-participant.job';
 import { GoogleCalendarSyncCronJob } from 'src/modules/calendar/crons/jobs/google-calendar-sync.cron.job';
 import { CalendarCreateCompanyAndContactAfterSyncJob } from 'src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job';
 import { DeleteConnectedAccountAssociatedCalendarDataJob } from 'src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job';
@@ -36,8 +38,6 @@ import { CalendarEventParticipantModule } from 'src/modules/calendar/services/ca
 import { GoogleCalendarSyncModule } from 'src/modules/calendar/services/google-calendar-sync.module';
 import { AutoCompaniesAndContactsCreationModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module';
 import { CreateCompanyAndContactJob } from 'src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job';
-import { MatchParticipantJob } from 'src/modules/connected-account/jobs/match-participant.job';
-import { UnmatchParticipantJob } from 'src/modules/connected-account/jobs/unmatch-participant.job';
 import { GoogleAPIRefreshAccessTokenModule } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module';
 import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
 import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';

diff --git a/...ted-account/jobs/match-participant.job.ts → ...participant/jobs/match-participant.job.ts b/...ted-account/jobs/match-participant.job.ts → ...participant/jobs/match-participant.job.ts
diff --git a/...d-account/jobs/unmatch-participant.job.ts → ...rticipant/jobs/unmatch-participant.job.ts b/...d-account/jobs/unmatch-participant.job.ts → ...rticipant/jobs/unmatch-participant.job.ts
diff --git a/.../listeners/participant-person.listener.ts → .../listeners/participant-person.listener.ts b/.../listeners/participant-person.listener.ts → .../listeners/participant-person.listener.ts
@@ -7,13 +7,13 @@ import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperti
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import {
-  MatchParticipantJob,
   MatchParticipantJobData,
-} from 'src/modules/connected-account/jobs/match-participant.job';
+  MatchParticipantJob,
+} from 'src/modules/calendar-messaging-participant/jobs/match-participant.job';
 import {
   UnmatchParticipantJobData,
   UnmatchParticipantJob,
-} from 'src/modules/connected-account/jobs/unmatch-participant.job';
+} from 'src/modules/calendar-messaging-participant/jobs/unmatch-participant.job';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 
 @Injectable()

diff --git a/.../participant-workspace-member.listener.ts → .../participant-workspace-member.listener.ts b/.../participant-workspace-member.listener.ts → .../participant-workspace-member.listener.ts
@@ -7,13 +7,13 @@ import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperti
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import {
-  MatchParticipantJob,
   MatchParticipantJobData,
-} from 'src/modules/connected-account/jobs/match-participant.job';
+  MatchParticipantJob,
+} from 'src/modules/calendar-messaging-participant/jobs/match-participant.job';
 import {
   UnmatchParticipantJobData,
   UnmatchParticipantJob,
-} from 'src/modules/connected-account/jobs/unmatch-participant.job';
+} from 'src/modules/calendar-messaging-participant/jobs/unmatch-participant.job';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
 
 @Injectable()

diff --git a/...rson-id-and-workspace-member-id.module.ts → ...rson-id-and-workspace-member-id.module.ts b/...rson-id-and-workspace-member-id.module.ts → ...rson-id-and-workspace-member-id.module.ts
@@ -2,7 +2,7 @@ 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 { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/calendar-messaging-participant/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({

diff --git a/...son-id-and-workspace-member-id.service.ts → ...son-id-and-workspace-member-id.service.ts b/...son-id-and-workspace-member-id.service.ts → ...son-id-and-workspace-member-id.service.ts
diff --git a/...get-company-name-from-domain-name.util.ts → ...get-company-name-from-domain-name.util.ts b/...get-company-name-from-domain-name.util.ts → ...get-company-name-from-domain-name.util.ts
diff --git a/...utils/get-domain-name-from-handle.util.ts → ...utils/get-domain-name-from-handle.util.ts b/...utils/get-domain-name-from-handle.util.ts → ...utils/get-domain-name-from-handle.util.ts
diff --git a/...name-from-handle-and-display-name.util.ts → ...name-from-handle-and-display-name.util.ts b/...name-from-handle-and-display-name.util.ts → ...name-from-handle-and-display-name.util.ts
diff --git a/...es/twenty-server/src/modules/calendar-messaging-participant/utils/is-person-email.util.ts b/...es/twenty-server/src/modules/calendar-messaging-participant/utils/is-person-email.util.ts
@@ -0,0 +1,8 @@
+export const isPersonEmail = (email: string | undefined): boolean => {
+  if (!email) return false;
+
+  const nonPersonalPattern =
+    /noreply|no-reply|do_not_reply|no\.reply|^(accounts@|info@|admin@|contact@|hello@|support@|sales@|feedback@|service@|help@|mailer-daemon|notifications?|digest|auto|apps|assign|comments|customer-success|enterprise|esign|express|forum|gc@|learn|mailer|marketing|messages|news|notification|payments|receipts|recrutement|security|service|support|team)/;
+
+  return !nonPersonalPattern.test(email);
+};
diff --git a/...modules/calendar/services/calendar-event-participant/calendar-event-participant.module.ts b/...modules/calendar/services/calendar-event-participant/calendar-event-participant.module.ts
@@ -2,8 +2,8 @@ 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 { AddPersonIdAndWorkspaceMemberIdModule } from 'src/modules/calendar-messaging-participant/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module';
 import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
-import { AddPersonIdAndWorkspaceMemberIdModule } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 
 @Module({

diff --git a/...odules/calendar/services/calendar-event-participant/calendar-event-participant.service.ts b/...odules/calendar/services/calendar-event-participant/calendar-event-participant.service.ts
@@ -8,9 +8,9 @@ import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
 import { CalendarEventParticipant } from 'src/modules/calendar/types/calendar-event';
-import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
 import { CalendarEventParticipantRepository } from 'src/modules/calendar/repositories/calendar-event-participant.repository';
 import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/calendar-messaging-participant/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
 
 @Injectable()
 export class CalendarEventParticipantService {

diff --git a/...ted-account/auto-companies-and-contacts-creation/create-company/create-company.service.ts b/...ted-account/auto-companies-and-contacts-creation/create-company/create-company.service.ts
@@ -5,7 +5,7 @@ import { v4 } from 'uuid';
 import axios, { AxiosInstance } from 'axios';
 
 import { CompanyRepository } from 'src/modules/company/repositories/company.repository';
-import { getCompanyNameFromDomainName } from 'src/modules/messaging/utils/get-company-name-from-domain-name.util';
+import { getCompanyNameFromDomainName } from 'src/modules/calendar-messaging-participant/utils/get-company-name-from-domain-name.util';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 @Injectable()

diff --git a/...ted-account/auto-companies-and-contacts-creation/create-contact/create-contact.service.ts b/...ted-account/auto-companies-and-contacts-creation/create-contact/create-contact.service.ts
@@ -4,7 +4,7 @@ import { EntityManager } from 'typeorm';
 import { v4 } from 'uuid';
 
 import { PersonRepository } from 'src/modules/person/repositories/person.repository';
-import { getFirstNameAndLastNameFromHandleAndDisplayName } from 'src/modules/messaging/utils/get-first-name-and-last-name-from-handle-and-display-name.util';
+import { getFirstNameAndLastNameFromHandleAndDisplayName } from 'src/modules/calendar-messaging-participant/utils/get-first-name-and-last-name-from-handle-and-display-name.util';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 

diff --git a/...count/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts b/...count/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts
@@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { EntityManager, Repository } from 'typeorm';
 import compact from 'lodash/compact';
 
-import { getDomainNameFromHandle } from 'src/modules/messaging/utils/get-domain-name-from-handle.util';
+import { getDomainNameFromHandle } from 'src/modules/calendar-messaging-participant/utils/get-domain-name-from-handle.util';
 import { CreateCompanyService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service';
 import { CreateContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service';
 import { PersonRepository } from 'src/modules/person/repositories/person.repository';

diff --git a/...mpanies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util.ts b/...mpanies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util.ts
@@ -1,4 +1,4 @@
-import { getDomainNameFromHandle } from 'src/modules/messaging/utils/get-domain-name-from-handle.util';
+import { getDomainNameFromHandle } from 'src/modules/calendar-messaging-participant/utils/get-domain-name-from-handle.util';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
 import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
 import { Contacts } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';

diff --git a/packages/twenty-server/src/modules/messaging/messaging.module.ts b/packages/twenty-server/src/modules/messaging/messaging.module.ts
@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { ParticipantPersonListener } from 'src/modules/connected-account/listeners/participant-person.listener';
-import { ParticipantWorkspaceMemberListener } from 'src/modules/connected-account/listeners/participant-workspace-member.listener';
 import { MessagingMessageChannelListener } from 'src/modules/messaging/listeners/messaging-message-channel.listener';
 import { MessagingConnectedAccountListener } from 'src/modules/messaging/listeners/messaging-connected-account.listener';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { ParticipantPersonListener } from 'src/modules/calendar-messaging-participant/listeners/participant-person.listener';
+import { ParticipantWorkspaceMemberListener } from 'src/modules/calendar-messaging-participant/listeners/participant-workspace-member.listener';
 
 @Module({
   imports: [TypeOrmModule.forFeature([FeatureFlagEntity], 'core')],

diff --git a/...y-server/src/modules/messaging/services/message-participant/message-participant.module.ts b/...y-server/src/modules/messaging/services/message-participant/message-participant.module.ts
@@ -2,7 +2,7 @@ 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 { AddPersonIdAndWorkspaceMemberIdModule } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module';
+import { AddPersonIdAndWorkspaceMemberIdModule } from 'src/modules/calendar-messaging-participant/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module';
 import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
 import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';

diff --git a/...-server/src/modules/messaging/services/message-participant/message-participant.service.ts b/...-server/src/modules/messaging/services/message-participant/message-participant.service.ts
@@ -8,9 +8,9 @@ import { PersonRepository } from 'src/modules/person/repositories/person.reposit
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
-import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
 import { MessageParticipantRepository } from 'src/modules/messaging/repositories/message-participant.repository';
 import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/calendar-messaging-participant/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
 
 @Injectable()
 export class MessageParticipantService {