Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#367 - Sort unavailable criteria to the bottom #368

Merged
merged 1 commit into from
Sep 19, 2024
Merged

#367 - Sort unavailable criteria to the bottom #368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package de.numcodex.feasibility_gui_backend.terminology.es;

import co.elastic.clients.elasticsearch._types.FieldValue;
import co.elastic.clients.elasticsearch._types.InlineScript;
import co.elastic.clients.elasticsearch._types.Script;
import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
import co.elastic.clients.elasticsearch._types.aggregations.StringTermsBucket;
import co.elastic.clients.elasticsearch._types.query_dsl.*;
Expand Down Expand Up @@ -149,12 +151,37 @@ private SearchHits<OntologyListItemDocument> findByNameOrTermcode(String keyword
.filter(filterTerms.isEmpty() ? List.of() : filterTerms)
.build();

var query = new NativeQueryBuilder()
var innerQuery = new NativeQueryBuilder()
.withQuery(boolQuery._toQuery())
.withPageable(pageRequest)
.build();

return operations.search(query, OntologyListItemDocument.class);
var inlineScript = new InlineScript.Builder()
.source("doc['availability'].value == 0 ? _score : _score * 100")
.build();

var availabilityScoreScript = new Script.Builder()
.inline(inlineScript)
.build();

var function = FunctionScoreBuilders.scriptScore()
.script(availabilityScoreScript)
.build();

var functionList = List.of(function._toFunctionScore());

var functionScoreQuery = new FunctionScoreQuery.Builder()
.query(innerQuery.getQuery())
.functions(functionList)
.boostMode(FunctionBoostMode.Replace)
.build();

var finalQuery = new NativeQueryBuilder()
.withQuery(functionScoreQuery._toQuery())
.withPageable(pageRequest)
.build();

return operations.search(finalQuery, OntologyListItemDocument.class);

}

Expand Down