oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity

Merge branch 'main' into orbis

Browse Source
This commit is contained in:
marcoelissa 2022-12-14 19:35:32 +07:00
commit f1db09c183
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/@types/aquarius/SearchQuery.ts
View File

@ -46,6 +46,7 @@ declare global {
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
query: any query: any
sort?: { [jsonPath: string]: SortDirectionOptions } sort?: { [jsonPath: string]: SortDirectionOptions }
// eslint-disable-next-line @typescript-eslint/no-explicit-any
aggs?: any aggs?: any
} }
} }

2
src/@utils/aquarius/index.test.ts
View File

@ -9,8 +9,8 @@ const defaultBaseQueryReturn = {
query: { query: {
bool: { bool: {
filter: [ filter: [
{ terms: { chainId: [1, 3] } },
{ term: { _index: 'aquarius' } }, { term: { _index: 'aquarius' } },
{ terms: { chainId: [1, 3] } },
{ term: { 'purgatory.state': false } }, { term: { 'purgatory.state': false } },
{ bool: { must_not: [{ term: { 'nft.state': 5 } }] } } { bool: { must_not: [{ term: { 'nft.state': 5 } }] } }
] ]

45
src/@utils/aquarius/index.ts
View File

@ -42,28 +42,14 @@ export function getFilterTerm(
export function generateBaseQuery( export function generateBaseQuery(
baseQueryParams: BaseQueryParams baseQueryParams: BaseQueryParams
): SearchQuery { ): SearchQuery {
const generatedQuery = { const filters: unknown[] = [getFilterTerm('_index', 'aquarius')]
from: baseQueryParams.esPaginationOptions?.from || 0, baseQueryParams.filters && filters.push(...baseQueryParams.filters)
size: baseQueryParams.chainIds &&
baseQueryParams.esPaginationOptions?.size >= 0 filters.push(getFilterTerm('chainId', baseQueryParams.chainIds))
? baseQueryParams.esPaginationOptions?.size !baseQueryParams.ignorePurgatory &&
: 1000, filters.push(getFilterTerm('purgatory.state', false))
query: { !baseQueryParams.ignoreState &&
bool: { filters.push({
...baseQueryParams.nestedQuery,
filter: [
...(baseQueryParams.filters || []),
baseQueryParams.chainIds
? getFilterTerm('chainId', baseQueryParams.chainIds)
: [],
getFilterTerm('_index', 'aquarius'),
...(baseQueryParams.ignorePurgatory
? []
: [getFilterTerm('purgatory.state', false)]),
...(baseQueryParams.ignoreState
? []
: [
{
bool: { bool: {
must_not: [ must_not: [
{ {
@ -73,9 +59,17 @@ export function generateBaseQuery(
} }
] ]
} }
} })
]) const generatedQuery = {
] from: baseQueryParams.esPaginationOptions?.from || 0,
size:
baseQueryParams.esPaginationOptions?.size >= 0
? baseQueryParams.esPaginationOptions?.size
: 1000,
query: {
bool: {
...baseQueryParams.nestedQuery,
filter: filters
} }
} }
} as SearchQuery } as SearchQuery
@ -90,7 +84,6 @@ export function generateBaseQuery(
baseQueryParams.sortOptions.sortDirection || baseQueryParams.sortOptions.sortDirection ||
SortDirectionOptions.Descending SortDirectionOptions.Descending
} }
return generatedQuery return generatedQuery
} }