Merge branch 'RED-10268-bugfix' into 'release/2.589.x'

RED-10268: Prepared download creates zip file although the data inside the dossier have been deleted

See merge request redactmanager/persistence-service!876
This commit is contained in:
Yannik Hampe 2024-11-19 12:16:12 +01:00
commit 6fb0db4b4f

View File

@ -161,7 +161,7 @@ public class DownloadController implements DownloadResource {
} // otherwise consider the files from dossier
var validFilesAndNotProcessed = validFiles.stream()
.filter(f -> !(f.getAnalysisVersion() > 0 && f.getNumberOfAnalyses() > 0))
.filter(f -> !(f.getAnalysisVersion() > 0 && f.getNumberOfAnalyses() > 0 && !f.isSoftOrHardDeleted()))
.collect(Collectors.toList());
if (!validFilesAndNotProcessed.isEmpty()) {
throw new BadRequestException("At least a file is in its initial analysis process");