Merge branch 'master' of github.com:IQSS/dataverse-client-javascript

Author: tainguyenbui

README.md

@@ -61,6 +61,10 @@ http://demo.dataverse.org/api/datasets/389608/versions/1
 
 `public async publishDataset(datasetId: string, versionUpgradeType: DatasetVersionUpgradeType = DatasetVersionUpgradeType.MAJOR): Promise<AxiosResponse> {`
 
+`public async updateDataset(datasetId: string, datasetInformation: BasicDatasetInformation): Promise<AxiosResponse> {`
+
+`public async deleteDataset(datasetId: string): Promise<AxiosResponse> {`
+
 ## Build project
 
 In order to build the project, we need to run the following command:
@@ -108,4 +112,4 @@ Automated publishing of versions could be automated when merging to master. Belo
 5. Publish, `npm publish`
 
 ## Contributing
-[If you are interested in contributing, please click here](/CONTRIBUTING.md)
+[If you are interested in contributing, please click here](/CONTRIBUTING.md)

src/dataverseClient.ts

@@ -173,6 +173,23 @@ export class DataverseClient {
     return this.postRequest(url, '')
   }
 
+  public async updateDataset(datasetId: string, datasetInformation: BasicDatasetInformation): Promise<AxiosResponse> {
+    const url = `${this.host}/api/datasets/:persistentId/versions/:draft?persistentId=${datasetId}`
+    const payload: any = DatasetUtil.mapBasicDatasetInformation(datasetInformation)
+
+    return this.putRequest(url, payload.datasetVersion, {
+      headers: {
+        ...this.getHeaders(),
+        'Content-Type': 'application/json'
+      }
+    })
+  }
+
+  public async deleteDataset(datasetId: string): Promise<AxiosResponse> {
+    const url = `${this.host}/api/datasets/:persistentId/destroy/?persistentId=${datasetId}`
+    return this.deleteRequest(url)
+  }
+
   private async getRequest(url: string, options: { params?: object, headers?: DataverseHeaders, responseType?: ResponseType } = { headers: this.getHeaders() }): Promise<AxiosResponse> {
     return await axios.get(url, options).catch(error => {
       throw new DataverseException(error.response.status, error.response.data ? error.response.data.message : '')
@@ -185,6 +202,18 @@ export class DataverseClient {
     })
   }
 
+  private async putRequest(url: string, data: string | object, options: { params?: object, headers?: DataverseHeaders } = { headers: this.getHeaders() }): Promise<AxiosResponse> {
+    return await axios.put(url, JSON.stringify(data), options).catch(error => {
+      throw new DataverseException(error.response.status, error.response.data ? error.response.data.message : '')
+    })
+  }
+
+  private async deleteRequest(url: string, options: { params?: object, headers?: DataverseHeaders, responseType?: ResponseType } = { headers: this.getHeaders() }): Promise<AxiosResponse> {
+    return await axios.delete(url, options).catch(error => {
+      throw new DataverseException(error.response.status, error.response.data ? error.response.data.message : '')
+    })
+  }
+
   private getHeaders(): DataverseHeaders {
     return {
       'X-Dataverse-key': this.apiToken ? this.apiToken : ''
@@ -205,4 +234,4 @@ export class DataverseClient {
       fq: options.fq
     }
   }
-}
+}

test/dataverseClient.spec.ts

@@ -4,7 +4,7 @@ import { expect } from 'chai'
 import axios from 'axios'
 import request from 'request-promise'
 import path from 'path'
-import { internet, random, system } from 'faker'
+import { internet, random, system, name, date } from 'faker'
 import { DataverseException } from '../src/exceptions/dataverseException'
 import { DataverseMetricType } from '../src/@types/dataverseMetricType'
 import { DatasetSubjects } from '../src/@types/datasetSubjects'
@@ -27,7 +27,9 @@ describe('DataverseClient', () => {
 
   let axiosGetStub: SinonStub
   let axiosPostStub: SinonStub
+  let axiosPutStub: SinonStub
   let requestPostStub: SinonStub
+  let axiosDeleteStub: SinonStub
 
   let mapBasicDatasetInformationStub: SinonStub
   let getErrorMessageStub: SinonStub
@@ -62,7 +64,9 @@ describe('DataverseClient', () => {
 
     axiosGetStub = sandbox.stub(axios, 'get').resolves(mockResponse)
     axiosPostStub = sandbox.stub(axios, 'post').resolves(mockResponse)
+    axiosPutStub = sandbox.stub(axios, 'put').resolves(mockResponse)
     requestPostStub = sandbox.stub(request, 'post').resolves(mockResponse)
+    axiosDeleteStub = sandbox.stub(axios, 'delete').resolves(mockResponse)
 
     mapBasicDatasetInformationStub = sandbox.stub(DatasetUtil, 'mapBasicDatasetInformation').returns(mockDatasetInformation)
     getErrorMessageStub = sandbox.stub(ResponseUtil, 'getErrorMessage').returns(mockErrorMessage)
@@ -1480,5 +1484,46 @@ describe('DataverseClient', () => {
         expect(error.errorCode).to.be.equal(errorCode)
       })
     })
+
   })
-})
+
+  describe('updateDataset()', () => {
+    it('should call axios with expected url', async () => {
+      const datasetId = random.number().toString()
+      const datasetInformation: BasicDatasetInformation = {
+        title: random.words(),
+        descriptions: [{ text: random.words(), date: date.recent().toString() }],
+        authors: [
+          {
+            fullname: name.findName()
+          }
+        ],
+        contact: [{ email: internet.email(), fullname: name.findName() }],
+        subject: [DatasetSubjects.AGRICULTURAL_SCIENCE]
+      }
+
+      await client.updateDataset(datasetId, datasetInformation)
+
+      assert.calledOnce(axiosPutStub)
+      const payload: any = DatasetUtil.mapBasicDatasetInformation(datasetInformation)
+      assert.calledWithExactly(axiosPutStub, `${host}/api/datasets/:persistentId/versions/:draft?persistentId=${datasetId}`, JSON.stringify(payload.datasetVersion), {
+        headers: {
+          'X-Dataverse-key': apiToken,
+          'Content-Type': 'application/json'
+        }
+      })
+    })
+  })
+
+  describe('deleteDataset()', () => {
+    it('should call axios with expected url', async () => {
+      const datasetId: string = random.number().toString()
+
+      await client.deleteDataset(datasetId)
+
+      assert.calledOnce(axiosDeleteStub)
+      assert.calledWithExactly(axiosDeleteStub, `${host}/api/datasets/:persistentId/destroy/?persistentId=${datasetId}`, { headers: { 'X-Dataverse-key': apiToken } })
+    })
+  })
+
+})