From aee246cf7a2a1a392a0a31c4a0701bd4051af51c Mon Sep 17 00:00:00 2001
From: mihaisc <mihai@oceanprotocol.com>
Date: Fri, 24 Sep 2021 14:32:14 +0300
Subject: [PATCH] fixed search syntax (#874)

* fixed search syntax

* fixed query structure

* fix search structure

* fix fetch algos

* fix published query

* fix published

* fix
---
 README.md                                     |  4 +--
 .../organisms/AssetActions/Compute/index.tsx  |  1 -
 .../Edit/FormEditComputeDataset.tsx           |  3 +-
 .../pages/Profile/History/PublishedList.tsx   |  2 +-
 src/utils/aquarius.ts                         | 31 ++++++++++++-------
 src/utils/compute.ts                          |  2 --
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 5c907ce6b..b5690963f 100644
--- a/README.md
+++ b/README.md
@@ -123,14 +123,12 @@ import { QueryResult } from '@oceanprotocol/lib/dist/node/metadatacache/Metadata
 import { queryMetadata } from '../../utils/aquarius'
 
 const queryLatest = {
-  page: 1,
-  offset: 9,
   query: {
     // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
 
     query_string: { query: `-isInPurgatory:true` }
   },
-  sort: { created: -1 }
+  sort: { created: 'desc' }
 }
 
 function Component() {
diff --git a/src/components/organisms/AssetActions/Compute/index.tsx b/src/components/organisms/AssetActions/Compute/index.tsx
index 014ed129e..14a8b0f79 100644
--- a/src/components/organisms/AssetActions/Compute/index.tsx
+++ b/src/components/organisms/AssetActions/Compute/index.tsx
@@ -153,7 +153,6 @@ export default function Compute({
     const algorithmQuery =
       trustedAlgorithmList.length > 0 ? `(${algoQuerry}) AND` : ``
     const query = {
-      offset: 500,
       query: {
         query_string: {
           query: `${algorithmQuery} service.attributes.main.type:algorithm AND chainId:${chainId} -isInPurgatory:true`
diff --git a/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx b/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx
index 5104fbf87..830abb675 100644
--- a/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx
+++ b/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx
@@ -38,13 +38,12 @@ export default function FormEditComputeDataset({
   ): Promise<AssetSelectionAsset[]> {
     const source = axios.CancelToken.source()
     const query = {
-      offset: 500,
       query: {
         query_string: {
           query: `service.attributes.main.type:algorithm AND chainId:${ddo.chainId} -isInPurgatory:true`
         }
       },
-      sort: { created: -1 }
+      sort: { created: 'desc' }
     }
     const querryResult = await queryMetadata(query, source.token)
     const datasetComputeService = ddo.findServiceByType('compute')
diff --git a/src/components/pages/Profile/History/PublishedList.tsx b/src/components/pages/Profile/History/PublishedList.tsx
index 651ec311b..f045ddeba 100644
--- a/src/components/pages/Profile/History/PublishedList.tsx
+++ b/src/components/pages/Profile/History/PublishedList.tsx
@@ -33,7 +33,7 @@ export default function PublishedList({
           accountId,
           chainIds,
           cancelTokenSource.token,
-          page,
+          page - 1,
           service
         )
         setQueryResult(result)
diff --git a/src/utils/aquarius.ts b/src/utils/aquarius.ts
index f65615880..c671ed0ce 100644
--- a/src/utils/aquarius.ts
+++ b/src/utils/aquarius.ts
@@ -23,11 +23,23 @@ export const MAXIMUM_NUMBER_OF_PAGES_WITH_RESULTS = 476
 function getQueryForAlgorithmDatasets(algorithmDid: string, chainId?: number) {
   return {
     query: {
-      query_string: {
-        query: `service.attributes.main.privacy.publisherTrustedAlgorithms.did:${algorithmDid} AND chainId:${chainId}`
+      bool: {
+        must: [
+          {
+            match: {
+              'service.attributes.main.privacy.publisherTrustedAlgorithms.did':
+                algorithmDid
+            }
+          },
+          {
+            query_string: {
+              query: `chainId:${chainId}`
+            }
+          }
+        ]
       }
     },
-    sort: { created: -1 }
+    sort: { created: 'desc' }
   }
 }
 
@@ -77,6 +89,7 @@ export async function queryMetadata(
       { cancelToken }
     )
     if (!response || response.status !== 200 || !response.data) return
+
     return transformQueryResult(response.data, query.from, query.size)
   } catch (error) {
     if (axios.isCancel(error)) {
@@ -220,12 +233,11 @@ export async function getPublishedAssets(
 ): Promise<any> {
   if (!accountId) return
 
-  page = page || 1
   type = type || 'dataset OR algorithm'
 
   const queryPublishedAssets = {
-    page,
-    offset: 9,
+    from: (Number(page) || 0) * (Number(9) || 21),
+    size: Number(9) || 21,
     query: {
       query_string: {
         query: `(publicKey.owner:${accountId}) AND (service.attributes.main.type:${type}) AND (${transformChainIdsListToQuery(
@@ -233,9 +245,8 @@ export async function getPublishedAssets(
         )})`
       }
     },
-    sort: { created: -1 }
+    sort: { created: 'desc' }
   }
-
   try {
     const result = await queryMetadata(queryPublishedAssets, cancelToken)
     return result
@@ -266,8 +277,6 @@ export async function getAssetsFromDidList(
     if (!searchDids) return
 
     const query = {
-      page: 1,
-      offset: 1000,
       query: {
         query_string: {
           query: `(${searchDids}) AND (${transformChainIdsListToQuery(
@@ -277,7 +286,7 @@ export async function getAssetsFromDidList(
           default_operator: 'OR'
         }
       },
-      sort: { created: -1 }
+      sort: { created: 'desc' }
     }
 
     const queryResult = await queryMetadata(query, cancelToken)
diff --git a/src/utils/compute.ts b/src/utils/compute.ts
index dbc5c518a..e66bc9f83 100644
--- a/src/utils/compute.ts
+++ b/src/utils/compute.ts
@@ -72,8 +72,6 @@ async function getAssetMetadata(
   chainIds: number[]
 ): Promise<DDO[]> {
   const queryDid = {
-    page: 1,
-    offset: 100,
     query: {
       query_string: {
         query: `(${queryDtList}) AND (${transformChainIdsListToQuery(