Skip to content

The open alternative to Salesforce, designed for AI.

Keep a stored file's identifier when its content is uploaded again (#25748)

Weiko39acdbb46c28
diff --git a/packages/twenty-server/src/engine/core-modules/file-storage/services/__tests__/file-storage.service.spec.ts b/packages/twenty-server/src/engine/core-modules/file-storage/services/__tests__/file-storage.service.spec.ts
new file mode 100644
index 00000000000..ad28490b1cb
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file-storage/services/__tests__/file-storage.service.spec.ts
@@ -0,0 +1,147 @@
+import { type QueryRunner } from 'typeorm';
+import { FileFolder } from 'twenty-shared/types';
+
+import { type FileStorageDriverFactory } from 'src/engine/core-modules/file-storage/file-storage-driver.factory';
+import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';
+import { type FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { type WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
+
+const WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+const APPLICATION_ID = 'b30a4560-fedb-4ccd-904a-3788762c7d33';
+const APPLICATION_UNIVERSAL_IDENTIFIER = 'b30a4560-fedb-4ccd-904a-3788762c7d33';
+
+describe('FileStorageService', () => {
+ const buildService = (existingFile: Partial<FileEntity> | null) => {
+ const transactionRepository = {
+ findOne: jest.fn().mockResolvedValue(existingFile),
+ upsertAndReturnOne: jest
+ .fn()
+ .mockImplementation((_workspaceId, entity) => entity),
+ };
+
+ const fileRepository = {
+ findOne: jest.fn().mockResolvedValue(existingFile),
+ upsertAndReturnOne: jest
+ .fn()
+ .mockImplementation((_workspaceId, entity) => entity),
+ withManager: jest.fn().mockReturnValue(transactionRepository),
+ };
+
+ const driver = { writeFile: jest.fn().mockResolvedValue(undefined) };
+
+ const service = new FileStorageService(
+ {
+ getCurrentDriver: () => driver,
+ } as unknown as FileStorageDriverFactory,
+ fileRepository as unknown as WorkspaceScopedRepository<FileEntity>,
+ {} as WorkspaceCacheService,
+ );
+
+ return { service, fileRepository, transactionRepository };
+ };
+
+ const writeFile = (
+ service: FileStorageService,
+ fileId: string,
+ queryRunner?: QueryRunner,
+ ) =>
+ service.writeFile({
+ sourceFile: '{}',
+ fileFolder: FileFolder.Dependencies,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ applicationId: APPLICATION_ID,
+ workspaceId: WORKSPACE_ID,
+ resourcePath: 'package.json',
+ fileId,
+ settings: { isTemporaryFile: false, toDelete: false },
+ queryRunner,
+ });
+
+ const createPendingFile = (service: FileStorageService, fileId: string) =>
+ service.createPendingFile({
+ fileFolder: FileFolder.Dependencies,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ applicationId: APPLICATION_ID,
+ workspaceId: WORKSPACE_ID,
+ resourcePath: 'package.json',
+ fileId,
+ size: 12,
+ mimeType: 'application/json',
+ settings: { isTemporaryFile: false, toDelete: false },
+ });
+
+ it('should keep the identifier of the row already stored at that path', async () => {
+ const { service, fileRepository } = buildService({
+ id: 'the-row-the-application-points-at',
+ });
+
+ await createPendingFile(service, 'a-freshly-generated-identifier');
+
+ expect(fileRepository.findOne).toHaveBeenCalledTimes(1);
+ expect(fileRepository.upsertAndReturnOne).toHaveBeenCalledTimes(1);
+ expect(fileRepository.upsertAndReturnOne).toHaveBeenCalledWith(
+ WORKSPACE_ID,
+ expect.objectContaining({ id: 'the-row-the-application-points-at' }),
+ ['path', 'workspaceId', 'applicationId'],
+ );
+ });
+
+ it('should look the row up including soft-deleted ones, which the unique index still matches', async () => {
+ const { service, fileRepository } = buildService(null);
+
+ await createPendingFile(service, 'a-freshly-generated-identifier');
+
+ expect(fileRepository.findOne).toHaveBeenCalledTimes(1);
+ expect(fileRepository.findOne).toHaveBeenCalledWith(
+ WORKSPACE_ID,
+ expect.objectContaining({ withDeleted: true }),
+ );
+ });
+
+ it('should use the generated identifier when no row is stored at that path', async () => {
+ const { service, fileRepository } = buildService(null);
+
+ await createPendingFile(service, 'a-freshly-generated-identifier');
+
+ expect(fileRepository.findOne).toHaveBeenCalledTimes(1);
+ expect(fileRepository.upsertAndReturnOne).toHaveBeenCalledTimes(1);
+ expect(fileRepository.upsertAndReturnOne).toHaveBeenCalledWith(
+ WORKSPACE_ID,
+ expect.objectContaining({ id: 'a-freshly-generated-identifier' }),
+ ['path', 'workspaceId', 'applicationId'],
+ );
+ });
+
+ it('should keep the stored identifier when writing the file content again', async () => {
+ const { service, fileRepository } = buildService({
+ id: 'the-row-the-application-points-at',
+ });
+
+ await writeFile(service, 'a-freshly-generated-identifier');
+
+ expect(fileRepository.upsertAndReturnOne).toHaveBeenCalledTimes(1);
+ expect(fileRepository.upsertAndReturnOne).toHaveBeenCalledWith(
+ WORKSPACE_ID,
+ expect.objectContaining({ id: 'the-row-the-application-points-at' }),
+ ['path', 'workspaceId', 'applicationId'],
+ );
+ });
+
+ it('should look the row up through the transaction when one is given', async () => {
+ const { service, fileRepository, transactionRepository } = buildService({
+ id: 'the-row-the-application-points-at',
+ });
+ const queryRunner = { manager: {} } as QueryRunner;
+
+ await writeFile(service, 'a-freshly-generated-identifier', queryRunner);
+
+ expect(transactionRepository.findOne).toHaveBeenCalledTimes(1);
+ expect(fileRepository.findOne).not.toHaveBeenCalled();
+ expect(transactionRepository.upsertAndReturnOne).toHaveBeenCalledWith(
+ WORKSPACE_ID,
+ expect.objectContaining({ id: 'the-row-the-application-points-at' }),
+ ['path', 'workspaceId', 'applicationId'],
+ );
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts b/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts
index fc09b96e2d2..919d1aa3588 100644
--- a/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts
@@ -44,6 +44,27 @@ export class FileStorageService {
private readonly workspaceCacheService: WorkspaceCacheService,
) {}
+ private async resolveFileIdKeepingExistingRow({
+ fileRepository,
+ workspaceId,
+ filePath,
+ applicationId,
+ fileId,
+ }: {
+ fileRepository: WorkspaceScopedRepository<FileEntity>;
+ workspaceId: string;
+ filePath: string;
+ applicationId: string;
+ fileId: string | undefined;
+ }): Promise<string | undefined> {
+ const existingFile = await fileRepository.findOne(workspaceId, {
+ where: { path: filePath, applicationId },
+ withDeleted: true,
+ });
+
+ return existingFile?.id ?? fileId;
+ }
+
private async resolveApplicationIdOrThrow({
applicationUniversalIdentifier,
workspaceId,
@@ -251,7 +272,13 @@ export class FileStorageService {
{
path: filePath,
applicationId: resolvedApplicationId,
- id: fileId,
+ id: await this.resolveFileIdKeepingExistingRow({
+ fileRepository,
+ workspaceId,
+ filePath,
+ applicationId: resolvedApplicationId,
+ fileId,
+ }),
mimeType,
size:
typeof persistedSourceFile === 'string'
@@ -302,7 +329,13 @@ export class FileStorageService {
{
path: filePath,
applicationId: resolvedApplicationId,
- id: fileId,
+ id: await this.resolveFileIdKeepingExistingRow({
+ fileRepository: this.fileRepository,
+ workspaceId,
+ filePath,
+ applicationId: resolvedApplicationId,
+ fileId,
+ }),
mimeType,
size,
settings,