Merge branch 'hotfix/TEIS-2874' into 'master'

Release: merge 'hotfix-teis-2874' into 'master' created by Enriko Käsper

See merge request teis/files-service!78

CHANGELOG.md

 # Changelog
 
+## [1.23.2] - 2022-02-18
+
+* TEIS-2874: make file hard delete method idempotent
+
 ## [1.23.0] - 2022-01-12
 
 * TEIS-2787: updated virus-scan timeout; updated PollVirusScanResultTask and UploadFileVirusScanTask error handling

gradle.properties

 theGroup=ee.sm.ti.teis
-theVersion=1.23.1
+theVersion=1.23.2
 commonsVersion=1.29.0
 commonApiGatewayVersion=1.29.0
 pluginVersion=1.4.4

service/src/integTest/java/ee/sm/ti/teis/file/listener/FileMsListenerTest.java

@@ -150,4 +150,16 @@ class FileMsListenerTest extends FilesServiceAppTestBase {
         List<FilePointerEntity> filePointers = filePointerRepository.findByFileId(file.getFileId());
         assertThat(filePointers).isEmpty();
     }
+
+    @Test
+    void delete_alreadyDeletedFileWithoutPointer_success() {
+        DeleteFile file = new DeleteFile();
+        file.setFileId(UUID.randomUUID());
+        file.setHardDelete(true);
+        deleteFileRequest.setPayload(file, requestMetaDTO);
+
+        DeleteFileResponse response = listener.delete(deleteFileRequest);
+
+        assertThat(response.getError()).isNull();
+    }
 }

service/src/main/java/ee/sm/ti/teis/file/bpm/DeleteFileTask.java

@@ -56,6 +56,10 @@ public class DeleteFileTask implements JavaDelegate {
     }
 
     private void hardDeleteFile(UUID fileId, FileEntity file) {
+        if (file == null) {
+            log.info("File with id [{}] is already deleted", fileId);
+            return;
+        }
         if (file.getFileStatus().equals(FAILED)) {
             log.info("File with id [{}] will not be deleted because file status is FAILED", fileId);
             return;

service/src/main/java/ee/sm/ti/teis/file/service/FileBusinessMsService.java

@@ -87,6 +87,10 @@ public class FileBusinessMsService {
         List<FilePointerEntity> filePointers = filePointerDataService.getByFileId(domain.getFileId());
         if (domain.isHardDelete() && filePointers.isEmpty()) {
             FileEntity file = dataService.getById(domain.getFileId());
+            if (file == null) {
+                log.info("File with id [{}] already deleted", domain.getFileId());
+                return;
+            }
             try {
                 fileStorageServiceClient.deleteFile(file.getBucket(), domain.getFileId());
             } catch (Exception e) {