Merge Conflict

Author: ChengShi-1

CHANGELOG.md

@@ -8,6 +8,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 
 ### Added
 
+- Datasets: Added `updateDatasetLicense` use case and repository method to support Dataverse endpoint `PUT /datasets/{id}/license`, for updating dataset license or custom terms
 - New Use Case: [Get Collections For Linking Use Case](./docs/useCases.md#get-collections-for-linking).
 - New Use Case: [Create a Dataset Template](./docs/useCases.md#create-a-dataset-template) under Collections.
 

docs/useCases.md

@@ -46,6 +46,7 @@ The different use cases currently available in the package are classified below,
   - [Datasets write use cases](#datasets-write-use-cases)
     - [Create a Dataset](#create-a-dataset)
     - [Update a Dataset](#update-a-dataset)
+    - [Update a Dataset License](#update-a-dataset-license)
     - [Publish a Dataset](#publish-a-dataset)
     - [Deaccession a Dataset](#deaccession-a-dataset)
     - [Delete a Draft Dataset](#delete-a-draft-dataset)
@@ -1079,6 +1080,43 @@ updateDataset.execute(datasetId, datasetDTO)
 
 _See [use case](../src/datasets/domain/useCases/UpdateDataset.ts) implementation_.
 
+#### Update a Dataset License
+
+Updates the license of a dataset by applying it to the draft version. If no draft exists, a new one is automatically created by the API. Supports predefined licenses (by name) or custom terms of use and access.
+
+##### Example calls:
+
+```typescript
+import {
+  updateDatasetLicense,
+  DatasetLicenseUpdateRequest
+} from '@iqss/dataverse-client-javascript'
+
+/* ... */
+
+const datasetId = 1
+
+const predefinedPayload: DatasetLicenseUpdateRequest = { name: 'CC BY 4.0' }
+await updateDatasetLicense.execute(datasetId, predefinedPayload)
+
+const customPayload: DatasetLicenseUpdateRequest = {
+  customTerms: {
+    termsOfUse: 'Your terms of use',
+    confidentialityDeclaration: 'Your confidentiality declaration',
+    specialPermissions: 'Your special permissions',
+    restrictions: 'Your restrictions',
+    citationRequirements: 'Your citation requirements',
+    depositorRequirements: 'Your depositor requirements',
+    conditions: 'Your conditions',
+    disclaimer: 'Your disclaimer'
+  }
+}
+
+updateDatasetLicense.execute(datasetId, customPayload)
+```
+
+_See [use case](../src/datasets/domain/useCases/UpdateDatasetLicense.ts) implementation_.
+
 The `datasetId` parameter can be a string, for persistent identifiers, or a number, for numeric identifiers.
 
 #### Publish a Dataset

src/datasets/domain/dtos/DatasetLicenseUpdateRequest.ts

@@ -0,0 +1,6 @@
+import { CustomTerms } from '../models/Dataset'
+
+export interface DatasetLicenseUpdateRequest {
+  name?: string
+  customTerms?: CustomTerms
+}

src/datasets/domain/repositories/IDatasetsRepository.ts

@@ -15,6 +15,7 @@ import { FormattedCitation } from '../models/FormattedCitation'
 import { DatasetTemplate } from '../models/DatasetTemplate'
 import { DatasetType } from '../models/DatasetType'
 import { TermsOfAccess } from '../models/Dataset'
+import { DatasetLicenseUpdateRequest } from '../dtos/DatasetLicenseUpdateRequest'
 import { DatasetTypeDTO } from '../dtos/DatasetTypeDTO'
 
 export interface IDatasetsRepository {
@@ -97,4 +98,8 @@ export interface IDatasetsRepository {
   ): Promise<void>
   deleteDatasetType(datasetTypeId: number): Promise<void>
   updateTermsOfAccess(datasetId: number | string, termsOfAccess: TermsOfAccess): Promise<void>
+  updateDatasetLicense(
+    datasetId: number | string,
+    payload: DatasetLicenseUpdateRequest
+  ): Promise<void>
 }

src/datasets/domain/useCases/UpdateDatasetLicense.ts

@@ -0,0 +1,23 @@
+import { UseCase } from '../../../core/domain/useCases/UseCase'
+import { IDatasetsRepository } from '../repositories/IDatasetsRepository'
+import { DatasetLicenseUpdateRequest } from '../dtos/DatasetLicenseUpdateRequest'
+
+export class UpdateDatasetLicense implements UseCase<void> {
+  private readonly datasetsRepository: IDatasetsRepository
+
+  constructor(datasetsRepository: IDatasetsRepository) {
+    this.datasetsRepository = datasetsRepository
+  }
+
+  /**
+   * Updates the license of a dataset by applying it to the draft version. If no draft exists, a new one is created by the API.
+   * Supports either predefined license by name or custom terms of use and access.
+   *
+   * @param {number | string} datasetId - The dataset identifier, which can be a string (for persistent identifiers), or a number (for numeric identifiers).
+   * @param {DatasetLicenseUpdateRequest} payload - The payload containing the license name or custom terms of use and access.
+   * @returns {Promise<void>} - This method does not return anything upon successful completion.
+   */
+  async execute(datasetId: number | string, payload: DatasetLicenseUpdateRequest): Promise<void> {
+    return this.datasetsRepository.updateDatasetLicense(datasetId, payload)
+  }
+}

src/datasets/index.ts

@@ -33,6 +33,7 @@ import { DeleteDatasetType } from './domain/useCases/DeleteDatasetType'
 import { GetDatasetCitationInOtherFormats } from './domain/useCases/GetDatasetCitationInOtherFormats'
 import { GetDatasetTemplates } from './domain/useCases/GetDatasetTemplates'
 import { UpdateTermsOfAccess } from './domain/useCases/UpdateTermsOfAccess'
+import { UpdateDatasetLicense } from './domain/useCases/UpdateDatasetLicense'
 
 const datasetsRepository = new DatasetsRepository()
 
@@ -82,6 +83,7 @@ const deleteDatasetType = new DeleteDatasetType(datasetsRepository)
 const getDatasetCitationInOtherFormats = new GetDatasetCitationInOtherFormats(datasetsRepository)
 const getDatasetTemplates = new GetDatasetTemplates(datasetsRepository)
 const updateTermsOfAccess = new UpdateTermsOfAccess(datasetsRepository)
+const updateDatasetLicense = new UpdateDatasetLicense(datasetsRepository)
 
 export {
   getDataset,
@@ -112,7 +114,8 @@ export {
   addDatasetType,
   linkDatasetTypeWithMetadataBlocks,
   setAvailableLicensesForDatasetType,
-  deleteDatasetType
+  deleteDatasetType,
+  updateDatasetLicense
 }
 export { DatasetNotNumberedVersion } from './domain/models/DatasetNotNumberedVersion'
 export { DatasetUserPermissions } from './domain/models/DatasetUserPermissions'
@@ -139,6 +142,7 @@ export {
   DatasetMetadataBlockValuesDTO,
   DatasetMetadataChildFieldValueDTO
 } from './domain/dtos/DatasetDTO'
+export { DatasetLicenseUpdateRequest } from './domain/dtos/DatasetLicenseUpdateRequest'
 export { DatasetDeaccessionDTO } from './domain/dtos/DatasetDeaccessionDTO'
 export { CreatedDatasetIdentifiers } from './domain/models/CreatedDatasetIdentifiers'
 export { VersionUpdateType } from './domain/models/Dataset'

src/datasets/infra/repositories/DatasetsRepository.ts

@@ -31,6 +31,7 @@ import { transformDatasetTemplatePayloadToDatasetTemplate } from './transformers
 import { DatasetType } from '../../domain/models/DatasetType'
 import { TermsOfAccess } from '../../domain/models/Dataset'
 import { transformTermsOfAccessToUpdatePayload } from './transformers/termsOfAccessTransformers'
+import { DatasetLicenseUpdateRequest } from '../../domain/dtos/DatasetLicenseUpdateRequest'
 import { DatasetTypeDTO } from '../../domain/dtos/DatasetTypeDTO'
 
 export interface GetAllDatasetPreviewsQueryParams {
@@ -500,4 +501,18 @@ export class DatasetsRepository extends ApiRepository implements IDatasetsReposi
         throw error
       })
   }
+
+  public async updateDatasetLicense(
+    datasetId: number | string,
+    payload: DatasetLicenseUpdateRequest
+  ): Promise<void> {
+    return this.doPut(
+      this.buildApiEndpoint(this.datasetsResourceName, 'license', datasetId),
+      payload
+    )
+      .then(() => undefined)
+      .catch((error) => {
+        throw error
+      })
+  }
 }

test/functional/datasets/UpdateDatasetLicense.test.ts

@@ -0,0 +1,72 @@
+import {
+  ApiConfig,
+  createDataset,
+  getDataset,
+  publishDataset,
+  updateDatasetLicense,
+  DatasetLicenseUpdateRequest
+} from '../../../src'
+import { TestConstants } from '../../testHelpers/TestConstants'
+import { DataverseApiAuthMechanism } from '../../../src/core/infra/repositories/ApiConfig'
+import {
+  waitForNoLocks,
+  deleteUnpublishedDatasetViaApi,
+  deletePublishedDatasetViaApi
+} from '../../testHelpers/datasets/datasetHelper'
+import { DatasetNotNumberedVersion, VersionUpdateType } from '../../../src/datasets'
+
+describe('execute', () => {
+  beforeEach(async () => {
+    ApiConfig.init(
+      TestConstants.TEST_API_URL,
+      DataverseApiAuthMechanism.API_KEY,
+      process.env.TEST_API_KEY
+    )
+  })
+
+  test('should update the license of a draft dataset (predefined by name)', async () => {
+    const created = await createDataset.execute(TestConstants.TEST_NEW_DATASET_DTO)
+
+    const payload: DatasetLicenseUpdateRequest = { name: 'CC BY 4.0' }
+    const response = await updateDatasetLicense.execute(created.numericId, payload)
+
+    expect(response).toBeUndefined()
+
+    const after = await getDataset.execute(
+      created.numericId,
+      DatasetNotNumberedVersion.DRAFT,
+      false,
+      false
+    )
+    expect(after.license?.name).toBe('CC BY 4.0')
+
+    await deleteUnpublishedDatasetViaApi(created.numericId)
+  })
+
+  test('should update the license of a published dataset (custom terms creates draft)', async () => {
+    const created = await createDataset.execute(TestConstants.TEST_NEW_DATASET_DTO)
+
+    await publishDataset.execute(created.numericId, VersionUpdateType.MAJOR)
+    await waitForNoLocks(created.numericId, 10)
+
+    const payload: DatasetLicenseUpdateRequest = {
+      customTerms: {
+        termsOfUse: 'Updated terms of use (functional test)'
+      }
+    }
+    const response = await updateDatasetLicense.execute(created.numericId, payload)
+
+    expect(response).toBeUndefined()
+
+    const draft = await getDataset.execute(
+      created.numericId,
+      DatasetNotNumberedVersion.DRAFT,
+      false,
+      false
+    )
+    expect(draft.license).toBeUndefined()
+    expect(draft.termsOfUse.customTerms?.termsOfUse).toBe('Updated terms of use (functional test)')
+
+    await deletePublishedDatasetViaApi(created.persistentId)
+  })
+})