add subscription functionalities

Author: spielcrypto

catalog/src/catalog.tsx

@@ -208,7 +208,18 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
       }
     },
 
-    getPublishedSubscriptions: async (): Promise<SubscriptionsAndServicesDDOs[]> => {
+    getPublishedSubscriptions: async (): Promise<DDO[]> => {
+      try {
+        const account = await getCurrentAccount(sdk)
+        const query = await sdk.search.subscriptionsCreated(account)
+        return query.results
+      } catch {
+        verbose && Logger.error(error)
+        return []
+      }
+    },
+
+    getPublishedSubscriptionsAndServices: async (): Promise<SubscriptionsAndServicesDDOs[]> => {
       try {
         const account = await getCurrentAccount(sdk)
         const query = await sdk.search.subscriptionsCreated(account)
@@ -219,7 +230,18 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
       }
     },
 
-    getPurchasedSubscriptions: async (): Promise<SubscriptionsAndServicesDDOs[]> => {
+    getPurchasedSubscriptions: async (): Promise<DDO[]> => {
+      try {
+        const account = await getCurrentAccount(sdk)
+        const query = await sdk.search.subscriptionsPurchased(account)
+        return query.results
+      } catch (error) {
+        verbose && Logger.error(error)
+        return []
+      }
+    },
+
+    getPurchasedSubscriptionsAndServices: async (): Promise<SubscriptionsAndServicesDDOs[]> => {
       try {
         const account = await getCurrentAccount(sdk)
         const query = await sdk.search.subscriptionsPurchased(account)
@@ -230,6 +252,16 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
       }
     },
 
+    getAssociatedServices: async (did: string): Promise<DDO[]> => {
+      try {
+        const query = await sdk.search.servicesBySubscription(did)
+        return query.results
+      } catch (error) {
+        verbose && Logger.error(error)
+        return []
+      }
+    },
+
     isAssetHolder: async (
       did: string,
       walletAddress: string,

catalog/src/types/index.ts

@@ -403,15 +403,36 @@ export interface AccountModule {
    */
   getCollection: (address: string) => Promise<DID[]>
   /**
-   * Get all the published subscriptions and services associated from the wallet address passed
+   * Get only published Subscriptions
    * @param address the address which published the subscription returned
+   * @returns published subscriptions
+   */
+  getPublishedSubscriptions: (address: string) => Promise<DDO[]>
+  /**
+   * Get all the services associated
+   * @param address the address which published the subscription returned
+   * @returns associated services to subscriptions
+   */
+  getAssociatedServices: (did: string) => Promise<DDO[]>
+  /**
+   * Get all the published subscriptions and services associated from the wallet address passed
+   * Get only published Subscriptions
+   * @param did the did of the subscription
+   * @returns published subscriptions and service
+   */
+  getPublishedSubscriptionsAndServices: (address: string) => Promise<SubscriptionsAndServicesDDOs[]>
+  /**
+   * Get only purchased Subscriptions
+   * @param address the address which purchased the subscription returned
+   * @returns purchased subscriptions
    */
-  getPublishedSubscriptions: (address: string) => Promise<SubscriptionsAndServicesDDOs[]>
+  getPurchasedSubscriptions: (address: string) => Promise<DDO[]>
   /**
    * Get all the purchased subscriptions and services associated from the wallet address passed
    * @param address the address which published the subscription returned
+   * @returns purchased subscriptions and services
    */
-  getPurchasedSubscriptions: (address: string) => Promise<SubscriptionsAndServicesDDOs[]>
+  getPurchasedSubscriptionsAndServices: (address: string) => Promise<SubscriptionsAndServicesDDOs[]>
   /**
    * Generate a token for authentication in the Marketplace API
    * @returns The new generated token

catalog/unit-tests/catalog/catalog.account.spec.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'
 import { renderHook, waitFor } from '@testing-library/react'
 import { generateTestingUtils } from 'eth-testing'
 import { appConfig } from '../config'
-import { Catalog, AuthToken, SubscriptionsAndServicesDDOs } from '../../src'
+import { Catalog, AuthToken, SubscriptionsAndServicesDDOs, DDO } from '../../src'
 import jwt from 'jsonwebtoken'
 import { ddo, ddo2, ddo3, walletAddress, nevermined } from '../mockups'
 import { faker } from '@faker-js/faker'
@@ -532,16 +532,42 @@ describe('Nevermined account', () => {
   })
 
   it('should get all the subscriptions published by the address passed', async () =>{
-    const sdk = await jest.requireActual('../mockups').nevermined.getInstance()
-    jest.spyOn(nevermined, 'getInstance').mockResolvedValue({
-      ...sdk,
-      assets: {
-        ...sdk.assets,
-        resolve: (id: string) => [ddo, ddo2, ddo3].find(item => item.id === id)
+    const { result } = renderHook(
+      () => {
+        const { account, isLoadingSDK, updateSDK } = Catalog.useNevermined()
+        const [ subscriptions, setSubscriptions ] = useState<DDO[]>([])
+
+        useEffect(() => {
+          if (isLoadingSDK) {
+            appConfig.web3Provider = testingUtils.getProvider()
+            updateSDK(appConfig)
+            return
+          }
+
+          (async () => {
+            try {
+              const result = await account.getPublishedSubscriptions(walletAddress)
+
+              setSubscriptions([...result])
+            } catch (error: any) {
+              console.error(error.message)
+            }
+          })()
+        }, [isLoadingSDK])
+
+        return subscriptions
+      },
+      {
+        wrapper: wrapperProvider
       }
-      
+    )
+
+    await waitFor(() => {
+      expect(result.current).toStrictEqual([ddo])
     })
+  })
 
+  it('should get all the subscriptions published and services by the address passed', async () =>{
     const { result } = renderHook(
       () => {
         const { account, isLoadingSDK, updateSDK } = Catalog.useNevermined()
@@ -556,7 +582,7 @@ describe('Nevermined account', () => {
 
           (async () => {
             try {
-              const result = await account.getPublishedSubscriptions(walletAddress)
+              const result = await account.getPublishedSubscriptionsAndServices(walletAddress)
 
               setSubscriptions([...result])
             } catch (error: any) {
@@ -581,16 +607,42 @@ describe('Nevermined account', () => {
   })
 
   it('should get all the subscriptions purchased by the address passed', async () =>{
-    const sdk = await jest.requireActual('../mockups').nevermined.getInstance()
-    jest.spyOn(nevermined, 'getInstance').mockResolvedValue({
-      ...sdk,
-      assets: {
-        ...sdk.assets,
-        resolve: (id: string) => [ddo, ddo2, ddo3].find(item => item.id === id)
+    const { result } = renderHook(
+      () => {
+        const { account, isLoadingSDK, updateSDK } = Catalog.useNevermined()
+        const [ subscriptions, setSubscriptions ] = useState<DDO[]>([])
+
+        useEffect(() => {
+          if (isLoadingSDK) {
+            appConfig.web3Provider = testingUtils.getProvider()
+            updateSDK(appConfig)
+            return
+          }
+
+          (async () => {
+            try {
+              const result = await account.getPurchasedSubscriptions(walletAddress)
+
+              setSubscriptions([...result])
+            } catch (error: any) {
+              console.error(error.message)
+            }
+          })()
+        }, [isLoadingSDK])
+
+        return subscriptions
+      },
+      {
+        wrapper: wrapperProvider
       }
-      
+    )
+
+    await waitFor(() => {
+      expect(result.current).toStrictEqual([ddo])
     })
+  })
 
+  it('should get all the subscriptions purchased and services by the address passed', async () =>{
     const { result } = renderHook(
       () => {
         const { account, isLoadingSDK, updateSDK } = Catalog.useNevermined()
@@ -605,7 +657,7 @@ describe('Nevermined account', () => {
 
           (async () => {
             try {
-              const result = await account.getPurchasedSubscriptions(walletAddress)
+              const result = await account.getPurchasedSubscriptionsAndServices(walletAddress)
 
               setSubscriptions([...result])
             } catch (error: any) {
@@ -628,4 +680,40 @@ describe('Nevermined account', () => {
       }])
     })
   })
+
+  it('should get all the services associated to the subscription id passed', async () =>{
+    const { result } = renderHook(
+      () => {
+        const { account, isLoadingSDK, updateSDK } = Catalog.useNevermined()
+        const [ services, setServices ] = useState<DDO[]>([])
+
+        useEffect(() => {
+          if (isLoadingSDK) {
+            appConfig.web3Provider = testingUtils.getProvider()
+            updateSDK(appConfig)
+            return
+          }
+
+          (async () => {
+            try {
+              const result = await account.getAssociatedServices(ddo.id)
+
+              setServices([...result])
+            } catch (error: any) {
+              console.error(error.message)
+            }
+          })()
+        }, [isLoadingSDK])
+
+        return services
+      },
+      {
+        wrapper: wrapperProvider
+      }
+    )
+
+    await waitFor(() => {
+      expect(result.current).toStrictEqual([ddo2, ddo3])
+    })
+  })
 })