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

DM-504: always exclude hard deleted files #163

Merged
kilian.schuettler1 merged 2 commits from DM-504 into master 2023-10-06 16:25:55 +02:00
Conversation 6 Commits 2 Files Changed 3 +10 -2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java vendored
View File

@ -487,6 +487,7 @@ public class StatusController implements StatusResource {
.excluded(status.isExcluded())
.excludedPages(status.getExcludedPages())
.softDeletedTime(status.getDeleted())
.hardDeletedTime(status.getHardDeletedTime())
.analysisRequired(status.isAnalysisRequired())
.lastFileAttributeChange(status.getLastFileAttributeChange())
.redactionModificationDate(status.getRedactionModificationDate())

9
persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/FileControllerV2.java vendored
View File

@ -6,6 +6,7 @@ import static com.iqser.red.service.persistence.service.v2.api.external.resource
import static com.iqser.red.service.persistence.service.v2.api.external.resource.DossierResource.INCLUDE_SOFT_DELETED_PARAM;
import static com.iqser.red.service.persistence.service.v2.api.external.resource.DossierTemplateResource.DOSSIER_TEMPLATE_ID_PARAM;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@ -94,10 +95,14 @@ public class FileControllerV2 implements FileResource {
dossierController.getDossier(dossierId, true, includeSoftDeleted);
var status = statusController.getFileStatus(dossierId, fileId);
FileStatus status = statusController.getFileStatus(dossierId, fileId);
if (status.getHardDeletedTime() != null) {
throw new NotFoundException(String.format("The requested file has been hard deleted on %s.", status.getHardDeletedTime().format(DateTimeFormatter.ISO_LOCAL_DATE)));
}
if (!includeSoftDeleted && status.getSoftDeletedTime() != null) {
throw new NotFoundException("The requested file does not exist.");
throw new NotFoundException(String.format("The requested file has been soft deleted on %s.", status.getSoftDeletedTime().format(DateTimeFormatter.ISO_LOCAL_DATE)));
}
return status;

2
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/FileStatus.java
View File

@ -123,6 +123,8 @@ public class FileStatus {
private Set<Integer> excludedPages;
@Schema(description = "Shows if the file is soft deleted.")
private OffsetDateTime softDeletedTime;
@Schema(description = "Shows if the file is hard deleted.")
private OffsetDateTime hardDeletedTime;
@Schema(description = "Date and time when the files attributes was last updated.")
private OffsetDateTime lastFileAttributeChange;
@Schema(description = "Shows if there are any Suggestions in this file.")