AoU-Admin/src/main/java/ch/unige/aou/controller/admin/UpdateMetadataController.java

@@ -29,6 +29,9 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
+import ch.unige.aou.business.PersonService;
+import ch.unige.aou.business.UserService;
+import ch.unige.aou.model.security.User;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -37,6 +40,8 @@ import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -74,17 +79,23 @@ public class UpdateMetadataController extends IndexDataSearchController<Publicat
 
   private final IndexResourceService<String, PublicationIndexEntry> indexResourceService;
   private final UpdateMetadataService updateMetadataService;
+  private final PersonService personService;
+  private final UserService userService;
   private final String indexPublishedPublications;
   private final String exportDataUrl;
 
+
   public UpdateMetadataController(IndexResourceService<String, PublicationIndexEntry> indexResourceService,
-          IndexingService<PublicationIndexEntry> indexingService,
-          IndexFieldAliasInfoProvider indexFieldAliasInfoProvider, UpdateMetadataService updateMetadataService, AouProperties aouProperties) {
+          IndexingService<PublicationIndexEntry> indexingService, IndexFieldAliasInfoProvider indexFieldAliasInfoProvider,
+          UpdateMetadataService updateMetadataService, AouProperties aouProperties, PersonService personService,
+                                  UserService userService) {
     super(indexingService, indexFieldAliasInfoProvider);
     this.indexResourceService = indexResourceService;
     this.indexPublishedPublications = aouProperties.getIndexing().getPublishedPublicationsIndexName();
     this.updateMetadataService = updateMetadataService;
     this.exportDataUrl = aouProperties.getParameters().getExportDataUrlTemplate();
+    this.personService = personService;
+    this.userService = userService;
   }
 
   @PostMapping(AouActionName.EXPORT)
@@ -129,7 +140,10 @@ public class UpdateMetadataController extends IndexDataSearchController<Publicat
 
   @PostMapping(AouActionName.IMPORT)
   public ResponseEntity<Void> importPublicationsMetadata(@RequestBody String metadata) {
-    this.updateMetadataService.importPublications(metadata);
+    final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+    final User userImporting = this.userService.findByExternalUid(authentication.getName());
+
+    this.updateMetadataService.importPublications(metadata, userImporting);
     return new ResponseEntity<>(HttpStatus.OK);
   }
 

AoU-Admin/src/main/java/ch/unige/aou/service/metadata/exports/UpdateMetadataService.java

@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import ch.unige.aou.model.security.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -65,7 +66,6 @@ public class UpdateMetadataService {
   private static final Logger log = LoggerFactory.getLogger(UpdateMetadataService.class);
 
   private final String exportFolder;
-  private final String[] emailsToSendBatchCorrectionNotifications;
   private final Integer numberOfErrorsToSendForEmailOfBatchCorrections;
   private final PublicationService publicationService;
   private final MetadataService metadataService;
@@ -78,7 +78,6 @@ public class UpdateMetadataService {
     this.metadataService = metadataService;
     this.publicationsAdapter = publicationsAdapter;
     this.exportFolder = aouProperties.getExportPublicationsFolder();
-    this.emailsToSendBatchCorrectionNotifications = aouProperties.getBatchCorrections().getEmailsToSendNotifications();
     this.numberOfErrorsToSendForEmailOfBatchCorrections = aouProperties.getBatchCorrections().getNumberOfErrorToSendForEmail();
     this.tempFolder = aouProperties.getTempLocation(aouProperties.getPublicationsFolder());
   }
@@ -119,29 +118,29 @@ public class UpdateMetadataService {
 
   @Transactional
   @Async
-  public void importPublications(String xmlString) {
+  public void importPublications(String xmlString, User userImporting) {
     // First validate xml and validation rules for each publication
     // In case of errors, they should be sent by email
     try {
       Map<String, String> publicationsErrors = this.verifyPublicationsFromXml(xmlString);
       if (!publicationsErrors.isEmpty()) {
-        this.sendEmailWithListError(publicationsErrors);
+        this.sendEmailWithListError(publicationsErrors, userImporting.getEmail());
         log.info("Email with {} validation errors has been send", publicationsErrors.size());
         return;
       }
       // Change each metadata from publications and save them
-      int total = this.updatePublicationsMetadata(xmlString);
-      this.sendEmailWithListPublicationsUpdated(total);
+      int total = this.updatePublicationsMetadata(xmlString, userImporting.getExternalUid());
+      this.sendEmailWithListPublicationsUpdated(total, userImporting.getEmail());
       log.info("Email with {} publication changed", total);
 
     } catch (IOException | SolidifyRuntimeException e) {
-      this.sendEmailWithExceptionMessage(String.valueOf(e.getCause()));
+      this.sendEmailWithExceptionMessage(String.valueOf(e.getCause()), userImporting.getEmail());
       log.info("Exception error:" + e.getMessage());
       log.info("Email with validation error from xml {}", String.valueOf(e.getCause()));
     }
   }
 
-  private int updatePublicationsMetadata(String xmlString) {
+  private int updatePublicationsMetadata(String xmlString, String personImporting) {
     final MetadataExtractor metadataExtractor = this.metadataService.getMetadataExtractor(AouMetadataVersion.getDefaultVersion());
     Publications publications = this.publicationsAdapter.createPublicationsFromXml(xmlString);
     for (ch.unige.aou.model.xml.list_deposits.Publication publicationXml : publications.getPublication()) {
@@ -149,6 +148,7 @@ public class UpdateMetadataService {
       Publication.PublicationStatus currentStatus = publication.getStatus();
       String publicationMetadata = metadataExtractor.serializeDepositDocToXml(publicationXml.getDepositDoc());
       publication.setMetadata(publicationMetadata);
+      publication.getLastUpdate().setWho(personImporting);
 
       switch (currentStatus) {
         case COMPLETED -> {
@@ -209,28 +209,27 @@ public class UpdateMetadataService {
     return validationErrors;
   }
 
-  private void sendEmailWithExceptionMessage(String exceptionMessage) {
+  private void sendEmailWithExceptionMessage(String exceptionMessage, String email) {
     Map<String, Object> parameters = new HashMap<>();
     parameters.put("exception", exceptionMessage);
-    this.sendEmailWithParameters(parameters);
+    this.sendEmailWithParameters(parameters, email);
   }
 
-  private void sendEmailWithListError(Map<String, String> listErrors) {
+  private void sendEmailWithListError(Map<String, String> listErrors, String email) {
     Map<String, Object> parameters = new HashMap<>();
     parameters.put("listError", listErrors);
-    this.sendEmailWithParameters(parameters);
+    this.sendEmailWithParameters(parameters, email);
   }
 
-  private void sendEmailWithListPublicationsUpdated(int total) {
+  private void sendEmailWithListPublicationsUpdated(int total, String email) {
     Map<String, Object> parameters = new HashMap<>();
     parameters.put("total", total);
-    this.sendEmailWithParameters(parameters);
+    this.sendEmailWithParameters(parameters, email);
   }
 
-  public void sendEmailWithParameters(Map<String, Object> parameters) {
-    for (String emailTo : this.emailsToSendBatchCorrectionNotifications) {
+  public void sendEmailWithParameters(Map<String, Object> parameters, String email) {
       SolidifyEventPublisher.getPublisher().publishEvent(
-              new EmailMessage(emailTo, EmailMessage.EmailTemplate.BATCH_UPDATES_REPORT, parameters));
-    }
+              new EmailMessage(email, EmailMessage.EmailTemplate.BATCH_UPDATES_REPORT, parameters));
+
   }
 }

AoU-Admin/src/main/java/ch/unige/aou/service/rest/DuplicateService.java

@@ -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
+    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) {

AoU-Model/src/main/java/ch/unige/aou/AouConstants.java

@@ -402,6 +402,7 @@ public class AouConstants {
   public static final String INDEX_FIELD_ARCHIVE_ID = "archiveId";
   public static final String INDEX_FIELD_ARCHIVE_ID_INT = "archiveIdInt";
   public static final String INDEX_FIELD_FIRST_VALIDATION_DATE = "technicalInfos.firstValidation";
+  public static final String INDEX_FIELD_STATUS = "technicalInfos.status";
   public static final String INDEX_FIELD_FULLTEXTS = "fulltexts";
   public static final String INDEX_FIELD_XML = "aou.xml";
   public static final String INDEX_FIELD_METADATA_VERSION = "metadata-version";