Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #112: RED-2666 OwnerId as FileName after soft-/hard-delete and Reupload

Browse Source 
Merge in RED/persistence-service from bugfix/RED-2666 to master

* commit 'd548dc0883f367a84800e0d725d0d855fb0cf777':
  RED-2666 OwnerId as FileName after soft-/hard-delete and Reupload
This commit is contained in:
Corina Olariu 2021-11-15 08:49:17 +01:00 committed by Timo Bejan
commit 091a088c83
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
View File

@ -121,7 +121,7 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
"f.hasHints = false, f.hasRedactions = false, f.hasSuggestions = false, f.hasUpdates = false, " +
"f.deleted = null, f.hardDeletedTime = null " +
"where f.id = :fileId")
int overwriteFile(String fileId, String uploader, String filename, ProcessingStatus processingStatus,
int overwriteFile(String fileId, String filename, String uploader, ProcessingStatus processingStatus,
WorkflowStatus workflowStatus, OffsetDateTime lastUploaded, OffsetDateTime lastUpdated);
}

25
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java
View File

@ -57,6 +57,31 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
}
}
@Test
public void testFileSoftDeleteReupload() {
var filename = "test.pdf";
var dossier = dossierTesterAndProvider.provideTestDossier();
var file = fileTesterAndProvider.testAndProvideFile(dossier, filename);
assertThat(fileClient.getAllStatuses().size()).isEqualTo(1);
var loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId());
assertThat(loadedFile.getFilename()).isEqualTo(filename);
uploadClient.deleteFile(dossier.getId(), file.getId());
var nrOfFiles = fileClient.getSoftDeletedDossierStatus(dossier.getId()).size();
assertThat(nrOfFiles).isEqualTo(1);
loadedFile = fileClient.getSoftDeletedDossierStatus(dossier.getId()).get(0);
assertThat(loadedFile.getFilename()).isEqualTo(filename);
var fileUploaded = fileTesterAndProvider.testAndProvideFile(dossier);
loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId());
assertThat(loadedFile.getFilename()).isEqualTo(filename);
}
@Test
public void testFile() {
var dossier = dossierTesterAndProvider.provideTestDossier();