Merge pull request #126 from oceanprotocol/fix/ocean-assets

Fix/ocean assets

src/metadatastore/MetadataStore.ts

@@ -315,6 +315,20 @@ export class MetadataStore {
         return result
     }
 
+    public async getOwnerAssets(owner: string): Promise<DDO[]> {
+        const q = {
+            offset: 100,
+            page: 1,
+            query: {
+                'publicKey.owner': [owner]
+            },
+            sort: {
+                value: 1
+            }
+        } as SearchQuery
+        return (await this.queryMetadata(q)).results
+    }
+
     /**
      * Edit Metadata for a DDO.
      * @param  {did} string DID.

src/ocean/Assets.ts

@@ -167,27 +167,13 @@ export class Assets extends Instantiable {
         })
     }
 
-    /**
-     * Returns the owner of an asset.
-     * @param  {string} did Decentralized ID.
-     * @return {Promise<string>} Returns Account ID
-     */
-    public async owner(did: string): Promise<string> {
-        // TODO:
-        // const owner = await this.ocean.keeper.didRegistry.getDIDOwner(did)
-        // return owner
-        return ''
-    }
-
     /**
      * Returns the assets of a owner.
      * @param  {string} owner Owner address.
      * @return {Promise<string[]>} List of DIDs.
      */
-    public async ownerAssets(owner: string): Promise<string[]> {
-        // TODO:
-        // return this.ocean.keeper.didRegistry.getAttributesByOwner(owner)
-        return ['']
+    public async ownerAssets(owner: string): Promise<DDO[]> {
+        return this.ocean.metadatastore.getOwnerAssets(owner)
     }
 
     /**

test/integration/Marketplaceflow.test.ts

@@ -57,7 +57,7 @@ describe('Marketplace flow', () => {
                 web3
             )
             tokenAddress = await datatoken.create(blob, alice.getId())
-            console.log(blob)
+            assert(tokenAddress != null)
         })
 
         it('Generates metadata', async () => {
@@ -177,9 +177,13 @@ describe('Marketplace flow', () => {
                         tx.transactionHash,
                         tokenAddress,
                         bob,
-                        '~/my-datasets'
+                        './node_modules/my-datasets'
                     )
                 })
         })
+        it('owner can list there assets', async () => {
+            const assets = await ocean.assets.ownerAssets(alice.getId())
+            assert(assets.length > 0)
+        })
     })
 })