fix: datasetTransformers.ts tests

Author: ekraffmiller

src/datasets/infra/repositories/transformers/datasetTransformers.ts

@@ -294,7 +294,13 @@ export const transformVersionPayloadToDataset = (
   return datasetModel
 }
 
-const transformPayloadToDatasetLicense = (licensePayload: LicensePayload): DatasetLicense => {
+const transformPayloadToDatasetLicense = (
+  licensePayload: LicensePayload
+): DatasetLicense | undefined => {
+  if (!licensePayload) {
+    return undefined
+  }
+
   const datasetLicense: DatasetLicense = {
     name: licensePayload.name,
     uri: licensePayload.uri
@@ -303,6 +309,7 @@ const transformPayloadToDatasetLicense = (licensePayload: LicensePayload): Datas
   if ('iconUri' in licensePayload) {
     datasetLicense.iconUri = licensePayload.iconUri
   }
+
   return datasetLicense
 }
 

test/functional/datasets/GetDataset.test.ts

@@ -87,6 +87,12 @@ describe('execute', () => {
     expect(dataset.termsOfUse.termsOfAccess.termsOfAccessForRestrictedFiles).toBe('Terms of access')
     expect(dataset.termsOfUse.customTerms).toBe(undefined)
   })
+  test('should  return custom terms if license is undefined', async () => {
+    const versionPayload = createDatasetVersionPayload()
+    const dataset = transformVersionPayloadToDataset(versionPayload, false)
+    expect(dataset.termsOfUse.termsOfAccess.termsOfAccessForRestrictedFiles).toBe('Terms of access')
+    expect(dataset.termsOfUse.customTerms?.termsOfUse).toBe('Terms of use')
+  })
   test('should return metadata fields in markdown format when keepRawFields is false', async () => {
     const createdDatasetIdentifiers = await createDataset.execute(testNewDataset)
 

test/testHelpers/datasets/datasetHelper.ts

@@ -142,14 +142,6 @@ export const createDatasetVersionPayload = (
     contactForAccess: 'Contact for access',
     sizeOfCollection: 'Size of collection',
     studyCompletion: 'Study completion',
-    termsOfUse: 'Terms of use',
-    confidentialityDeclaration: 'Confidentiality declaration',
-    specialPermissions: 'Special permissions',
-    restrictions: 'Restrictions',
-    citationRequirements: 'Citation requirements',
-    depositorRequirements: 'Depositor requirements',
-    conditions: 'Conditions',
-    disclaimer: 'Disclaimer',
     metadataBlocks: {
       citation: {
         name: 'citation',
@@ -245,6 +237,15 @@ export const createDatasetVersionPayload = (
   }
   if (license !== undefined) {
     datasetPayload.license = license
+  } else {
+    datasetPayload.termsOfUse = 'Terms of use'
+    datasetPayload.confidentialityDeclaration = 'Confidentiality declaration'
+    datasetPayload.specialPermissions = 'Special permissions'
+    datasetPayload.restrictions = 'Restrictions'
+    datasetPayload.citationRequirements = 'Citation requirements'
+    datasetPayload.depositorRequirements = 'Depositor requirements'
+    datasetPayload.conditions = 'Conditions'
+    datasetPayload.disclaimer = 'Disclaimer'
   }
   if (addOptionalProperties) {
     datasetPayload.alternativePersistentId = 'doi:10.5072/FK2/HC6KTB'

test/unit/datasets/DatasetsRepository.test.ts

@@ -115,8 +115,9 @@ describe('DatasetsRepository', () => {
         TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_SESSION_COOKIE.withCredentials,
       headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_SESSION_COOKIE.headers
     }
-    describe('with custom terms of use', () => {
-      test('should return Dataset with customTerms when license is undefined', async () => {
+
+    describe('by numeric id', () => {
+      test('should return Dataset when providing id, version id, and response is successful', async () => {
         jest.spyOn(axios, 'get').mockResolvedValue(testDatasetVersionSuccessfulResponse)
         const expectedApiEndpoint = `${TestConstants.TEST_API_URL}/datasets/${testDatasetModel.id}/versions/${testVersionId}`
 
@@ -220,24 +221,7 @@ describe('DatasetsRepository', () => {
         )
         expect(actual).toStrictEqual(createDatasetModel(undefined, true))
       })
-
-      test('should return error on repository read error', async () => {
-        jest.spyOn(axios, 'get').mockRejectedValue(TestConstants.TEST_ERROR_RESPONSE)
-
-        let error = undefined as unknown as ReadError
-        await sut
-          .getDataset(testDatasetModel.id, testVersionId, testIncludeDeaccessioned, false)
-          .catch((e) => (error = e))
-
-        expect(axios.get).toHaveBeenCalledWith(
-          `${TestConstants.TEST_API_URL}/datasets/${testDatasetModel.id}/versions/${testVersionId}`,
-          expectedRequestConfigApiKey
-        )
-        expect(error).toBeInstanceOf(Error)
-      })
-    })
-    describe('by numeric id', () => {
-      test('should return Dataset when providing id, version id, and response is successful', async () => {
+      test('should return Dataset with customTerms when license is undefined', async () => {
         jest.spyOn(axios, 'get').mockResolvedValue(testDatasetVersionSuccessfulResponse)
         const expectedApiEndpoint = `${TestConstants.TEST_API_URL}/datasets/${testDatasetModel.id}/versions/${testVersionId}`
 
@@ -266,80 +250,34 @@ describe('DatasetsRepository', () => {
         )
         expect(actual).toStrictEqual(testDatasetModel)
       })
+      test('should return Dataset without customTerms when license is defined', async () => {
+        jest.spyOn(axios, 'get').mockResolvedValue(testDatasetVersionSuccessfulResponse)
+        const expectedApiEndpoint = `${TestConstants.TEST_API_URL}/datasets/${testDatasetModel.id}/versions/${testVersionId}`
 
-      test('should return Dataset when providing id, version id, and response with license is successful', async () => {
-        const testDatasetLicense = createDatasetLicenseModel()
-        const testDatasetVersionWithLicenseSuccessfulResponse = {
-          data: {
-            status: 'OK',
-            data: createDatasetVersionPayload(testDatasetLicense)
-          }
-        }
-        jest.spyOn(axios, 'get').mockResolvedValue(testDatasetVersionWithLicenseSuccessfulResponse)
-
-        const actual = await sut.getDataset(
-          testDatasetModel.id,
-          testVersionId,
-          testIncludeDeaccessioned,
-          false
-        )
-
-        expect(axios.get).toHaveBeenCalledWith(
-          `${TestConstants.TEST_API_URL}/datasets/${testDatasetModel.id}/versions/${testVersionId}`,
-          expectedRequestConfigApiKey
-        )
-        expect(actual).toStrictEqual(createDatasetModel(testDatasetLicense))
-      })
-
-      test('should return Dataset when providing id, version id, and response with license without icon URI is successful', async () => {
-        const testDatasetLicenseWithoutIconUri = createDatasetLicenseModel(false)
-        const testDatasetVersionWithLicenseSuccessfulResponse = {
-          data: {
-            status: 'OK',
-            data: createDatasetVersionPayload(testDatasetLicenseWithoutIconUri)
-          }
-        }
-        jest.spyOn(axios, 'get').mockResolvedValue(testDatasetVersionWithLicenseSuccessfulResponse)
-
-        const actual = await sut.getDataset(
+        // API Key auth
+        let actual = await sut.getDataset(
           testDatasetModel.id,
           testVersionId,
           testIncludeDeaccessioned,
           false
         )
 
-        expect(axios.get).toHaveBeenCalledWith(
-          `${TestConstants.TEST_API_URL}/datasets/${testDatasetModel.id}/versions/${testVersionId}`,
-          expectedRequestConfigApiKey
-        )
-        expect(actual).toStrictEqual(createDatasetModel(testDatasetLicenseWithoutIconUri))
-      })
-
-      test('should return dataset with alternative persistent id, publication date and citation date when they are present in the response', async () => {
-        const testDatasetVersionWithAlternativePersistentIdAndDatesSuccessfulResponse = {
-          data: {
-            status: 'OK',
-            data: createDatasetVersionPayload(undefined, true)
-          }
-        }
-        jest
-          .spyOn(axios, 'get')
-          .mockResolvedValue(
-            testDatasetVersionWithAlternativePersistentIdAndDatesSuccessfulResponse
-          )
+        expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
+        expect(actual).toStrictEqual(testDatasetModel)
 
-        const actual = await sut.getDataset(
+        // Session cookie auth
+        ApiConfig.init(TestConstants.TEST_API_URL, DataverseApiAuthMechanism.SESSION_COOKIE)
+        actual = await sut.getDataset(
           testDatasetModel.id,
           testVersionId,
           testIncludeDeaccessioned,
           false
         )
-
         expect(axios.get).toHaveBeenCalledWith(
-          `${TestConstants.TEST_API_URL}/datasets/${testDatasetModel.id}/versions/${testVersionId}`,
-          expectedRequestConfigApiKey
+          expectedApiEndpoint,
+          expectedRequestConfigSessionCookie
         )
-        expect(actual).toStrictEqual(createDatasetModel(undefined, true))
+        expect(actual).toStrictEqual(testDatasetModel)
       })
 
       test('should return error on repository read error', async () => {