From 472f621532f6aa2d7437ac2225427759ce6dfd9b Mon Sep 17 00:00:00 2001 From: jcomedouteau Date: Tue, 31 Oct 2023 14:45:49 +0100 Subject: [PATCH] #1922-acquisition-deletion - Allow deletion of acquisition - Allow deletion of dataset correctly --- .../org/shanoir/ng/dataset/service/DatasetServiceImpl.java | 2 +- .../org/shanoir/ng/dicom/web/service/DICOMWebService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 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 index 7586f512f4..89724aee8e 100644 --- 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 @@ -93,9 +93,9 @@ public void deleteById(final Long id) throws ShanoirException, SolrServerExcepti if (datasetDb == null) { throw new EntityNotFoundException(Dataset.class, id); } - repository.deleteById(id); solrService.deleteFromIndex(id); this.deleteDatasetFromPacs(datasetDb); + repository.deleteById(id); shanoirEventService.publishEvent(new ShanoirEvent(ShanoirEventType.DELETE_DATASET_EVENT, id.toString(), KeycloakUtil.getTokenUserId(), "", ShanoirEvent.SUCCESS, datasetDb.getStudyId())); } diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dicom/web/service/DICOMWebService.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dicom/web/service/DICOMWebService.java index 3a9f5484ad..76d9d6bb9a 100644 --- a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dicom/web/service/DICOMWebService.java +++ b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dicom/web/service/DICOMWebService.java @@ -295,7 +295,7 @@ public void deleteDicomFilesFromPacs(String url) throws ShanoirException { HttpPost post = new HttpPost(rejectURL); post.setHeader(HttpHeaders.CONTENT_TYPE, CONTENT_TYPE_JSON); try (CloseableHttpResponse response = httpClient.execute(post)) { - if (response.getCode() == HttpStatus.NO_CONTENT.value()) { + if (HttpStatus.OK.value() == response.getCode()) { LOG.info("Rejected from PACS: " + url); } else { LOG.error(response.getCode() + ": Could not reject instance from PACS: " + response.getReasonPhrase() @@ -304,8 +304,8 @@ public void deleteDicomFilesFromPacs(String url) throws ShanoirException { + "for rejectURL: " + rejectURL); } } catch (IOException e) { - LOG.error(e.getMessage(), e); - throw new ShanoirException(e.getMessage()); + LOG.error("Could not reject instance from PACS: for rejectURL: " + rejectURL, e); + throw new ShanoirException("Could not reject instance from PACS: for rejectURL: " + url, e); } // STEP 2: Delete from the PACS HttpDelete delete = new HttpDelete(deleteUrl);