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

Deprecate workspace datasoure (#16507)

Browse Source
This commit is contained in:
Weiko
2025-12-11 18:27:49 +01:00
committed by GitHub
parent 3dd2684254
commit 083a038f8a
39 changed files with 200 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts
+1 -3
View File
@@ -142,9 +142,7 @@ export class MessagingMessageCleanerService {
);
const workspaceDataSource =
await this.globalWorkspaceOrmManager.getDataSourceForWorkspace(
workspaceId,
);
await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();
await workspaceDataSource.transaction(
async (transactionManager: WorkspaceEntityManager) => {
packages/twenty-server/src/modules/messaging/message-import-manager/services/__tests__/messaging-message-list-fetch.service.spec.ts
+6 -1
View File
@@ -198,7 +198,7 @@ describe('MessagingMessageListFetchService', () => {
{
provide: GlobalWorkspaceOrmManager,
useValue: {
getDataSourceForWorkspace: jest.fn().mockResolvedValue({
getGlobalWorkspaceDataSource: jest.fn().mockResolvedValue({
manager: {},
}),
executeInWorkspaceContext: jest
@@ -206,6 +206,11 @@ describe('MessagingMessageListFetchService', () => {
.mockImplementation((_authContext: any, fn: () => any) => fn()),
getRepository: jest.fn().mockImplementation((workspaceId, name) => {
if (name === 'messageChannel') {
return {
findOne: jest.fn().mockResolvedValue(undefined),
};
}
if (name === 'messageChannelMessageAssociation') {
return mockMessageChannelMessageAssociationRepository;
}
packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts
+1 -3
View File
@@ -128,9 +128,7 @@ export class MessagingMessageListFetchService {
};
const datasource =
await this.globalWorkspaceOrmManager.getDataSourceForWorkspace(
workspaceId,
);
await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();
await this.syncMessageFoldersService.syncMessageFolders({
workspaceId,
packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-folder-actions.service.ts
+1 -3
View File
@@ -93,9 +93,7 @@ export class MessagingProcessFolderActionsService {
authContext,
async () => {
const workspaceDataSource =
await this.globalWorkspaceOrmManager.getDataSourceForWorkspace(
workspaceId,
);
await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();
await workspaceDataSource?.transaction(
async (transactionManager: WorkspaceEntityManager) => {
packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-group-email-actions.service.ts
+1 -3
View File
@@ -74,9 +74,7 @@ export class MessagingProcessGroupEmailActionsService {
authContext,
async () => {
const workspaceDataSource =
await this.globalWorkspaceOrmManager.getDataSourceForWorkspace(
workspaceId,
);
await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();
await workspaceDataSource?.transaction(
async (transactionManager: WorkspaceEntityManager) => {
packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.spec.ts
+1 -1
View File
@@ -154,7 +154,7 @@ describe('MessagingSaveMessagesAndEnqueueContactCreationService', () => {
{
provide: GlobalWorkspaceOrmManager,
useValue: {
getDataSourceForWorkspace: jest
getGlobalWorkspaceDataSource: jest
.fn()
.mockResolvedValue(datasourceInstance),
executeInWorkspaceContext: jest
packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
+1 -3
View File
@@ -50,9 +50,7 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
authContext,
async () => {
const workspaceDataSource =
await this.globalWorkspaceOrmManager.getDataSourceForWorkspace(
workspaceId,
);
await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();
return workspaceDataSource?.transaction(
async (transactionManager: WorkspaceEntityManager) => {