diff --git a/src/main/java/cz/cvut/kbss/termit/persistence/dao/TermDao.java b/src/main/java/cz/cvut/kbss/termit/persistence/dao/TermDao.java index b8c1dcf53..255bc3f0e 100644 --- a/src/main/java/cz/cvut/kbss/termit/persistence/dao/TermDao.java +++ b/src/main/java/cz/cvut/kbss/termit/persistence/dao/TermDao.java @@ -745,6 +745,23 @@ public List findAllRoots(Pageable pageSpec, Collection includeTerm } } + /** + * Hydrates a collection of URIs into full Term instances. + */ + public List findAllFullByUris(Collection uris) { + if (uris == null || uris.isEmpty()) { + return Collections.emptyList(); + } + return uris.stream().map(uri -> { + final Term t = em.find(Term.class, uri); + if (t != null) { + postLoad(t); + em.clear(); // Mandatory JOPA workaround + } + return t; + }).filter(Objects::nonNull).toList(); + } + private TypedQuery setCommonFindAllRootsQueryParams(TypedQuery query, boolean includeImports) { final TypedQuery tq = query.setParameter("type", typeUri) .setParameter("hasLabel", LABEL_PROP) diff --git a/src/main/java/cz/cvut/kbss/termit/rest/SearchController.java b/src/main/java/cz/cvut/kbss/termit/rest/SearchController.java index b07708ccc..05a0738c8 100644 --- a/src/main/java/cz/cvut/kbss/termit/rest/SearchController.java +++ b/src/main/java/cz/cvut/kbss/termit/rest/SearchController.java @@ -21,11 +21,13 @@ import cz.cvut.kbss.termit.dto.search.SearchParam; import cz.cvut.kbss.termit.dto.search.SearchResult; import cz.cvut.kbss.termit.dto.search.SearchString; +import cz.cvut.kbss.termit.model.Term; import cz.cvut.kbss.termit.rest.doc.ApiDocConstants; import cz.cvut.kbss.termit.rest.util.RestUtils; import cz.cvut.kbss.termit.security.SecurityConstants; import cz.cvut.kbss.termit.service.IdentifierResolver; import cz.cvut.kbss.termit.service.business.SearchService; +import cz.cvut.kbss.termit.service.business.TermService; import cz.cvut.kbss.termit.util.Configuration; import cz.cvut.kbss.termit.util.Constants; import cz.cvut.kbss.termit.util.Utils; @@ -50,6 +52,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; @Tag(name = "Search", description = "Search API") @RestController @@ -58,11 +61,17 @@ public class SearchController extends BaseController { private final SearchService searchService; + private final TermService termService; @Autowired - public SearchController(IdentifierResolver idResolver, Configuration config, SearchService searchService) { + public SearchController( + IdentifierResolver idResolver, + Configuration config, + SearchService searchService, + TermService termService) { super(idResolver, config); this.searchService = searchService; + this.termService = termService; } @Operation(description = "Runs full-text search over asset labels, definitions and descriptions.") @@ -102,6 +111,7 @@ public List fullTextSearchTerms( * @param language Language for full-text search, optional. * @param pageSize Page size for pagination, optional. * @param pageNo Page number for pagination, optional. + * @param full Whether to return fully populated term entities, optional. * @param searchParams Search parameters for faceted filtering, optional. * @return List of search results matching the full-text search and faceted filtering criteria. */ @@ -110,7 +120,7 @@ public List fullTextSearchTerms( @PreAuthorize("permitAll()") @PostMapping(value = "/advanced", produces = {MediaType.APPLICATION_JSON_VALUE, JsonLd.MEDIA_TYPE}, consumes = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity> advancedSearch( + public ResponseEntity advancedSearch( @Parameter(description = "Search string.") @RequestParam(name = "searchString", required = false, defaultValue = "") String searchString, @Parameter(description = "Search language.") @@ -119,11 +129,23 @@ public ResponseEntity> advancedSearch( @RequestParam(name = Constants.QueryParams.PAGE_SIZE, required = false) Integer pageSize, @Parameter(description = ApiDocConstants.PAGE_NO_DESCRIPTION) @RequestParam(name = Constants.QueryParams.PAGE, required = false) Integer pageNo, + @Parameter(description = "Whether to return fully populated term entities.") + @RequestParam(name = "full", required = false, defaultValue = "false") boolean full, @Parameter(description = "Search parameters.") @RequestBody Collection searchParams) { final Page result = searchService.advancedSearch(new SearchString(searchString, language), searchParams, RestUtils.createPageRequest(pageSize, pageNo)); + if (full) { + Set matchingUris = result.getContent().stream() + .map(SearchResult::getUri) + .collect(Collectors.toSet()); + List detailedTerms = termService.findAllFullByUris(matchingUris); + + return ResponseEntity.ok() + .header(Constants.X_TOTAL_COUNT_HEADER, Long.toString(result.getTotalElements())) + .body(detailedTerms); + } return ResponseEntity.ok() .header(Constants.X_TOTAL_COUNT_HEADER, Long.toString(result.getTotalElements())) .body(result.getContent()); diff --git a/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java b/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java index e5f8ae716..0eff9ce30 100644 --- a/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java +++ b/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java @@ -863,4 +863,9 @@ public List findAllFlat(Vocabulary vocabulary, List includeTer } return repositoryService.findAllFlat(vocabulary, selectionParams.pageSpec(), includeTerms); } + + @Transactional(readOnly = true) + public List findAllFullByUris(Collection uris) { + return repositoryService.findAllFullByUris(uris); + } } diff --git a/src/main/java/cz/cvut/kbss/termit/service/repository/TermRepositoryService.java b/src/main/java/cz/cvut/kbss/termit/service/repository/TermRepositoryService.java index b5ac97340..003b64a02 100644 --- a/src/main/java/cz/cvut/kbss/termit/service/repository/TermRepositoryService.java +++ b/src/main/java/cz/cvut/kbss/termit/service/repository/TermRepositoryService.java @@ -685,14 +685,25 @@ public void remove(TermRemovalParams removalParams) { * and there must be no references to the term. * * @param instance The instance to remove - * @see #remove(TermRemovalParams) - * @see #forceRemove(Term) + * @see #remove(TermRemovalParams) + * @see #forceRemove(Term) */ @Override public void remove(Term instance) { super.remove(instance); } + /** + * Finds all terms with the specified identifiers and returns them with all their ancestors loaded. + * + * @param uris Identifiers of terms to find + * @return List of matching terms + */ + @Transactional(readOnly = true) + public List findAllFullByUris(Collection uris) { + return termDao.findAllFullByUris(uris); + } + /** * Checks that a term can be removed. *

@@ -759,8 +770,8 @@ protected void postRemove(@Nonnull Term instance) { * specified instance. * * @param instance Term to remove - * @see #remove(TermRemovalParams) - * @see #remove(Term) + * @see #remove(TermRemovalParams) + * @see #remove(Term) */ @Transactional public void forceRemove(@Nonnull Term instance) {