test: integration cases

Author: g-saracca

src/files/infra/repositories/FilesRepository.ts

@@ -322,7 +322,7 @@ export class FilesRepository extends ApiRepository implements IFilesRepository {
 
     return this.doPost(
       this.buildApiEndpoint(this.filesResourceName, 'replace', fileId),
-      requestBody,
+      formData,
       {},
       ApiConstants.CONTENT_TYPE_MULTIPART_FORM_DATA
     )

test/integration/files/DirectUpload.test.ts

@@ -3,6 +3,7 @@ import {
   CreatedDatasetIdentifiers,
   DatasetNotNumberedVersion,
   FileOrderCriteria,
+  UploadedFileDTO,
   createDataset
 } from '../../../src'
 import { DataverseApiAuthMechanism } from '../../../src/core/infra/repositories/ApiConfig'
@@ -27,6 +28,7 @@ describe('Direct Upload', () => {
   const testCollectionAlias = 'directUploadTestCollection'
   let testDataset1Ids: CreatedDatasetIdentifiers
   let testDataset2Ids: CreatedDatasetIdentifiers
+  let testDataset3Ids: CreatedDatasetIdentifiers
 
   const filesRepositorySut = new FilesRepository()
   const directUploadSut: DirectUploadClient = new DirectUploadClient(filesRepositorySut)
@@ -57,6 +59,10 @@ describe('Direct Upload', () => {
         TestConstants.TEST_NEW_DATASET_DTO,
         testCollectionAlias
       )
+      testDataset3Ids = await createDataset.execute(
+        TestConstants.TEST_NEW_DATASET_DTO,
+        testCollectionAlias
+      )
     } catch (error) {
       throw new Error('Tests beforeAll(): Error while creating test dataset')
     }
@@ -67,6 +73,7 @@ describe('Direct Upload', () => {
   afterAll(async () => {
     await deleteUnpublishedDatasetViaApi(testDataset1Ids.numericId)
     await deleteUnpublishedDatasetViaApi(testDataset2Ids.numericId)
+    await deleteUnpublishedDatasetViaApi(testDataset3Ids.numericId)
     await deleteCollectionViaApi(testCollectionAlias)
   })
 
@@ -213,6 +220,113 @@ describe('Direct Upload', () => {
     ).rejects.toThrow(FileUploadCancelError)
   })
 
+  test('should upload file add it to the dataset, upload a new one and replace it', async () => {
+    // 1 - Upload first file and add it to the dataset
+    const destination = await createTestFileUploadDestination(
+      singlepartFile,
+      testDataset3Ids.numericId
+    )
+    const singlepartFileUrl = destination.urls[0]
+
+    const progressMock = jest.fn()
+    const abortController = new AbortController()
+
+    expect(await singlepartFileExistsInBucket(singlepartFileUrl)).toBe(false)
+
+    const actualStorageId = await directUploadSut.uploadFile(
+      testDataset3Ids.numericId,
+      singlepartFile,
+      progressMock,
+      abortController,
+      destination
+    )
+    expect(actualStorageId).toBe(destination.storageId)
+
+    expect(await singlepartFileExistsInBucket(singlepartFileUrl)).toBe(true)
+
+    let datasetFiles = await filesRepositorySut.getDatasetFiles(
+      testDataset3Ids.numericId,
+      DatasetNotNumberedVersion.LATEST,
+      true,
+      FileOrderCriteria.NAME_AZ
+    )
+
+    expect(datasetFiles.totalFilesCount).toBe(0)
+
+    const fileArrayBuffer = await singlepartFile.arrayBuffer()
+    const fileBuffer = Buffer.from(fileArrayBuffer)
+
+    const uploadedFileDTO = {
+      fileName: singlepartFile.name,
+      storageId: actualStorageId,
+      checksumType: checksumAlgorithm,
+      checksumValue: calculateBlobChecksum(fileBuffer),
+      mimeType: singlepartFile.type
+    }
+
+    await filesRepositorySut.addUploadedFilesToDataset(testDataset3Ids.numericId, [uploadedFileDTO])
+
+    datasetFiles = await filesRepositorySut.getDatasetFiles(
+      testDataset3Ids.numericId,
+      DatasetNotNumberedVersion.LATEST,
+      true,
+      FileOrderCriteria.NAME_AZ
+    )
+
+    expect(datasetFiles.totalFilesCount).toBe(1)
+    expect(datasetFiles.files[0].name).toBe('singlepart-file')
+    expect(datasetFiles.files[0].sizeBytes).toBe(singlepartFile.size)
+    expect(datasetFiles.files[0].storageIdentifier).toContain('localstack1://mybucket:')
+
+    // 2 - Upload a new file and get the new storage id
+    const newSinglepartFile = await createSinglepartFileBlob('new-singlepart-file', 1500)
+    const newDestination = await createTestFileUploadDestination(
+      newSinglepartFile,
+      testDataset3Ids.numericId
+    )
+    const newSinglepartFileUrl = newDestination.urls[0]
+
+    expect(await singlepartFileExistsInBucket(newSinglepartFileUrl)).toBe(false)
+
+    const newFileStorageId = await directUploadSut.uploadFile(
+      testDataset3Ids.numericId,
+      newSinglepartFile,
+      progressMock,
+      abortController,
+      newDestination
+    )
+    expect(newFileStorageId).toBe(newDestination.storageId)
+
+    expect(await singlepartFileExistsInBucket(newSinglepartFileUrl)).toBe(true)
+
+    // 3 - Replace the old file with the new file (must have different content)
+    const currentFileId = datasetFiles.files[0].id
+    const newFileArrayBuffer = await newSinglepartFile.arrayBuffer()
+    const newFileBuffer = Buffer.from(newFileArrayBuffer)
+    const newUploadedFileDTO: UploadedFileDTO = {
+      fileName: newSinglepartFile.name,
+      storageId: newFileStorageId,
+      checksumType: checksumAlgorithm,
+      checksumValue: calculateBlobChecksum(newFileBuffer),
+      mimeType: newSinglepartFile.type
+    }
+
+    await filesRepositorySut.replaceFile(currentFileId, newUploadedFileDTO)
+
+    // 4 - Verify that the new file is in the dataset and the old file is not
+    datasetFiles = await filesRepositorySut.getDatasetFiles(
+      testDataset3Ids.numericId,
+      DatasetNotNumberedVersion.LATEST,
+      true,
+      FileOrderCriteria.NAME_AZ
+    )
+
+    expect(datasetFiles.totalFilesCount).toBe(1)
+    expect(datasetFiles.files[0].name).toBe('new-singlepart-file')
+    expect(datasetFiles.files[0].sizeBytes).toBe(newSinglepartFile.size)
+    expect(datasetFiles.files[0].storageIdentifier).toContain('localstack1://mybucket:')
+  })
+
   const createTestFileUploadDestination = async (file: File, testDatasetId: number) => {
     const filesRepository = new FilesRepository()
     const destination = await filesRepository.getFileUploadDestination(testDatasetId, file)

test/testHelpers/files/filesHelper.ts

@@ -186,9 +186,12 @@ const enableFilePIDs = async (): Promise<AxiosResponse> => {
     )
 }
 
-export async function createSinglepartFileBlob(): Promise<File> {
+export async function createSinglepartFileBlob(
+  fileName = 'singlepart-file',
+  fileSizeInBytes = 1000
+): Promise<File> {
   try {
-    return await createFileBlobWithSize(1000, 'singlepart-file')
+    return await createFileBlobWithSize(fileSizeInBytes, fileName)
   } catch (error) {
     throw new Error(`Error while creating test singlepart file`)
   }