Merge branch 'develop' of github.com:IQSS/dataverse-client-javascript into 146-edit-dataset-use-case

Author: GPortas

src/collections/domain/models/Collection.ts

@@ -3,6 +3,7 @@ export interface Collection {
   id: number
   alias: string
   name: string
+  isReleased: string
   affiliation?: string
   description?: string
   isPartOf: DvObjectOwnerNode

src/collections/infra/repositories/transformers/CollectionPayload.ts

@@ -4,6 +4,7 @@ export interface CollectionPayload {
   alias: string
   name: string
   affiliation?: string
+  isReleased: string
   description?: string
   isPartOf: OwnerNodePayload
 }

src/collections/infra/repositories/transformers/collectionTransformers.ts

@@ -14,6 +14,7 @@ const transformPayloadToCollection = (collectionPayload: CollectionPayload): Col
     id: collectionPayload.id,
     alias: collectionPayload.alias,
     name: collectionPayload.name,
+    isReleased: collectionPayload.isReleased,
     affiliation: collectionPayload.affiliation,
     description: transformHtmlToMarkdown(collectionPayload.description),
     ...(collectionPayload.isPartOf && {

test/integration/collections/CollectionsRepository.test.ts

@@ -40,16 +40,27 @@ describe('CollectionsRepository', () => {
         const actual = await testGetCollection.getCollection()
         expect(actual.alias).toBe(ROOT_COLLECTION_ALIAS)
       })
-    })
 
+      test('should return isReleased is true for root collection', async () => {
+        const actual = await testGetCollection.getCollection()
+        expect(actual.alias).toBe(ROOT_COLLECTION_ALIAS)
+        expect(actual.isReleased).toBe(true)
+      })
+    })
     describe('by string alias', () => {
       test('should return collection when it exists filtering by id AS (alias)', async () => {
         const actual = await testGetCollection.getCollection(
           TestConstants.TEST_CREATED_COLLECTION_ALIAS_2
         )
         expect(actual.alias).toBe(TestConstants.TEST_CREATED_COLLECTION_ALIAS_2)
       })
-
+      test('should return isReleased is false for unpublished collection', async () => {
+        const actual = await testGetCollection.getCollection(
+          TestConstants.TEST_CREATED_COLLECTION_ALIAS_2
+        )
+        expect(actual.alias).toBe(TestConstants.TEST_CREATED_COLLECTION_ALIAS_2)
+        expect(actual.isReleased).toBe(false)
+      })
       test('should return error when collection does not exist', async () => {
         const expectedError = new ReadError(
           `[404] Can't find dataverse with identifier='${TestConstants.TEST_DUMMY_COLLECTION_ALIAS}'`

test/integration/files/FilesRepository.test.ts

@@ -59,35 +59,26 @@ describe('FilesRepository', () => {
     // Uploading test file 1 with some categories
     const uploadFileResponse = await uploadFileViaApi(testDatasetIds.numericId, testTextFile1Name, {
       categories: [testCategoryName]
+    }).catch(() => {
+      throw new Error(`Tests beforeAll(): Error while uploading file ${testTextFile1Name}`)
     })
-      .then()
-      .catch((e) => {
-        console.log(e)
-        throw new Error(`Tests beforeAll(): Error while uploading file ${testTextFile1Name}`)
-      })
     // Uploading test file 2
-    await uploadFileViaApi(testDatasetIds.numericId, testTextFile2Name)
-      .then()
-      .catch((e) => {
-        console.log(e)
-        throw new Error(`Tests beforeAll(): Error while uploading file ${testTextFile2Name}`)
-      })
+    await uploadFileViaApi(testDatasetIds.numericId, testTextFile2Name).catch(() => {
+      throw new Error(`Tests beforeAll(): Error while uploading file ${testTextFile2Name}`)
+    })
     // Uploading test file 3
-    await uploadFileViaApi(testDatasetIds.numericId, testTextFile3Name)
-      .then()
-      .catch((e) => {
-        console.log(e)
-        throw new Error(`Tests beforeAll(): Error while uploading file ${testTextFile3Name}`)
-      })
+    await uploadFileViaApi(testDatasetIds.numericId, testTextFile3Name).catch(() => {
+      throw new Error(`Tests beforeAll(): Error while uploading file ${testTextFile3Name}`)
+    })
     // Uploading test file 4
-    await uploadFileViaApi(testDatasetIds.numericId, testTabFile4Name)
-      .then()
-      .catch((e) => {
-        console.log(e)
-        throw new Error(`Tests beforeAll(): Error while uploading file ${testTabFile4Name}`)
-      })
+    await uploadFileViaApi(testDatasetIds.numericId, testTabFile4Name).catch(() => {
+      throw new Error(`Tests beforeAll(): Error while uploading file ${testTabFile4Name}`)
+    })
     // Registering test file 1
-    await registerFileViaApi(uploadFileResponse.data.data.files[0].dataFile.id)
+
+    await registerFileViaApi(uploadFileResponse.data.data.files[0].dataFile.id).catch(() => {
+      throw new Error(`Tests beforeAll(): Error while registering file ${testTextFile1Name}`)
+    })
     const filesSubset = await sut.getDatasetFiles(
       testDatasetIds.numericId,
       latestDatasetVersionId,
@@ -544,23 +535,17 @@ describe('FilesRepository', () => {
     })
 
     test('should return citation when dataset is deaccessioned', async () => {
-      await publishDatasetViaApi(testDatasetIds.numericId)
-        .then()
-        .catch(() => {
-          throw new Error('Error while publishing test Dataset')
-        })
-
-      await waitForNoLocks(testDatasetIds.numericId, 10)
-        .then()
-        .catch(() => {
-          throw new Error('Error while waiting for no locks')
-        })
-
-      await deaccessionDatasetViaApi(testDatasetIds.numericId, '1.0')
-        .then()
-        .catch(() => {
-          throw new Error('Error while deaccessioning test Dataset')
-        })
+      await publishDatasetViaApi(testDatasetIds.numericId).catch(() => {
+        throw new Error('Error while publishing test Dataset')
+      })
+
+      await waitForNoLocks(testDatasetIds.numericId, 10).catch(() => {
+        throw new Error('Error while waiting for no locks')
+      })
+
+      await deaccessionDatasetViaApi(testDatasetIds.numericId, '1.0').catch(() => {
+        throw new Error('Error while deaccessioning test Dataset')
+      })
 
       const actualFileCitation = await sut.getFileCitation(
         testFileId,

test/testHelpers/collections/collectionHelper.ts

@@ -7,6 +7,7 @@ import collectionJson1 from './test-collection-1.json'
 import collectionJson2 from './test-collection-2.json'
 
 const COLLECTION_ID = 11111
+const COLLECTION_IS_RELEASED = 'true'
 const COLLECTION_ALIAS_STR = 'secondCollection'
 const COLLECTION_NAME_STR = 'Laboratory Research'
 const COLLECTION_AFFILIATION_STR = 'Laboratory Research Corporation'
@@ -23,6 +24,7 @@ export const createCollectionModel = (): Collection => {
     id: COLLECTION_ID,
     alias: COLLECTION_ALIAS_STR,
     name: COLLECTION_NAME_STR,
+    isReleased: COLLECTION_IS_RELEASED,
     affiliation: COLLECTION_AFFILIATION_STR,
     description: COLLECTION_DESCRIPTION_MARKDOWN,
     isPartOf: { type: DvObjectType.DATAVERSE, identifier: 'root', displayName: 'Root' }
@@ -35,6 +37,7 @@ export const createCollectionPayload = (): CollectionPayload => {
     id: COLLECTION_ID,
     alias: COLLECTION_ALIAS_STR,
     name: COLLECTION_NAME_STR,
+    isReleased: COLLECTION_IS_RELEASED,
     affiliation: COLLECTION_AFFILIATION_STR,
     description: COLLECTION_DESCRIPTION_HTML,
     isPartOf: { type: DvObjectType.DATAVERSE, identifier: 'root', displayName: 'Root' }