Skip to content
Snippets Groups Projects

fix(DuplicateService): [AOU-1996] ignore DELETED publications when checking for duplicates

Merged fix(DuplicateService): [AOU-1996] ignore DELETED publications when checking for duplicates
rodn-ignore-deleted-publication-when-checking-duplicates into master
1 unresolved thread
Merged Nicolas.Rod requested to merge rodn-ignore-deleted-publication-when-checking-duplicates into master
1 unresolved thread
Compare
and
2 files
+ 10
− 0
Compare changes
  • Side-by-side
  • Inline
Files
2
AoU-Admin/src/main/java/ch/unige/aou/service/rest/DuplicateService.java
+ 9
− 0
@@ -47,6 +47,7 @@ import ch.unige.aou.config.AouProperties;
import ch.unige.aou.controller.AdminController;
import ch.unige.aou.model.ExistingPublicationInfo;
import ch.unige.aou.model.index.PublicationIndexEntry;
import ch.unige.aou.model.publication.Publication;
import ch.unige.aou.model.rest.AouSearchCondition;
@Service
@@ -222,6 +223,14 @@ public class DuplicateService {
notSamePublicationCondition.setValue(publicationId);
conditionList.add(notSamePublicationCondition);
// Do not find publications that are DELETED or REJECTED
AouSearchCondition deletedPublicationCondition = new AouSearchCondition();
deletedPublicationCondition.setType(SearchConditionType.TERM);
deletedPublicationCondition.setBooleanClauseType(BooleanClauseType.MUST_NOT);
deletedPublicationCondition.setField(AouConstants.INDEX_FIELD_STATUS);
deletedPublicationCondition.getTerms().add(Publication.PublicationStatus.DELETED.toString());
conditionList.add(deletedPublicationCondition);
FacetPage<PublicationIndexEntry> results = this.indexResourceService.search(this.indexPublicationsInProgressName,
conditionList.stream().map(SearchCondition.class::cast).collect(Collectors.toList()), null, pageable);
if (results.getTotalElements() > 0) {