Skip to content
Snippets Groups Projects

fix(contributor): [AOU-1936] remove supervised works from statistics list publication

Merged Florent Poittevin requested to merge fpo/1936_remove-supervised-work-from-statistics into master
Files
2
@@ -49,6 +49,7 @@ import ch.unige.solidify.rest.FacetPage;
import ch.unige.solidify.rest.FieldsRequest;
import ch.unige.solidify.rest.RestCollection;
import ch.unige.solidify.rest.RestCollectionPage;
import ch.unige.solidify.rest.SearchCondition;
import ch.unige.solidify.security.EveryonePermissions;
import ch.unige.solidify.service.IndexResourceService;
@@ -126,12 +127,13 @@ public class ContributorController extends SolidifyController {
// Get fields to include/exclude from ES response
FieldsRequest fieldsRequest = this.queryBuilderService.getDefaultFieldsRequest();
AouSearchCondition cnIndividuSearchCondition = this.queryBuilderService.getFindByCnIndividuCondition(cnIndividu);
AouSearchCondition contributorSearchCondition = this.queryBuilderService.getFindByCnIndividuWhereIsContributorCondition(cnIndividu);
AouSearchCondition notDirectorSearchCondition = this.queryBuilderService.getFindByCnIndividuWhereIsNotDirectorCondition(cnIndividu);
List<SearchCondition> combinedSearchConditions = List.of(contributorSearchCondition, notDirectorSearchCondition);
Pageable page = PageRequest.of(0, RestCollectionPage.MAX_SIZE_PAGE);
FacetPage<PublicationIndexEntry> indexResults = this.indexResourceService.search(this.indexName, List.of(cnIndividuSearchCondition), null,
page,
FacetPage<PublicationIndexEntry> indexResults = this.indexResourceService.search(this.indexName, combinedSearchConditions, null, page,
fieldsRequest);
if (!indexResults.getContent().isEmpty()) {
Loading