From e3411dba421a716d4f5da9f6419fff9e49df6439 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Tue, 22 Aug 2023 09:33:04 +0200 Subject: [PATCH] RED-7158: fix status code, when dossierId not found --- .../impl/controller/FileManagementController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java index 4b428201b..cbc3e7ed0 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.client.pdftronredactionservice.PDFTronClient; import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException; +import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; import com.iqser.red.service.persistence.management.v1.processor.service.FileService; @@ -41,6 +42,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.RotatePages import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType; +import com.iqser.red.storage.commons.exception.StorageException; +import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; import com.iqser.red.storage.commons.service.StorageService; import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity; import com.knecon.fforesight.tenantcommons.TenantContext; @@ -142,12 +145,11 @@ public class FileManagementController implements FileManagementResource { try { var file = fileStatusManagementService.getFileStatus(fileId); - var viewerDocumentFileStream = fileManagementStorageService.getObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, viewerDocument)); - return getResponseEntity(inline, viewerDocumentFileStream, file.getFilename()); - } catch (FeignException e) { - if (e.status() == HttpStatus.NOT_FOUND.value()) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND); - } + var pdfFileStream = fileManagementStorageService.getObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, viewerDocument)); + return getResponseEntity(inline, pdfFileStream, file.getFilename()); + } catch (StorageObjectDoesNotExist e) { + return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND); + } catch (StorageException e) { log.debug(e.getMessage(), e); return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } -- 2.47.2