improvements in search subscriptions

Author: spielcrypto

catalog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/catalog",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {

catalog/src/catalog.tsx

@@ -228,23 +228,28 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
       }
     },
 
-    getPublishedSubscriptionsAndServices: async (searchOptions?: SearchOptions
+    getPublishedSubscriptionsAndServices: async (
+      searchOptionsSubscriptions?: SearchOptions,
+      searchOptionsServices?: SearchOptions
       ): Promise<SubscriptionsAndServicesDDOs[]> => {
       try {
         const account = await getCurrentAccount(sdk)
-        const query = await sdk.search.subscriptionsCreated(account, searchOptions?.customNestedQueries, searchOptions?.offset, searchOptions?.page, searchOptions?.sort, searchOptions?.appId)
-        return getSubscriptionsAndServices(query.results, sdk, searchOptions)
+        const query = await sdk.search.subscriptionsCreated(account, searchOptionsSubscriptions?.customNestedQueries, searchOptionsSubscriptions?.offset, searchOptionsSubscriptions?.page, searchOptionsSubscriptions?.sort, searchOptionsSubscriptions?.appId)
+        return getSubscriptionsAndServices(query.results, sdk, searchOptionsServices)
       } catch (error) {
         verbose && Logger.error(error)
         return []
       }
     },
 
-    getPublishedSubscriptionsAndDatasets: async (searchOptions?: SearchOptions): Promise<SubscriptionsAndDatasetsDDOs[]> => {
+    getPublishedSubscriptionsAndDatasets: async (
+      searchOptionsSubscriptions?: SearchOptions,
+      searchOptionsDatasets?: SearchOptions
+    ): Promise<SubscriptionsAndDatasetsDDOs[]> => {
       try {
         const account = await getCurrentAccount(sdk)
-        const query = await sdk.search.subscriptionsCreated(account, searchOptions?.customNestedQueries, searchOptions?.offset, searchOptions?.page, searchOptions?.sort, searchOptions?.appId)
-        return getSubscriptionsAndDatasets(query.results, sdk, searchOptions)
+        const query = await sdk.search.subscriptionsCreated(account, searchOptionsSubscriptions?.customNestedQueries, searchOptionsSubscriptions?.offset, searchOptionsSubscriptions?.page, searchOptionsSubscriptions?.sort, searchOptionsSubscriptions?.appId)
+        return getSubscriptionsAndDatasets(query.results, sdk, searchOptionsDatasets)
       } catch (error) {
         verbose && Logger.error(error)
         return []
@@ -262,23 +267,28 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
       }
     },
 
-    getPurchasedSubscriptionsAndServices: async (searchOptions?: SearchOptions
-      ): Promise<SubscriptionsAndServicesDDOs[]> => {
+    getPurchasedSubscriptionsAndServices: async (
+      searchOptionsSubscriptions?: SearchOptions,
+      searchOptionsServices?: SearchOptions
+    ): Promise<SubscriptionsAndServicesDDOs[]> => {
       try {
         const account = await getCurrentAccount(sdk)
-        const query = await sdk.search.subscriptionsPurchased(account, searchOptions?.customNestedQueries, searchOptions?.offset, searchOptions?.page, searchOptions?.sort, searchOptions?.appId)
-        return getSubscriptionsAndServices(query.results, sdk, searchOptions)
+        const query = await sdk.search.subscriptionsPurchased(account, searchOptionsSubscriptions?.customNestedQueries, searchOptionsSubscriptions?.offset, searchOptionsSubscriptions?.page, searchOptionsSubscriptions?.sort, searchOptionsSubscriptions?.appId)
+        return getSubscriptionsAndServices(query.results, sdk, searchOptionsServices)
       } catch (error) {
         verbose && Logger.error(error)
         return []
       }
     },
 
-    getPurchasedSubscriptionsAndDatasets: async (searchOptions?: SearchOptions): Promise<SubscriptionsAndDatasetsDDOs[]> => {
+    getPurchasedSubscriptionsAndDatasets: async (
+      searchOptionsSubscriptions?: SearchOptions,
+      searchOptionsDatasets?: SearchOptions
+    ): Promise<SubscriptionsAndDatasetsDDOs[]> => {
       try {
         const account = await getCurrentAccount(sdk)
-        const query = await sdk.search.subscriptionsPurchased(account, searchOptions?.customNestedQueries, searchOptions?.offset, searchOptions?.page, searchOptions?.sort, searchOptions?.appId)
-        return getSubscriptionsAndDatasets(query.results, sdk, searchOptions)
+        const query = await sdk.search.subscriptionsPurchased(account, searchOptionsSubscriptions?.customNestedQueries, searchOptionsSubscriptions?.offset, searchOptionsSubscriptions?.page, searchOptionsSubscriptions?.sort, searchOptionsSubscriptions?.appId)
+        return getSubscriptionsAndDatasets(query.results, sdk, searchOptionsDatasets)
       } catch (error) {
         verbose && Logger.error(error)
         return []

catalog/src/types/index.ts

@@ -305,7 +305,7 @@ export interface GenericOutput<T, E> {
  */
 export interface SearchOptions {
   /** custom nested queries to add in the search */
-  customNestedQueries: SearchQuery['query'][]
+  customNestedQueries?: SearchQuery['query'][]
   /** Number of results per page */
   offset?: number
   /** Number of page */
@@ -442,19 +442,23 @@ export interface AccountModule {
   getAssociatedDatasets: (did: string, searchOptions?: SearchOptions) => Promise<QueryResult>
   /**
    * Get all the published subscriptions and services associated from the wallet address passed
-   * @param searchOptions options for customize result
+   * @param searchOptionsSubscriptions options for customize result of Subscriptions
+   * @param searchOptionsServices options for customize result of Service
    * @returns published subscriptions and service
    */
   getPublishedSubscriptionsAndServices: (
-    searchOptions?: SearchOptions,
+    searchOptionsSubscriptions?: SearchOptions,
+    searchOptionsServices?: SearchOptions,
   ) => Promise<SubscriptionsAndServicesDDOs[]>
   /**
    * Get all the published subscriptions and datasets associated from the wallet address passed
-   * @param searchOptions options for customize result
+   * @param searchOptionsSubscriptions options for customize result of Subscriptions
+   * @param searchOptionsDatasets options for customize result of Datasets
    * @returns published subscriptions and its datasets
    */
   getPublishedSubscriptionsAndDatasets: (
-    searchOptions?: SearchOptions,
+    searchOptionsSubscriptions?: SearchOptions,
+    searchOptionsDatasets?: SearchOptions,
   ) => Promise<SubscriptionsAndDatasetsDDOs[]>
   /**
    * Get only purchased Subscriptions
@@ -464,19 +468,23 @@ export interface AccountModule {
   getPurchasedSubscriptions: (searchOptions?: SearchOptions) => Promise<QueryResult>
   /**
    * Get all the purchased subscriptions and services associated from the wallet address passed
-   * @param searchOptions options for customize result
+   * @param searchOptionsSubscriptions options for customize result of Subscriptions
+   * @param searchOptionsServices options for customize result of Service
    * @returns purchased subscriptions and services
    */
   getPurchasedSubscriptionsAndServices: (
-    searchOptions?: SearchOptions,
+    searchOptionsSubscriptions?: SearchOptions,
+    searchOptionsServices?: SearchOptions,
   ) => Promise<SubscriptionsAndServicesDDOs[]>
   /**
    * Get all the purchased subscriptions and datasets associated from the wallet address passed
-   * @param searchOptions options for customize result
+   * @param searchOptionsSubscriptions options for customize result of Subscriptions
+   * @param searchOptionsDatasets options for customize result of Datasets
    * @returns purchased subscriptions and its datasets
    */
   getPurchasedSubscriptionsAndDatasets: (
-    searchOptions?: SearchOptions,
+    searchOptionsSubscriptions?: SearchOptions,
+    searchOptionsDatasets?: SearchOptions,
   ) => Promise<SubscriptionsAndDatasetsDDOs[]>
   /**
    * Generate a token for authentication in the Marketplace API

providers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nevermined-io/providers",
   "private": false,
-  "version": "1.6.4",
+  "version": "1.6.5",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {