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
All threads resolved!
2 files
+ 6
6
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -127,13 +127,13 @@ public class ContributorController extends SolidifyController {
// Get fields to include/exclude from ES response
FieldsRequest fieldsRequest = this.queryBuilderService.getDefaultFieldsRequest();
AouSearchCondition contributorSearchCondition = this.queryBuilderService.getFindByCnIndividuIsContributorCondition(cnIndividu);
AouSearchCondition notDirectorSearchCondition = this.queryBuilderService.getFindByCnIndividuIsNotDirectorCondition(cnIndividu);
List<SearchCondition> listSearchConditions = List.of(contributorSearchCondition, notDirectorSearchCondition);
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, listSearchConditions, null, page,
FacetPage<PublicationIndexEntry> indexResults = this.indexResourceService.search(this.indexName, combinedSearchConditions, null, page,
fieldsRequest);
if (!indexResults.getContent().isEmpty()) {
Loading