diff --git a/src/aquarius/Aquarius.ts b/src/aquarius/Aquarius.ts index c8cc63a..fd619a2 100644 --- a/src/aquarius/Aquarius.ts +++ b/src/aquarius/Aquarius.ts @@ -5,7 +5,6 @@ import { EditableMetaData } from '../ddo/MetaData' import { Logger } from '../utils' import { WebServiceConnector } from '../ocean/utils/WebServiceConnector' - const apiPath = '/api/v1/aquarius/assets/ddo' export interface QueryResult { @@ -262,7 +261,6 @@ export class Aquarius { return result } - public async editMetadata( did: DID | string, newMetadata: EditableMetaData, @@ -271,17 +269,15 @@ export class Aquarius { ): Promise { did = did && DID.parse(did) const fullUrl = `${this.url}${apiPath}/metadata/update/${did.getDid()}` - let data = Object() - if (newMetadata.description != null) - data.description = newMetadata.description - if (newMetadata.title != null) - data.title = newMetadata.title + const data = Object() + if (newMetadata.description != null) data.description = newMetadata.description + if (newMetadata.title != null) data.title = newMetadata.title if (newMetadata.servicePrices != null) data.servicePrices = newMetadata.servicePrices if (newMetadata.links != null) { data.links = [] for (const [name, url] of Object.entries(newMetadata.links)) { - let asample = Object() + const asample = Object() asample.name = name asample.url = url asample.type = 'sample' @@ -291,10 +287,7 @@ export class Aquarius { data.updated = updated data.signature = signature const result = await this.fetch - .put( - fullUrl, - JSON.stringify(data) - ) + .put(fullUrl, JSON.stringify(data)) .then((response: any) => { if (response.ok) { return response.text @@ -350,7 +343,6 @@ export class Aquarius { return result } - public getServiceEndpoint(did: DID) { return `${this.url}/api/v1/aquarius/assets/ddo/did:op:${did.getId()}` } diff --git a/src/ddo/MetaData.ts b/src/ddo/MetaData.ts index 01aa38e..6654eae 100644 --- a/src/ddo/MetaData.ts +++ b/src/ddo/MetaData.ts @@ -277,14 +277,14 @@ export interface MetaData { curation?: Curation } -export interface ServicePrices{ - serviceIndex: number, +export interface ServicePrices { + serviceIndex: number price: string } -export interface EditableMetaData{ - description?: string, - title?: string, - links?: { [name: string]: string }[], +export interface EditableMetaData { + description?: string + title?: string + links?: { [name: string]: string }[] servicePrices?: ServicePrices[] } diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts index 0a52d84..477ab0c 100644 --- a/src/ocean/OceanAssets.ts +++ b/src/ocean/OceanAssets.ts @@ -395,9 +395,9 @@ export class OceanAssets extends Instantiable { oldDdo.updated, account ) - let result=null + let result = null if (signature != null) - result=await this.ocean.aquarius.editMetadata( + result = await this.ocean.aquarius.editMetadata( did, newMetadata, oldDdo.updated, @@ -407,17 +407,14 @@ export class OceanAssets extends Instantiable { return result } - public async retire( - did: string, - account: Account - ): Promise { + public async retire(did: string, account: Account): Promise { const oldDdo = await this.ocean.aquarius.retrieveDDO(did) // get a signature const signature = await this.ocean.utils.signature.signForAquarius( oldDdo.updated, account ) - let result=null + let result = null if (signature != null) result = await this.ocean.aquarius.retire(did, oldDdo.updated, signature) return result diff --git a/src/ocean/utils/WebServiceConnector.ts b/src/ocean/utils/WebServiceConnector.ts index 89cc4d3..49d9137 100644 --- a/src/ocean/utils/WebServiceConnector.ts +++ b/src/ocean/utils/WebServiceConnector.ts @@ -52,8 +52,7 @@ export class WebServiceConnector { 'Content-type': 'application/json' } }) - } - else { + } else { return this.fetch(url, { method: 'DELETE', headers: { @@ -61,7 +60,6 @@ export class WebServiceConnector { } }) } - } public async downloadFile( diff --git a/test/integration/ocean/AssetOwners.test.ts b/test/integration/ocean/AssetOwners.test.ts index 7e616d0..2a9eda3 100644 --- a/test/integration/ocean/AssetOwners.test.ts +++ b/test/integration/ocean/AssetOwners.test.ts @@ -80,7 +80,7 @@ describe('Asset Owners', () => { const { length: finalLength1 } = await ocean.assets.consumerAssets( account2.getId() ) - + assert.equal(finalLength1 - initialLength, 0) // Granting access try { @@ -92,7 +92,7 @@ describe('Asset Owners', () => { ).toString() ) ) - } catch { } + } catch {} await ocean.assets.order(ddo.id, account2) // Access granted const { length: finalLength2 } = await ocean.assets.consumerAssets( @@ -114,24 +114,26 @@ describe('Asset Owners', () => { it('should be able to update metadata', async () => { const { id } = await ocean.assets.create(metadata as any, account1) - - let newMetaData = {title: "New title", description: "New description"}; - await ocean.assets.editMetadata(id,newMetaData,account1) - + + const newMetaData = { title: 'New title', description: 'New description' } + await ocean.assets.editMetadata(id, newMetaData, account1) + const newDDO = await ocean.assets.resolve(id) - - assert.equal(newDDO['service'][0]['attributes']['main']['name'], "New title") - assert.equal(newDDO['service'][0]['attributes']['additionalInformation']['description'], "New description") + + assert.equal(newDDO.service[0].attributes.main.name, 'New title') + assert.equal( + newDDO.service[0].attributes.additionalInformation.description, + 'New description' + ) }) it('should be able to retire metadata', async () => { const { id } = await ocean.assets.create(metadata as any, account1) - - await ocean.assets.retire(id,account1) - + + await ocean.assets.retire(id, account1) + const newDDO = await ocean.assets.resolve(id) - + assert.equal(newDDO, null) - }) })