fli-iam#2321 - delete niftis

- Manage progress + display in front
DuckflipXYZ · Dec 6, 2024 · a9aee44 · a9aee44
1 parent f8f7b44
commit a9aee44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dataset/service/DatasetServiceImpl.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dataset/service/DatasetServiceImpl.java
@@ -383,21 +383,21 @@ public void deleteNiftis(Long studyId) {
 		shanoirEventService.publishEvent(event);
 		try {
 			int total = datasets.size();
-			int i = 1;
+			float progress = 0;
 			for (Dataset dataset : datasets) {
-				event.setProgress((float) (i / total));
+				progress = progress + 1f / total;
+				event.setProgress(progress);
 				event.setMessage("Deleting nifti for dataset: " + dataset.getName() + " of subject " + dataset.getSubjectId());
 				shanoirEventService.publishEvent(event);
 				deleteNifti(dataset);
-				i += 1;
 			}
 			event.setProgress(1f);
 			event.setStatus(ShanoirEvent.SUCCESS);
 			event.setMessage("Deleting nifti for study: " + studyId + ": Success.");
 			shanoirEventService.publishEvent(event);
 		} catch (Exception e) {
 			LOG.error("Could not properly delete niftis: ", e);
-			event.setProgress(1f);
+			event.setProgress(-1f);
 			event.setStatus(ShanoirEvent.ERROR);
 			event.setMessage("Deleting nifti for study: " + studyId + ": Error. " + e.getMessage());
 			shanoirEventService.publishEvent(event);

diff --git a/shanoir-ng-users/src/main/java/org/shanoir/ng/events/ShanoirEventsService.java b/shanoir-ng-users/src/main/java/org/shanoir/ng/events/ShanoirEventsService.java
@@ -1,16 +1,9 @@
 package org.shanoir.ng.events;
 
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.shanoir.ng.shared.event.ShanoirEventType;
 import org.shanoir.ng.tasks.AsyncTaskApiController;
 import org.shanoir.ng.tasks.UserSseEmitter;
-import org.shanoir.ng.user.model.User;
-import org.shanoir.ng.user.model.dto.UserDTO;
 import org.shanoir.ng.user.repository.UserRepository;
 import org.shanoir.ng.utils.KeycloakUtil;
 import org.shanoir.ng.utils.Utils;
@@ -19,16 +12,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.util.Pair;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.security.access.prepost.PostAuthorize;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Service managing ShanoirEvents
  * @author fli
@@ -59,7 +52,8 @@ public void addEvent(ShanoirEvent event) {
 				|| ShanoirEventType.COPY_DATASET_EVENT.equals(event.getEventType())
 				|| ShanoirEventType.CHECK_QUALITY_EVENT.equals(event.getEventType())
 				|| ShanoirEventType.DOWNLOAD_STATISTICS_EVENT.equals(event.getEventType())
-				|| ShanoirEventType.DELETE_EXAMINATION_EVENT.equals(event.getEventType())) {
+				|| ShanoirEventType.DELETE_EXAMINATION_EVENT.equals(event.getEventType())
+				|| ShanoirEventType.DELETE_NIFTI_EVENT.equals(event.getEventType())) {
 			sendSseEventsToUI(saved);
 		}
 	}