6382 create a command to add a uservar in the key value pair table for every account which needs to reconnect (#6553)

Closes #6382

Create SetUserVarsAccountsToReconnectCommand.
This command loops on all workspaces and:
- deletes all user vars with deprecated key `ACCOUNTS_TO_RECONNECT`
- creates a key value pair of type `USER_VAR` with a key of
`ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS` for all connect
accounts with a message channel or calendar channel with status
`FAILED_INSUFFICIENT_PERMISSIONS`

packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts

@@ -3,7 +3,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { UserVarsModule } from 'src/engine/core-modules/user/user-vars/user-vars.module';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
@@ -25,6 +24,7 @@ import { CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/cale
 import { CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 import { CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
 import { CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event.workspace-entity';
+import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
 import { RefreshAccessTokenManagerModule } from 'src/modules/connected-account/refresh-access-token-manager/refresh-access-token-manager.module';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
@@ -53,7 +53,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
     BillingModule,
     RefreshAccessTokenManagerModule,
     CalendarEventParticipantManagerModule,
-    UserVarsModule,
+    ConnectedAccountModule,
   ],
   providers: [
     CalendarChannelSyncStatusService,

packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-channel-sync-status.service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 
-import { UserVarsService } from 'src/engine/core-modules/user/user-vars/services/user-vars.service';
 import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
 import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
@@ -10,10 +9,8 @@ import {
   CalendarChannelSyncStatus,
   CalendarChannelWorkspaceEntity,
 } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
-import {
-  AccountsToReconnectKeyValueType,
-  AccountsToReconnectKeys,
-} from 'src/modules/connected-account/types/accounts-to-reconnect-key-value.type';
+import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
+import { AccountsToReconnectKeys } from 'src/modules/connected-account/types/accounts-to-reconnect-key-value.type';
 
 @Injectable()
 export class CalendarChannelSyncStatusService {
@@ -21,7 +18,7 @@ export class CalendarChannelSyncStatusService {
     private readonly twentyORMManager: TwentyORMManager,
     @InjectCacheStorage(CacheStorageNamespace.Calendar)
     private readonly cacheStorage: CacheStorageService,
-    private readonly userVarsService: UserVarsService<AccountsToReconnectKeyValueType>,
+    private readonly accountsToReconnectService: AccountsToReconnectService,
   ) {}
 
   public async scheduleFullCalendarEventListFetch(calendarChannelId: string) {
@@ -194,24 +191,11 @@ export class CalendarChannelSyncStatusService {
     const userId = calendarChannel.connectedAccount.accountOwner.userId;
     const connectedAccountId = calendarChannel.connectedAccount.id;
 
-    const accountsToReconnect =
-      (await this.userVarsService.get({
-        userId,
-        workspaceId,
-        key: AccountsToReconnectKeys.ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS,
-      })) ?? [];
-
-    if (accountsToReconnect.includes(connectedAccountId)) {
-      return;
-    }
-
-    accountsToReconnect.push(connectedAccountId);
-
-    await this.userVarsService.set({
+    await this.accountsToReconnectService.addAccountToReconnectByKey(
+      AccountsToReconnectKeys.ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS,
       userId,
       workspaceId,
-      key: AccountsToReconnectKeys.ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS,
-      value: accountsToReconnect,
-    });
+      connectedAccountId,
+    );
   }
 }

packages/twenty-server/src/modules/connected-account/services/accounts-to-reconnect.service.ts

@@ -64,4 +64,31 @@ export class AccountsToReconnectService {
       value: updatedAccountsToReconnect,
     });
   }
+
+  public async addAccountToReconnectByKey(
+    key: AccountsToReconnectKeys,
+    userId: string,
+    workspaceId: string,
+    connectedAccountId: string,
+  ) {
+    const accountsToReconnect =
+      (await this.userVarsService.get({
+        userId,
+        workspaceId,
+        key,
+      })) ?? [];
+
+    if (accountsToReconnect.includes(connectedAccountId)) {
+      return;
+    }
+
+    accountsToReconnect.push(connectedAccountId);
+
+    await this.userVarsService.set({
+      userId,
+      workspaceId,
+      key,
+      value: accountsToReconnect,
+    });
+  }
 }

packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts

@@ -2,9 +2,9 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { UserVarsModule } from 'src/engine/core-modules/user/user-vars/user-vars.module';
 import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
 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 { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
 import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
@@ -21,7 +21,7 @@ import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/perso
       MessageThreadWorkspaceEntity,
     ]),
     TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
-    UserVarsModule,
+    ConnectedAccountModule,
   ],
   providers: [MessagingChannelSyncStatusService],
   exports: [MessagingChannelSyncStatusService],

packages/twenty-server/src/modules/messaging/common/services/messaging-channel-sync-status.service.ts

@@ -1,15 +1,12 @@
 import { Injectable } from '@nestjs/common';
 
-import { UserVarsService } from 'src/engine/core-modules/user/user-vars/services/user-vars.service';
 import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
 import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
-import {
-  AccountsToReconnectKeyValueType,
-  AccountsToReconnectKeys,
-} from 'src/modules/connected-account/types/accounts-to-reconnect-key-value.type';
+import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
+import { AccountsToReconnectKeys } from 'src/modules/connected-account/types/accounts-to-reconnect-key-value.type';
 import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import {
   MessageChannelSyncStage,
@@ -24,8 +21,8 @@ export class MessagingChannelSyncStatusService {
     private readonly messageChannelRepository: MessageChannelRepository,
     @InjectCacheStorage(CacheStorageNamespace.Messaging)
     private readonly cacheStorage: CacheStorageService,
-    private readonly userVarsService: UserVarsService<AccountsToReconnectKeyValueType>,
     private readonly twentyORMManager: TwentyORMManager,
+    private readonly accountsToReconnectService: AccountsToReconnectService,
   ) {}
 
   public async scheduleFullMessageListFetch(
@@ -199,24 +196,11 @@ export class MessagingChannelSyncStatusService {
     const userId = messageChannel.connectedAccount.accountOwner.userId;
     const connectedAccountId = messageChannel.connectedAccount.id;
 
-    const accountsToReconnect =
-      (await this.userVarsService.get({
-        userId,
-        workspaceId,
-        key: AccountsToReconnectKeys.ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS,
-      })) ?? [];
-
-    if (accountsToReconnect.includes(connectedAccountId)) {
-      return;
-    }
-
-    accountsToReconnect.push(connectedAccountId);
-
-    await this.userVarsService.set({
+    await this.accountsToReconnectService.addAccountToReconnectByKey(
+      AccountsToReconnectKeys.ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS,
       userId,
       workspaceId,
-      key: AccountsToReconnectKeys.ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS,
-      value: accountsToReconnect,
-    });
+      connectedAccountId,
+    );
   }
 }