Merge pull request #1786 from jcomedouteau/shanoir-issue#1783-solr-in…

…dex-bug #1783-Solr update after import + study card
fli-iam · Aug 2, 2023 · 8f5523e · 8f5523e
2 parents 9352a53 + f9931a1
commit 8f5523e
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 5 deletions.
diff --git a/...ts/src/main/java/org/shanoir/ng/datasetacquisition/service/DatasetAcquisitionService.java b/...ts/src/main/java/org/shanoir/ng/datasetacquisition/service/DatasetAcquisitionService.java
@@ -14,6 +14,7 @@
 
 package org.shanoir.ng.datasetacquisition.service;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.shanoir.ng.datasetacquisition.model.DatasetAcquisition;
@@ -63,4 +64,6 @@ public interface DatasetAcquisitionService {
 	void deleteById(Long id) throws EntityNotFoundException, ShanoirException;
 
     boolean existsByStudyCardId(Long studyCardId);
+
+	Collection<DatasetAcquisition> createAll(Collection<DatasetAcquisition> acquisitions);
 }
diff --git a/...rc/main/java/org/shanoir/ng/datasetacquisition/service/DatasetAcquisitionServiceImpl.java b/...rc/main/java/org/shanoir/ng/datasetacquisition/service/DatasetAcquisitionServiceImpl.java
@@ -15,6 +15,7 @@
 package org.shanoir.ng.datasetacquisition.service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -40,6 +41,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.google.common.collect.Lists;
 
 @Service
 public class DatasetAcquisitionServiceImpl implements DatasetAcquisitionService {
@@ -114,6 +116,15 @@ public Page<DatasetAcquisition> findPage(final Pageable pageable) {
             return repository.findPageByStudyCenterOrStudyIdIn(studyCenters, unrestrictedStudies, pageable);
         }
     }
+
+    @Override
+    public Collection<DatasetAcquisition> createAll(Collection<DatasetAcquisition> acquisitions) {
+    	Iterable<DatasetAcquisition> result = this.repository.saveAll(acquisitions);
+    	for (DatasetAcquisition acquisition: result) {
+            shanoirEventService.publishEvent(new ShanoirEvent(ShanoirEventType.CREATE_DATASET_ACQUISITION_EVENT, acquisition.getId().toString(), KeycloakUtil.getTokenUserId(), "", ShanoirEvent.SUCCESS));
+    	}
+    	return Lists.newArrayList(result);
+    }
 
     @Override
     public DatasetAcquisition create(DatasetAcquisition entity) {

diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/service/ImporterService.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/service/ImporterService.java
@@ -49,6 +49,7 @@
 import org.shanoir.ng.dataset.service.DatasetService;
 import org.shanoir.ng.datasetacquisition.model.DatasetAcquisition;
 import org.shanoir.ng.datasetacquisition.repository.DatasetAcquisitionRepository;
+import org.shanoir.ng.datasetacquisition.service.DatasetAcquisitionService;
 import org.shanoir.ng.datasetfile.DatasetFile;
 import org.shanoir.ng.dicom.DicomProcessing;
 import org.shanoir.ng.examination.model.Examination;
@@ -126,6 +127,9 @@ public class ImporterService {
 
     @Autowired
     private QualityCardService qualityCardService;
+
+    @Autowired
+    private DatasetAcquisitionService datasetAcquisitionService;
 
     @Autowired
     private DicomProcessing dicomProcessing;
@@ -164,7 +168,7 @@ public void createAllDatasetAcquisition(ImportJob importJob, Long userId) throws
                 if (qualityResult.hasError()) {
                     throw new QualityException(examination, qualityResult);
                 } else { // Then do the import
-                    datasetAcquisitionRepository.saveAll(generatedAcquisitions);
+                	generatedAcquisitions = new HashSet<DatasetAcquisition>(datasetAcquisitionService.createAll(generatedAcquisitions));
                     try {
                         persistPatientInPacs(importJob.getPatients(), event);
                     } catch (Exception e) { // if error in pacs
@@ -174,7 +178,7 @@ public void createAllDatasetAcquisition(ImportJob importJob, Long userId) throws
                         }
                         throw new ShanoirException("Error while saving data in pacs, the import is canceled and acquisitions were not saved");
                     }
-                }	
+                }
             } else {
                 throw new ShanoirException("Examination not found: " + importJob.getExaminationId());
             }

diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/solr/service/SolrService.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/solr/service/SolrService.java
@@ -22,12 +22,10 @@
 import java.util.List;
 
 import org.shanoir.ng.shared.exception.RestServiceException;
-import org.shanoir.ng.shared.paging.FacetPageable;
 import org.shanoir.ng.solr.model.ShanoirSolrDocument;
 import org.shanoir.ng.solr.model.ShanoirSolrQuery;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.solr.core.query.result.FacetFieldEntry;
 import org.springframework.data.solr.core.query.result.SolrResultPage;
 import org.springframework.security.access.prepost.PreAuthorize;
 
@@ -56,4 +54,6 @@ public interface SolrService {
 
 	void addAllToIndex(List<ShanoirSolrDocument> documents);
 
+	void updateDatasets(List<Long> datasetIds);
+
 }
diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/solr/service/SolrServiceImpl.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/solr/service/SolrServiceImpl.java
@@ -265,4 +265,17 @@ public Page<ShanoirSolrDocument> getByIdIn(List<Long> datasetIds, Pageable pagea
 		return result;
 	}
 
+	/**
+	 * Updates a list of datasets in Solr.
+	 * @param datasetIds the list of dataset IDs to update
+	 */
+	@Override
+	public void updateDatasets(List<Long> datasetIds) {
+		if (CollectionUtils.isEmpty(datasetIds)) {
+			return;
+		}
+		this.deleteFromIndex(datasetIds);
+		this.indexDatasets(datasetIds);;		
+	}
+
 }
diff --git a/...-ng-datasets/src/main/java/org/shanoir/ng/studycard/controler/StudyCardApiController.java b/...-ng-datasets/src/main/java/org/shanoir/ng/studycard/controler/StudyCardApiController.java
@@ -19,6 +19,7 @@
 import java.util.List;
 
 import org.dcm4che3.data.Tag;
+import org.shanoir.ng.dataset.model.Dataset;
 import org.shanoir.ng.datasetacquisition.model.DatasetAcquisition;
 import org.shanoir.ng.datasetacquisition.service.DatasetAcquisitionService;
 import org.shanoir.ng.shared.core.model.IdList;
@@ -29,6 +30,7 @@
 import org.shanoir.ng.shared.exception.MicroServiceCommunicationException;
 import org.shanoir.ng.shared.exception.PacsException;
 import org.shanoir.ng.shared.exception.RestServiceException;
+import org.shanoir.ng.solr.service.SolrService;
 import org.shanoir.ng.studycard.dto.DicomTag;
 import org.shanoir.ng.studycard.model.StudyCard;
 import org.shanoir.ng.studycard.model.StudyCardApply;
@@ -65,6 +67,9 @@ public class StudyCardApiController implements StudyCardApi {
 
     @Autowired
     private CardsProcessingService cardProcessingService;
+
+    @Autowired
+    private SolrService solrService;
 
     @Override
     public ResponseEntity<Void> deleteStudyCard(
@@ -227,6 +232,18 @@ public ResponseEntity<Void> applyStudyCard(
         LOG.debug("re-apply studycard n° " + studyCard.getId());
         List<DatasetAcquisition> acquisitions = datasetAcquisitionService.findById(studyCardApplyObject.getDatasetAcquisitionIds());
         cardProcessingService.applyStudyCard(studyCard, acquisitions);
+
+        // Get all updated dataset ids
+        List<Long> datasetIds = new ArrayList<Long>();
+        for (DatasetAcquisition acquisition : acquisitions) {
+        	for (Dataset ds : acquisition.getDatasets()) {
+        		datasetIds.add(ds.getId());
+        	}
+        }
+
+        // Update solr metadata
+        solrService.updateDatasets(datasetIds);
+
         return new ResponseEntity<Void>(HttpStatus.OK);
     }
 

diff --git a/...datasets/src/test/java/org/shanoir/ng/datasetacquisition/service/ImporterServiceTest.java b/...datasets/src/test/java/org/shanoir/ng/datasetacquisition/service/ImporterServiceTest.java
@@ -170,7 +170,7 @@ public void createAllDatasetAcquisition() throws Exception {
 
 		// THEN datasets are created
 		// Check what we save at the end
-		verify(datasetAcquisitionRepository).saveAll(any());
+		verify(datasetAcquisitionService).createAll(any());
 		//verify(datasetAcquisitionService).create(datasetAcq);
 		verify(dicomPersisterService).persistAllForSerie(any());
 

diff --git a/shanoir-ng-datasets/src/test/java/org/shanoir/ng/studycard/StudyCardApiControllerTest.java b/shanoir-ng-datasets/src/test/java/org/shanoir/ng/studycard/StudyCardApiControllerTest.java
@@ -32,6 +32,7 @@
 import org.shanoir.ng.shared.exception.EntityNotFoundException;
 import org.shanoir.ng.shared.exception.MicroServiceCommunicationException;
 import org.shanoir.ng.shared.validation.FindByRepository;
+import org.shanoir.ng.solr.service.SolrService;
 import org.shanoir.ng.studycard.controler.StudyCardApiController;
 import org.shanoir.ng.studycard.model.StudyCard;
 import org.shanoir.ng.studycard.service.CardsProcessingService;
@@ -96,6 +97,9 @@ public class StudyCardApiControllerTest {
 
 	@MockBean
 	private DicomSRImporterService dicomSRImporterService;
+
+	@MockBean
+	private SolrService solrService;
 
 	@Before
 	public void setup() throws EntityNotFoundException, MicroServiceCommunicationException {