Elgato_dark/twenty
1
0
Fork 0
mirror of https://github.com/twentyhq/twenty synced 2026-04-21 13:37:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Revert "fix compute folders to update util (#19749)" (#19921)

Browse source 
This reverts commit 64470baa1e
This commit is contained in:
neo773 2026-04-21 13:32:24 +05:30 committed by GitHub
parent e3d7d0199d
commit 071980d511
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/twenty-server/src/modules/messaging/message-folder-manager/services/sync-message-folders.service.spec.ts
View file

@ -370,7 +370,6 @@ describe('SyncMessageFoldersService', () => {
id: 'folder-1',
externalId: 'inbox-ext',
name: 'INBOX',
isSynced: true,
isSentFolder: false,
parentFolderId: null,
});
@ -378,7 +377,6 @@ describe('SyncMessageFoldersService', () => {
createMockDiscoveredFolder({
externalId: 'inbox-ext',
name: 'INBOX',
isSynced: true,
isSentFolder: false,
parentFolderId: null,
}),
@ -476,7 +474,6 @@ describe('SyncMessageFoldersService', () => {
createMockDiscoveredFolder({
externalId: 'unchanged-ext',
name: 'Unchanged',
isSynced: true,
}),
createMockDiscoveredFolder({
externalId: 'new-ext',
@ -537,7 +534,6 @@ describe('SyncMessageFoldersService', () => {
createMockDiscoveredFolder({
externalId: 'inbox-ext',
name: 'INBOX',
isSynced: true,
}),
];
const messageChannel = createMockMessageChannel({

66
packages/twenty-server/src/modules/messaging/message-folder-manager/utils/__tests__/compute-folders-to-update.util.spec.ts
View file

@ -93,72 +93,6 @@ describe('computeFoldersToUpdate', () => {
expect(result.size).toBe(0);
});
it('should detect isSynced change from false to true', () => {
const discoveredFolders = [
{
name: 'Inbox',
externalId: 'INBOX',
isSynced: true,
isSentFolder: false,
parentFolderId: null,
},
];
const existingFolders = [
{
id: 'folder-id',
name: 'Inbox',
externalId: 'INBOX',
isSynced: false,
isSentFolder: false,
parentFolderId: null,
syncCursor: 'cursor',
pendingSyncAction: MessageFolderPendingSyncAction.NONE,
},
];
const result = computeFoldersToUpdate({
discoveredFolders,
existingFolders,
});
expect(result.size).toBe(1);
expect(result.get('folder-id')?.isSynced).toBe(true);
});
it('should detect isSynced change from true to false', () => {
const discoveredFolders = [
{
name: 'Promotions',
externalId: 'promo-1',
isSynced: false,
isSentFolder: false,
parentFolderId: null,
},
];
const existingFolders = [
{
id: 'folder-id',
name: 'Promotions',
externalId: 'promo-1',
isSynced: true,
isSentFolder: false,
parentFolderId: null,
syncCursor: 'cursor',
pendingSyncAction: MessageFolderPendingSyncAction.NONE,
},
];
const result = computeFoldersToUpdate({
discoveredFolders,
existingFolders,
});
expect(result.size).toBe(1);
expect(result.get('folder-id')?.isSynced).toBe(false);
});
it('should treat empty string parentFolderId same as null', () => {
const discoveredFolders = [
{

18
packages/twenty-server/src/modules/messaging/message-folder-manager/utils/compute-folders-to-update.util.ts
View file

@ -14,24 +14,12 @@ export const computeFoldersToUpdate = ({
}: {
discoveredFolders: DiscoveredMessageFolder[];
existingFolders: MessageFolder[];
}): Map<
string,
Pick<
MessageFolderEntity,
'name' | 'isSynced' | 'isSentFolder' | 'parentFolderId'
>
> => {
}): Map<string, Partial<MessageFolderEntity>> => {
const existingFoldersByExternalId = new Map(
existingFolders.map((folder) => [folder.externalId, folder]),
);
const foldersToUpdate = new Map<
string,
Pick<
MessageFolderEntity,
'name' | 'isSynced' | 'isSentFolder' | 'parentFolderId'
>
>();
const foldersToUpdate = new Map<string, Partial<MessageFolderEntity>>();
for (const discoveredFolder of discoveredFolders) {
const existingFolder = existingFoldersByExternalId.get(
@ -48,14 +36,12 @@ export const computeFoldersToUpdate = ({
const discoveredFolderData = {
name: discoveredFolder.name,
isSynced: discoveredFolder.isSynced,
isSentFolder: discoveredFolder.isSentFolder,
parentFolderId,
};
const existingFolderData = {
name: existingFolder.name,
isSynced: existingFolder.isSynced,
isSentFolder: existingFolder.isSentFolder,
parentFolderId: isNonEmptyString(existingFolder.parentFolderId)
? existingFolder.parentFolderId