Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions src/main/java/cz/cvut/kbss/termit/persistence/dao/TermDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,23 @@ public List<TermDto> findAllRoots(Pageable pageSpec, Collection<URI> includeTerm
}
}

/**
* Hydrates a collection of URIs into full Term instances.
*/
public List<Term> findAllFullByUris(Collection<URI> 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 <T> TypedQuery<T> setCommonFindAllRootsQueryParams(TypedQuery<T> query, boolean includeImports) {
final TypedQuery<T> tq = query.setParameter("type", typeUri)
.setParameter("hasLabel", LABEL_PROP)
Expand Down
26 changes: 24 additions & 2 deletions src/main/java/cz/cvut/kbss/termit/rest/SearchController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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.")
Expand Down Expand Up @@ -102,6 +111,7 @@ public List<SearchResult> 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.
*/
Expand All @@ -110,7 +120,7 @@ public List<SearchResult> fullTextSearchTerms(
@PreAuthorize("permitAll()")
@PostMapping(value = "/advanced", produces = {MediaType.APPLICATION_JSON_VALUE, JsonLd.MEDIA_TYPE},
consumes = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<List<SearchResult>> advancedSearch(
public ResponseEntity<?> advancedSearch(
@Parameter(description = "Search string.")
@RequestParam(name = "searchString", required = false, defaultValue = "") String searchString,
@Parameter(description = "Search language.")
Expand All @@ -119,11 +129,23 @@ public ResponseEntity<List<SearchResult>> 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<SearchParam> searchParams) {
final Page<SearchResult> result = searchService.advancedSearch(new SearchString(searchString, language),
searchParams,
RestUtils.createPageRequest(pageSize, pageNo));
if (full) {
Set<URI> matchingUris = result.getContent().stream()
.map(SearchResult::getUri)
.collect(Collectors.toSet());
List<Term> 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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -863,4 +863,9 @@ public List<FlatTermDto> findAllFlat(Vocabulary vocabulary, List<URI> includeTer
}
return repositoryService.findAllFlat(vocabulary, selectionParams.pageSpec(), includeTerms);
}

@Transactional(readOnly = true)
public List<Term> findAllFullByUris(Collection<URI> uris) {
return repositoryService.findAllFullByUris(uris);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<Term> findAllFullByUris(Collection<URI> uris) {
return termDao.findAllFullByUris(uris);
}

/**
* Checks that a term can be removed.
* <p>
Expand Down Expand Up @@ -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) {
Expand Down
Loading