Skip to content

Commit 37c44b3

Browse files
committed
feat(remote-sync): refactor error handling and update imports for consistency
1 parent b98e5a4 commit 37c44b3

7 files changed

Lines changed: 27 additions & 27 deletions

File tree

src/apps/main/remote-sync/patch-drive-file-response-item.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export function patchDriveFileResponseItem(payload: DriveFileResponseItem) {
99
return {
1010
...payload,
1111
fileId: payload.fileId ?? '',
12-
size: typeof payload.size === 'string' ? parseInt(payload.size) : payload.size,
12+
size: typeof payload.size === 'string' ? Number.parseInt(payload.size) : payload.size,
1313
name: payload.name ?? undefined,
1414
} as RemoteSyncedFile;
1515
}

src/apps/main/remote-sync/remote-sync-controller/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ vi.mock('../../../../infra/sqlite/services/folder/create-or-update-folder-by-bat
1313

1414
import * as uuid from 'uuid';
1515
import { createRemoteSyncController, CreateRemoteSyncControllerPops, RemoteSyncController } from './index';
16-
import { RemoteSyncErrorHandler } from '../create-remote-sync-error-handler';
16+
import { RemoteSyncErrorHandler } from '../remote-sync-error-handler';
1717
import { RemoteSyncedFile, RemoteSyncedFolder } from '../helpers';
1818
import { DriveServerError } from '../../../../infra/drive-server/drive-server.error';
1919
import { driveServerClient } from '../../../../infra/drive-server/client/drive-server.client.instance';

src/apps/main/remote-sync/remote-sync-controller/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { SyncConfig, RemoteSyncStatus } from '../helpers';
22
import { DatabaseCollectionAdapter } from '../../database/adapters/base';
33
import { DriveFile } from '../../database/entities/DriveFile';
44
import { DriveFolder } from '../../database/entities/DriveFolder';
5-
import { RemoteSyncErrorHandler } from '../create-remote-sync-error-handler';
5+
import { RemoteSyncErrorHandler } from '../remote-sync-error-handler';
66

77
export type RemoteSyncControllerConfig = {
88
fetchFilesLimitPerRequest: number;

src/apps/main/remote-sync/create-remote-sync-error-handler.test.ts renamed to src/apps/main/remote-sync/remote-sync-error-handler.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ vi.mock('@internxt/drive-desktop-core/build/backend', () => ({
77
import { logger } from '@internxt/drive-desktop-core/build/backend';
88
import * as virtualDriveIssuesModule from '../issues/virtual-drive';
99
import { call, partialSpyOn } from '../../../../tests/vitest/utils.helper';
10-
import { createRemoteSyncErrorHandler } from './create-remote-sync-error-handler';
10+
import { createRemoteSyncErrorHandler } from './remote-sync-error-handler';
1111
import {
1212
RemoteSyncError,
1313
RemoteSyncInvalidResponseError,
1414
RemoteSyncNetworkError,
1515
RemoteSyncServerError,
1616
} from './errors';
1717

18-
describe('create-remote-sync-error-handler.test', () => {
18+
describe('remote-sync-error-handler.test', () => {
1919
const addVirtualDriveIssueMock = partialSpyOn(virtualDriveIssuesModule, 'addVirtualDriveIssue');
2020

2121
beforeEach(() => {

src/apps/main/remote-sync/create-remote-sync-error-handler.ts renamed to src/apps/main/remote-sync/remote-sync-error-handler.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ export type RemoteSyncErrorHandler = {
1414
handleSyncError: (props: HandleSyncErrorPops) => void;
1515
};
1616

17-
export function createRemoteSyncErrorHandler(): RemoteSyncErrorHandler {
18-
function handleSyncError({ error, syncItemType, itemName, itemCheckpoint }: HandleSyncErrorPops) {
19-
const errorDetail = getRemoteSyncErrorDetail({
20-
error,
21-
syncItemType,
22-
itemName,
23-
});
17+
export function handleSyncError({ error, syncItemType, itemName, itemCheckpoint }: HandleSyncErrorPops) {
18+
const errorDetail = getRemoteSyncErrorDetail({
19+
error,
20+
syncItemType,
21+
itemName,
22+
});
2423

25-
if (!errorDetail) {
26-
return;
27-
}
24+
if (!errorDetail) {
25+
return;
26+
}
2827

29-
logger.error({
30-
tag: 'SYNC-ENGINE',
31-
msg: `Remote ${syncItemType} sync failed`,
32-
error,
33-
errorLabel: errorDetail.errorLabel,
34-
itemName,
35-
itemCheckpoint,
36-
});
28+
logger.error({
29+
tag: 'SYNC-ENGINE',
30+
msg: `Remote ${syncItemType} sync failed`,
31+
error,
32+
errorLabel: errorDetail.errorLabel,
33+
itemName,
34+
itemCheckpoint,
35+
});
3736

38-
addVirtualDriveIssue(errorDetail.issue);
39-
}
37+
addVirtualDriveIssue(errorDetail.issue);
38+
}
4039

40+
export function createRemoteSyncErrorHandler(): RemoteSyncErrorHandler {
4141
return {
4242
handleSyncError,
4343
};

src/apps/main/remote-sync/service.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ vi.mock('./remote-sync-controller', () => ({
8080
createRemoteSyncController: mocks.remoteSyncControllerFactory,
8181
}));
8282

83-
vi.mock('./create-remote-sync-error-handler', () => ({
83+
vi.mock('./remote-sync-error-handler', () => ({
8484
createRemoteSyncErrorHandler: vi.fn(() => ({
8585
handleSyncError: vi.fn(),
8686
})),

src/apps/main/remote-sync/service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { DriveFoldersCollection } from '../database/collections/DriveFolderColle
55
import { createRemoteSyncController } from './remote-sync-controller';
66
import { broadcastToWindows } from '../windows';
77
import { isInitialSyncReady, setInitialSyncState } from './InitialSyncReady';
8-
import { createRemoteSyncErrorHandler } from './create-remote-sync-error-handler';
8+
import { createRemoteSyncErrorHandler } from './remote-sync-error-handler';
99
import { registerRemoteSyncService } from '../../../context/shared/application/sync/remote-sync-service';
1010
import { toRemoteSyncFileDto } from './to-remote-sync-file-dto';
1111
import { toRemoteSyncFolderDto } from './to-remote-sync-folder-dto';

0 commit comments

Comments
 (0)