-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* #323 - Extended referencedCriteria and Valueset Search - Add new rest controller and services to search in a different elastic search index for Codeable Concepts - tests and openapi docs missing - fix inconsistent variable naming in new api parts (no longer using camelCase) - add codeable_concept path to WebSecurityConfig
- Loading branch information
1 parent
8474594
commit 3a8fbae
Showing
18 changed files
with
687 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/main/java/de/numcodex/feasibility_gui_backend/terminology/api/CcSearchResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package de.numcodex.feasibility_gui_backend.terminology.api; | ||
|
||
import de.numcodex.feasibility_gui_backend.common.api.TermCode; | ||
import lombok.Builder; | ||
import lombok.Data; | ||
|
||
import java.util.List; | ||
|
||
@Data | ||
@Builder | ||
public class CcSearchResult { | ||
private long totalHits; | ||
private List<TermCode> results; | ||
} |
97 changes: 97 additions & 0 deletions
97
src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/CodeableConceptService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
package de.numcodex.feasibility_gui_backend.terminology.es; | ||
|
||
import co.elastic.clients.elasticsearch._types.FieldValue; | ||
import co.elastic.clients.elasticsearch._types.query_dsl.*; | ||
import de.numcodex.feasibility_gui_backend.common.api.TermCode; | ||
import de.numcodex.feasibility_gui_backend.terminology.api.CcSearchResult; | ||
import de.numcodex.feasibility_gui_backend.terminology.es.model.CodeableConceptDocument; | ||
import de.numcodex.feasibility_gui_backend.terminology.es.repository.CodeableConceptEsRepository; | ||
import de.numcodex.feasibility_gui_backend.terminology.es.repository.OntologyItemNotFoundException; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; | ||
import org.springframework.data.domain.PageRequest; | ||
import org.springframework.data.elasticsearch.client.elc.NativeQueryBuilder; | ||
import org.springframework.data.elasticsearch.core.ElasticsearchOperations; | ||
import org.springframework.data.elasticsearch.core.SearchHits; | ||
import org.springframework.data.util.Pair; | ||
import org.springframework.lang.Nullable; | ||
import org.springframework.stereotype.Service; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
@Service | ||
@Slf4j | ||
@ConditionalOnExpression("${app.elastic.enabled}") | ||
public class CodeableConceptService { | ||
private ElasticsearchOperations operations; | ||
|
||
private CodeableConceptEsRepository repo; | ||
|
||
@Autowired | ||
public CodeableConceptService(ElasticsearchOperations operations, CodeableConceptEsRepository repo) { | ||
this.operations = operations; | ||
this.repo = repo; | ||
} | ||
|
||
public CcSearchResult performCodeableConceptSearchWithRepoAndPaging(String keyword, | ||
@Nullable List<String> valueSets, | ||
@Nullable int pageSize, | ||
@Nullable int page) { | ||
|
||
List<Pair<String, List<String>>> filterList = new ArrayList<>(); | ||
if (valueSets != null && !valueSets.isEmpty()) { | ||
filterList.add(Pair.of("value_sets", valueSets)); | ||
} | ||
|
||
var searchHitPage = findByCodeOrDisplay(keyword, filterList, PageRequest.of(page, pageSize)); | ||
List<TermCode> codeableConceptEntries = new ArrayList<>(); | ||
|
||
searchHitPage.getSearchHits().forEach(hit -> codeableConceptEntries.add(hit.getContent().termCode())); | ||
return CcSearchResult.builder() | ||
.totalHits(searchHitPage.getTotalHits()) | ||
.results(codeableConceptEntries) | ||
.build(); | ||
} | ||
|
||
public TermCode getSearchResultEntryByCode(String code) { | ||
return repo.findById(code).orElseThrow(OntologyItemNotFoundException::new).termCode(); | ||
} | ||
|
||
private SearchHits<CodeableConceptDocument> findByCodeOrDisplay(String keyword, | ||
List<Pair<String,List<String>>> filterList, | ||
PageRequest pageRequest) { | ||
List<Query> filterTerms = new ArrayList<>(); | ||
|
||
if (!filterList.isEmpty()) { | ||
var fieldValues = new ArrayList<FieldValue>(); | ||
filterList.forEach(f -> { | ||
f.getSecond().forEach(s -> { | ||
fieldValues.add(new FieldValue.Builder().stringValue(s).build()); | ||
}); | ||
filterTerms.add(new TermsQuery.Builder() | ||
.field(f.getFirst()) | ||
.terms(new TermsQueryField.Builder().value(fieldValues).build()) | ||
.build()._toQuery()); | ||
}); | ||
} | ||
|
||
var mmQuery = new MultiMatchQuery.Builder() | ||
.query(keyword) | ||
.fields(List.of("termcode.display", "termcode.code^2")) | ||
.build(); | ||
|
||
var boolQuery = new BoolQuery.Builder() | ||
.must(List.of(mmQuery._toQuery())) | ||
.filter(filterTerms.isEmpty() ? List.of() : filterTerms) | ||
.build(); | ||
|
||
var query = new NativeQueryBuilder() | ||
.withQuery(boolQuery._toQuery()) | ||
.withPageable(pageRequest) | ||
.build(); | ||
|
||
return operations.search(query, CodeableConceptDocument.class); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
...ava/de/numcodex/feasibility_gui_backend/terminology/es/model/CodeableConceptDocument.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package de.numcodex.feasibility_gui_backend.terminology.es.model; | ||
|
||
import de.numcodex.feasibility_gui_backend.common.api.TermCode; | ||
import jakarta.persistence.Id; | ||
import lombok.Builder; | ||
import org.springframework.data.elasticsearch.annotations.Document; | ||
import org.springframework.data.elasticsearch.annotations.Field; | ||
import org.springframework.data.elasticsearch.annotations.FieldType; | ||
|
||
import java.util.List; | ||
|
||
@Builder | ||
@Document(indexName = "codeable_concept") | ||
public record CodeableConceptDocument( | ||
@Id String id, | ||
@Field(type = FieldType.Nested, includeInParent = true, name = "termcode") | ||
TermCode termCode, | ||
@Field(type = FieldType.Nested, includeInParent = true, name = "value_sets") | ||
List<String> valueSets | ||
) { | ||
} |
9 changes: 9 additions & 0 deletions
9
...mcodex/feasibility_gui_backend/terminology/es/repository/CodeableConceptEsRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package de.numcodex.feasibility_gui_backend.terminology.es.repository; | ||
|
||
import de.numcodex.feasibility_gui_backend.terminology.es.model.CodeableConceptDocument; | ||
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; | ||
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; | ||
|
||
@ConditionalOnExpression("${app.elastic.enabled}") | ||
public interface CodeableConceptEsRepository extends ElasticsearchRepository<CodeableConceptDocument, String> { | ||
} |
40 changes: 40 additions & 0 deletions
40
...a/de/numcodex/feasibility_gui_backend/terminology/v3/CodeableConceptEsRestController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package de.numcodex.feasibility_gui_backend.terminology.v3; | ||
|
||
import de.numcodex.feasibility_gui_backend.common.api.TermCode; | ||
import de.numcodex.feasibility_gui_backend.terminology.api.CcSearchResult; | ||
import de.numcodex.feasibility_gui_backend.terminology.es.CodeableConceptService; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; | ||
import org.springframework.http.MediaType; | ||
import org.springframework.web.bind.annotation.*; | ||
|
||
import java.util.List; | ||
|
||
@RestController | ||
@RequestMapping("api/v3/codeable-concept") | ||
@ConditionalOnExpression("${app.elastic.enabled}") | ||
@CrossOrigin | ||
public class CodeableConceptEsRestController { | ||
|
||
private CodeableConceptService codeableConceptService; | ||
|
||
@Autowired | ||
public CodeableConceptEsRestController(CodeableConceptService codeableConceptService) { | ||
this.codeableConceptService = codeableConceptService; | ||
} | ||
|
||
@GetMapping(value = "/entry/search", produces = MediaType.APPLICATION_JSON_VALUE) | ||
public CcSearchResult searchOntologyItemsCriteriaQuery(@RequestParam("searchterm") String keyword, | ||
@RequestParam(value = "value-sets", required = false) List<String> valueSets, | ||
@RequestParam(value = "page-size", required = false, defaultValue = "20") int pageSize, | ||
@RequestParam(value = "page", required = false, defaultValue = "0") int page) { | ||
|
||
return codeableConceptService | ||
.performCodeableConceptSearchWithRepoAndPaging(keyword, valueSets, pageSize, page); | ||
} | ||
|
||
@GetMapping(value = "/entry/{code}", produces = MediaType.APPLICATION_JSON_VALUE) | ||
public TermCode getCodeableConceptByCode(@PathVariable("code") String code) { | ||
return codeableConceptService.getSearchResultEntryByCode(code); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.