feat: support search base on nftType

nevermined-io · Oct 4, 2023 · c4d50f8 · c4d50f8
1 parent 222bec9
commit c4d50f8
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 14 deletions.
diff --git a/integration/external/Datasets.e2e.test.ts b/integration/external/Datasets.e2e.test.ts
@@ -1,6 +1,14 @@
 import { assert } from 'chai'
 import { decodeJwt, JWTPayload } from 'jose'
-import { Account, DDO, MetaData, Nevermined, AssetPrice, NFTAttributes } from '../../src'
+import {
+  Account,
+  DDO,
+  MetaData,
+  Nevermined,
+  AssetPrice,
+  NFTAttributes,
+  NeverminedNFT721Type,
+} from '../../src'
 import { EscrowPaymentCondition, TransferNFT721Condition, Token } from '../../src/keeper'
 import { config } from '../config'
 import { generateMetadata, getMetadata } from '../utils'
@@ -322,28 +330,41 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
 
   describe('As a user I want to be able to search DDOs by subscriptions', () => {
     it('should be able to retrieve the subscriptionDDO by contractAddress', async () => {
-      const result = await nevermined.search.bySubscriptionContractAddress(subscriptionNFT.address)
+      const result = await nevermined.search.bySubscriptionContractAddress(
+        subscriptionNFT.address,
+        NeverminedNFT721Type.nft721Subscription,
+      )
       assert.equal(result.totalResults.value, 1)
     })
 
     it('should be able to retrieve subscriptions created', async () => {
-      const result = await nevermined.search.subscriptionsCreated(publisher)
+      const result = await nevermined.search.subscriptionsCreated(
+        publisher,
+        NeverminedNFT721Type.nft721Subscription,
+      )
       assert.isAbove(result.totalResults.value, 1)
 
       const dids = result.results.map((ddo) => ddo.id)
       assert.include(dids, subscriptionDDO.id)
     })
 
     it('should be able to retrieve subscriptions purchased', async () => {
-      const result = await nevermined.search.subscriptionsPurchased(subscriber)
+      const result = await nevermined.search.subscriptionsPurchased(
+        subscriber,
+        NeverminedNFT721Type.nft721Subscription,
+      )
       assert.isAbove(result.totalResults.value, 1)
 
       const dids = result.results.map((ddo) => ddo.id)
       assert.include(dids, subscriptionDDO.id)
     })
 
     it('should be able to retrieve subscriptions published filtering by tags', async () => {
-      const result = await nevermined.search.subscriptionsCreated(publisher, tagsFilter)
+      const result = await nevermined.search.subscriptionsCreated(
+        publisher,
+        NeverminedNFT721Type.nft721Subscription,
+        tagsFilter,
+      )
 
       assert.isAbove(result.totalResults.value, 1)
 
@@ -357,13 +378,21 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
     })
 
     it('should not be able to retrieve any subscriptions published filtering by tags which not exist', async () => {
-      const result = await nevermined.search.subscriptionsCreated(publisher, tagsFilter2)
+      const result = await nevermined.search.subscriptionsCreated(
+        publisher,
+        NeverminedNFT721Type.nft721Subscription,
+        tagsFilter2,
+      )
 
       assert.equal(result.totalResults.value, 0)
     })
 
     it('should be able to retrieve subscriptions purchased filtering by tags', async () => {
-      const result = await nevermined.search.subscriptionsPurchased(subscriber, tagsFilter)
+      const result = await nevermined.search.subscriptionsPurchased(
+        subscriber,
+        NeverminedNFT721Type.nft721Subscription,
+        tagsFilter,
+      )
       assert.isAbove(result.totalResults.value, 1)
 
       assert.isTrue(
@@ -376,7 +405,11 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
     })
 
     it('should not be able to retrieve not subscriptions purchased filtering by tags which do not exist', async () => {
-      const result = await nevermined.search.subscriptionsPurchased(subscriber, tagsFilter2)
+      const result = await nevermined.search.subscriptionsPurchased(
+        subscriber,
+        NeverminedNFT721Type.nft721Subscription,
+        tagsFilter2,
+      )
       assert.equal(result.totalResults.value, 0)
     })
 

diff --git a/integration/external/Services.e2e.test.ts b/integration/external/Services.e2e.test.ts
@@ -8,6 +8,7 @@ import {
   AssetPrice,
   NFTAttributes,
   ResourceAuthentication,
+  NeverminedNFT721Type,
 } from '../../src'
 import { EscrowPaymentCondition, TransferNFT721Condition, Token } from '../../src/keeper'
 import { config } from '../config'
@@ -456,20 +457,29 @@ describe('Gate-keeping of Web Services using NFT ERC-721 End-to-End', () => {
 
   describe('As a user I want to be able to search DDOs by subscriptions', () => {
     it('should be able to retrieve the subscriptionDDO by contractAddress', async () => {
-      const result = await nevermined.search.bySubscriptionContractAddress(subscriptionNFT.address)
+      const result = await nevermined.search.bySubscriptionContractAddress(
+        subscriptionNFT.address,
+        NeverminedNFT721Type.nft721Subscription,
+      )
       assert.equal(result.totalResults.value, 1)
     })
 
     it('should be able to retrieve subscriptions created', async () => {
-      const result = await nevermined.search.subscriptionsCreated(publisher)
+      const result = await nevermined.search.subscriptionsCreated(
+        publisher,
+        NeverminedNFT721Type.nft721Subscription,
+      )
       assert.isAbove(result.totalResults.value, 1)
 
       const dids = result.results.map((ddo) => ddo.id)
       assert.include(dids, subscriptionDDO.id)
     })
 
     it('should be able to retrieve subscriptions purchased', async () => {
-      const result = await nevermined.search.subscriptionsPurchased(subscriber)
+      const result = await nevermined.search.subscriptionsPurchased(
+        subscriber,
+        NeverminedNFT721Type.nft721Subscription,
+      )
       assert.isAbove(result.totalResults.value, 1)
 
       const dids = result.results.map((ddo) => ddo.id)

diff --git a/src/nevermined/api/SearchApi.ts b/src/nevermined/api/SearchApi.ts
@@ -156,12 +156,14 @@ export class SearchApi extends Instantiable {
    * @param customNestedQueries - Custom nested queries to add to the search
    * @param page
    * @param sort - The sort order
+   * @param nftType - The nftType
    * @param appId - The appId used to filter the results
    *
    * @returns {@link Promise<QueryResult>}
    */
   public async bySubscriptionContractAddress(
     contractAddress: string,
+    nftType: string,
     customNestedQueries?: SearchQuery['query'][],
     offset = 100,
     page = 1,
@@ -178,7 +180,7 @@ export class SearchApi extends Instantiable {
                 { match: { 'service.type': 'metadata' } },
                 {
                   match: {
-                    'service.attributes.main.nftType': NeverminedNFT721Type.nft721Subscription,
+                    'service.attributes.main.nftType': nftType,
                   },
                 },
               ],
@@ -234,12 +236,14 @@ export class SearchApi extends Instantiable {
    * @param offset - The number of results to return
    * @param page
    * @param sort - The sort order
+   * @param nftType - The nftType
    * @param appId - The appId used to filter the results
    *
    * @returns {@link Promise<QueryResult>}
    */
   public async subscriptionsCreated(
     account: Account,
+    nftType: string,
     customNestedQueries?: SearchQuery['query'][],
     offset = 100,
     page = 1,
@@ -256,7 +260,12 @@ export class SearchApi extends Instantiable {
                 { match: { 'service.type': 'metadata' } },
                 {
                   match: {
-                    'service.attributes.main.nftType': NeverminedNFT721Type.nft721Subscription,
+                    'service.attributes.main.nftType': nftType,
+                  },
+                },
+                {
+                  match: {
+                    'service.attributes.main.type': 'subscription',
                   },
                 },
               ],
@@ -299,12 +308,14 @@ export class SearchApi extends Instantiable {
    * @param offset - The number of results to return
    * @param page
    * @param sort - The sort order
+   * @param nftType - The nftType
    * @param appId - The appId used to filter the results
    *
    * @returns {@link Promise<QueryResult>}
    */
   public async subscriptionsPurchased(
     account: Account,
+    nftType: string,
     customNestedQueries?: SearchQuery['query'][],
     offset = 100,
     page = 1,
@@ -343,7 +354,12 @@ export class SearchApi extends Instantiable {
                 { match: { 'service.type': 'metadata' } },
                 {
                   match: {
-                    'service.attributes.main.nftType': NeverminedNFT721Type.nft721Subscription,
+                    'service.attributes.main.nftType': nftType,
+                  },
+                },
+                {
+                  match: {
+                    'service.attributes.main.type': 'subscription',
                   },
                 },
               ],