Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-09 07:02:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: use specific time from filter if defined

Browse Source
This commit is contained in:
Jovan Krunić
2020-10-23 09:58:57 +02:00
committed by Rainer Killinger
parent 8dbb3ca19a
commit 80e62496f0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/storage/elasticsearch/query.ts
View File

@@ -57,6 +57,8 @@ function escapeESReservedCharacters(str: string): string {
/** /**
* Builds a boolean filter. Returns an elasticsearch boolean filter * Builds a boolean filter. Returns an elasticsearch boolean filter
* @param booleanFilter a search boolean filter for the retrieval of the data
* @returns elasticsearch boolean arguments object
*/ */
export function buildBooleanFilter(booleanFilter: SCSearchBooleanFilter): ESBooleanFilterArguments<unknown> { export function buildBooleanFilter(booleanFilter: SCSearchBooleanFilter): ESBooleanFilterArguments<unknown> {
@@ -107,7 +109,8 @@ export function buildFilter(filter: SCSearchFilter): ESTermFilter | ESGeoDistanc
}; };
} = {}; } = {};
startRangeFilter[filter.arguments.fromField] = { startRangeFilter[filter.arguments.fromField] = {
lte: 'now', lte: typeof filter.arguments.time !== 'undefined'
? filter.arguments.time : 'now',
}; };
const endRangeFilter: { const endRangeFilter: {
@@ -119,7 +122,8 @@ export function buildFilter(filter: SCSearchFilter): ESTermFilter | ESGeoDistanc
}; };
} = {}; } = {};
endRangeFilter[filter.arguments.toField] = { endRangeFilter[filter.arguments.toField] = {
gte: 'now', gte: typeof filter.arguments.time !== 'undefined'
? filter.arguments.time : 'now',
}; };
return { return {
@@ -158,7 +162,7 @@ export function buildFilter(filter: SCSearchFilter): ESTermFilter | ESGeoDistanc
}; };
case 'distance': case 'distance':
const geoObject: ESGeoDistanceFilterArguments = { const geoObject: ESGeoDistanceFilterArguments = {
distance: `${filter.arguments.distanceInM}m`, distance: `${filter.arguments.distance}m`,
}; };
geoObject[filter.arguments.field] = { geoObject[filter.arguments.field] = {
lat: filter.arguments.position[1], lat: filter.arguments.position[1],
@@ -172,8 +176,6 @@ export function buildFilter(filter: SCSearchFilter): ESTermFilter | ESGeoDistanc
return { return {
bool: buildBooleanFilter(filter), bool: buildBooleanFilter(filter),
}; };
default:
throw new Error('Unknown Filter type');
} }
} }
@@ -265,6 +267,7 @@ function buildFunctionsForBoostingTypes(
* Builds body for Elasticsearch requests * Builds body for Elasticsearch requests
* @param params Parameters for querying the backend * @param params Parameters for querying the backend
* @param defaultConfig Default configuration of the backend * @param defaultConfig Default configuration of the backend
* @param elasticsearchConfig Elasticsearch configuration
* @returns ElasticsearchQuery (body of a search-request) * @returns ElasticsearchQuery (body of a search-request)
*/ */
export function buildQuery( export function buildQuery(
@@ -356,9 +359,9 @@ export function buildQuery(
}, },
}; };
} else {
throw new Error('Query Type is not supported. Check your config file and reconfigure your elasticsearch query');
} }
} else {
throw new Error('Unsupported query type. Check your config file and reconfigure your elasticsearch query');
} }
const functionScoreQuery: ESFunctionScoreQuery = { const functionScoreQuery: ESFunctionScoreQuery = {