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

Fix messaging import (#16112)

Browse Source
This commit is contained in:
Charles Bochet
2025-11-26 23:13:12 +01:00
committed by GitHub
parent 5d1c2a3348
commit b1d1bcb712
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-messages-import-error-handler.service.ts
+9 -1
View File
@@ -1,5 +1,7 @@
import { Injectable, Logger } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
import {
MessageImportDriverException,
MessageImportDriverExceptionCode,
@@ -23,7 +25,13 @@ export class GmailMessagesImportErrorHandler {
}
if (isGmailApiBatchError(error)) {
throw parseGmailApiBatchError(error, messageExternalId);
const exception = parseGmailApiBatchError(error, messageExternalId);
if (!isDefined(exception)) {
return;
}
throw exception;
}
throw new MessageImportDriverException(
packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/__tests__/parse-gmail-messages-import-error.spec.ts
+2 -14
View File
@@ -111,26 +111,14 @@ describe('parseGmailApiBatchError', () => {
const error = gmailBatchApiErrorMocks.getError(404);
const exception = parseGmailApiBatchError(error, messageExternalId);
expect(exception).toBeInstanceOf(MessageImportDriverException);
expect(exception?.code).toBe(
MessageImportDriverExceptionCode.SYNC_CURSOR_ERROR,
);
expect(exception?.message).toBe(
`${error.errors[0].message} for message with externalId: ${messageExternalId}`,
);
expect(exception).toBeUndefined();
});
it('should handle 410 Gone', () => {
const error = gmailBatchApiErrorMocks.getError(410);
const exception = parseGmailApiBatchError(error, messageExternalId);
expect(exception).toBeInstanceOf(MessageImportDriverException);
expect(exception?.code).toBe(
MessageImportDriverExceptionCode.SYNC_CURSOR_ERROR,
);
expect(exception?.message).toBe(
`${error.errors[0].message} for message with externalId: ${messageExternalId}`,
);
expect(exception).toBeUndefined();
});
it('should handle 429 Too Many Requests', () => {
packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/parse-gmail-api-batch-error.util.ts
+1 -4
View File
@@ -43,10 +43,7 @@ export const parseGmailApiBatchError = (
case 404:
case 410:
return new MessageImportDriverException(
message,
MessageImportDriverExceptionCode.SYNC_CURSOR_ERROR,
);
return undefined;
case 429:
return new MessageImportDriverException(