6256 refactor messaging module to remove all provider specific code and put it inside the drivers folders (#6721)

Closes #6256 
Closes #6257 
+ Create custom exceptions

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Raphaël Bosi
2024-08-27 18:14:45 +02:00
committed by GitHub
parent eb49cb2d08
commit 81fa3f0c41
62 changed files with 1540 additions and 1360 deletions

View File

@ -4,7 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
import { MessagingChannelSyncStatusService } from 'src/modules/messaging/common/services/messaging-channel-sync-status.service';
import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/services/message-channel-sync-status.service';
@Module({
imports: [
@ -12,7 +12,7 @@ import { MessagingChannelSyncStatusService } from 'src/modules/messaging/common/
TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
ConnectedAccountModule,
],
providers: [MessagingChannelSyncStatusService],
exports: [MessagingChannelSyncStatusService],
providers: [MessageChannelSyncStatusService],
exports: [MessageChannelSyncStatusService],
})
export class MessagingCommonModule {}

View File

@ -5,15 +5,20 @@ import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decora
import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
import { AccountsToReconnectKeys } from 'src/modules/connected-account/types/accounts-to-reconnect-key-value.type';
import {
MessageChannelSyncStage,
MessageChannelSyncStatus,
MessageChannelWorkspaceEntity,
} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
import {
MessageImportException,
MessageImportExceptionCode,
} from 'src/modules/messaging/message-import-manager/exceptions/message-import.exception';
@Injectable()
export class MessagingChannelSyncStatusService {
export class MessageChannelSyncStatusService {
constructor(
@InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)
private readonly cacheStorage: CacheStorageService,
@ -28,9 +33,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStage: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
},
@ -44,9 +47,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStage: MessageChannelSyncStage.PARTIAL_MESSAGE_LIST_FETCH_PENDING,
},
@ -60,9 +61,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStage: MessageChannelSyncStage.MESSAGES_IMPORT_PENDING,
},
@ -83,9 +82,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncCursor: '',
syncStageStartedAt: null,
@ -103,9 +100,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStage: MessageChannelSyncStage.MESSAGE_LIST_FETCH_ONGOING,
syncStatus: MessageChannelSyncStatus.ONGOING,
@ -122,9 +117,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStatus: MessageChannelSyncStatus.ACTIVE,
},
@ -140,9 +133,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStage: MessageChannelSyncStage.MESSAGES_IMPORT_ONGOING,
},
@ -163,9 +154,7 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStage: MessageChannelSyncStage.FAILED,
syncStatus: MessageChannelSyncStatus.FAILED_UNKNOWN,
@ -187,15 +176,38 @@ export class MessagingChannelSyncStatusService {
);
await messageChannelRepository.update(
{
id: messageChannelId,
},
{ id: messageChannelId },
{
syncStage: MessageChannelSyncStage.FAILED,
syncStatus: MessageChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS,
},
);
const connectedAccountRepository =
await this.twentyORMManager.getRepository<ConnectedAccountWorkspaceEntity>(
'connectedAccount',
);
const messageChannel = await messageChannelRepository.findOne({
where: { id: messageChannelId },
});
if (!messageChannel) {
throw new MessageImportException(
`Message channel ${messageChannelId} not found in workspace ${workspaceId}`,
MessageImportExceptionCode.MESSAGE_CHANNEL_NOT_FOUND,
);
}
const connectedAccountId = messageChannel.connectedAccountId;
await connectedAccountRepository.update(
{ id: connectedAccountId },
{
authFailedAt: new Date(),
},
);
await this.addToAccountsToReconnect(messageChannelId, workspaceId);
}
@ -209,9 +221,7 @@ export class MessagingChannelSyncStatusService {
);
const messageChannel = await messageChannelRepository.findOne({
where: {
id: messageChannelId,
},
where: { id: messageChannelId },
relations: {
connectedAccount: {
accountOwner: true,