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

Merge branch 'master' into RED-2403

Browse Source
This commit is contained in:
Philipp Schramm 2021-10-14 08:56:26 +02:00
commit db93fb6e5c
6 changed files with 73 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
View File

@ -31,9 +31,10 @@ public class DossierTemplatePersistenceService {
if (createOrUpdateDossierRequest.getDossierTemplateId() != null) {
Optional<DossierTemplateEntity> dossierTemplate = dossierTemplateRepository.findById(createOrUpdateDossierRequest.getDossierTemplateId());
if (dossierTemplate.isPresent()) {
// order is important
BeanUtils.copyProperties(createOrUpdateDossierRequest, dossierTemplate.get());
dossierTemplate.get().setDateModified(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
dossierTemplate.get().setModifiedBy(createOrUpdateDossierRequest.getRequestingUser());
BeanUtils.copyProperties(createOrUpdateDossierRequest, dossierTemplate.get());
return dossierTemplate.get();
} else {
throw new NotFoundException(String.format(DOSSIER_TEMPLATE_NOT_FOUND_MESSAGE, createOrUpdateDossierRequest.getDossierTemplateId()));
@ -41,9 +42,10 @@ public class DossierTemplatePersistenceService {
} else {
DossierTemplateEntity dossierTemplate = new DossierTemplateEntity();
dossierTemplate.setId(UUID.randomUUID().toString());
// order is important
BeanUtils.copyProperties(createOrUpdateDossierRequest, dossierTemplate);
dossierTemplate.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
dossierTemplate.setCreatedBy(createOrUpdateDossierRequest.getRequestingUser());
BeanUtils.copyProperties(createOrUpdateDossierRequest, dossierTemplate);
return dossierTemplateRepository.save(dossierTemplate);
}

1
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
View File

@ -64,6 +64,7 @@ public class FileStatusPersistenceService {
file.setLegalBasisVersion(legalBasisVersion);
file.setAnalysisDuration(duration);
file.setDossierDictionaryVersion(dossierDictionaryVersion);
file.setNumberOfAnalyses(file.getNumberOfAnalyses()+1);
file.setAnalysisVersion(analysisVersion);
file.setLastUpdated(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
file.setLastProcessed(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));

15
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
View File

@ -1,6 +1,5 @@
package com.iqser.red.service.peristence.v1.server.service;
import com.google.common.collect.Sets;
import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ViewedPageEntity;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ViewedPagesPersistenceService;
@ -12,9 +11,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@ -30,11 +27,6 @@ public class AnalysisFlagsCalculationService {
@Async
public void calculateFlags(String dossierId, String fileId) {
this.calculateFlags(dossierId,fileId, Sets.newHashSet());
}
@Async
public void calculateFlags(String dossierId, String fileId, Set<Integer> pagesToSkip) {
long startTime = System.currentTimeMillis();
@ -53,9 +45,6 @@ public class AnalysisFlagsCalculationService {
boolean hasComments = false;
var viewedPagesToReset = new ArrayList<Integer>();
for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
if (entry.isExcluded()) {
continue;
@ -89,16 +78,12 @@ public class AnalysisFlagsCalculationService {
var viewedPage = entry.getPositions().isEmpty() ? null : viewedPages.get(entry.getPositions().get(0).getPage());
if (lastChange != null && lastChange.getDateTime() != null && viewedPage != null && viewedPage.isBefore(lastChange.getDateTime())) {
viewedPagesToReset.add(entry.getPositions().get(0).getPage());
hasUpdates = true;
}
}
viewedPagesToReset.removeAll(pagesToSkip);
viewedPagesPersistenceService.resetViewedPages(fileId, file.getCurrentReviewer(), viewedPagesToReset);
fileStatusPersistenceService.updateFlags(fileId, hasRedactions, hasHints, hasImages, hasSuggestions, hasComments, hasUpdates);
log.info("Flag Calculations for file: {} took: {}ms", fileId, System.currentTimeMillis() - startTime);

22
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
View File

@ -88,7 +88,7 @@ public class ManualRedactionService {
}
if (!addRedactionRequest.getPositions().isEmpty()) {
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(addRedactionRequest.getPositions().get(0).getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
return ManualAddResponse.builder().annotationId(annotationId).commentId(commentId).build();
@ -120,7 +120,7 @@ public class ManualRedactionService {
}
if (!removeRedactionRequest.isRemoveFromDictionary()) {
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(removeRedactionRequest.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
return ManualAddResponse.builder()
@ -151,7 +151,7 @@ public class ManualRedactionService {
fileStatusPersistenceService.updateLastManualRedaction(fileId, now);
}
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(forceRedactionRequest.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
return ManualAddResponse.builder()
.annotationId(forceRedactionRequest.getAnnotationId())
@ -181,7 +181,7 @@ public class ManualRedactionService {
fileStatusPersistenceService.updateLastManualRedaction(fileId, now);
}
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(legalBasisChangeRequest.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
return ManualAddResponse.builder()
.annotationId(legalBasisChangeRequest.getAnnotationId())
@ -286,7 +286,7 @@ public class ManualRedactionService {
}
if (!addRedaction.getPositions().isEmpty()) {
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(addRedaction.getPositions().get(0).getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
}
@ -307,7 +307,7 @@ public class ManualRedactionService {
} else {
fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
}
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(removeRedaction.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
@ -323,7 +323,7 @@ public class ManualRedactionService {
} else {
fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
}
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(forceRedaction.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
@ -338,7 +338,7 @@ public class ManualRedactionService {
} else {
fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
}
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(legalBasisChange.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
@ -407,7 +407,7 @@ public class ManualRedactionService {
boolean hasSuggestions = calculateHasSuggestions(fileId);
fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(idRemoval.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
private String buildTypeId(RedactionLogEntry redactionLogEntry, DossierEntity dossier) {
@ -458,7 +458,7 @@ public class ManualRedactionService {
recategorizationPersistenceService.updateStatus(fileId, annotationId, annotationStatus);
boolean hasSuggestions = calculateHasSuggestions(fileId);
fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(imageRecategorization.getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
@ -484,7 +484,7 @@ public class ManualRedactionService {
boolean hasSuggestions = calculateHasSuggestions(fileId);
fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
if (!manualRedactionEntry.getPositions().isEmpty()) {
analysisFlagsCalculationService.calculateFlags(dossierId, fileId, Sets.newHashSet(manualRedactionEntry.getPositions().get(0).getPage()));
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
}
}

56
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/DeletedFilesCleanupService.java Normal file
View File

@ -0,0 +1,56 @@
package com.iqser.red.service.peristence.v1.server.service.scheduler;
import java.time.OffsetDateTime;
import java.util.List;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import com.iqser.red.service.peristence.v1.server.service.DossierService;
import com.iqser.red.service.peristence.v1.server.service.FileService;
import com.iqser.red.service.peristence.v1.server.service.FileStatusService;
import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings;
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@RequiredArgsConstructor
@Service
public class DeletedFilesCleanupService {
private final DossierService dossierService;
private final FileStatusService fileStatusService;
private final FileService fileService;
private final FileManagementServiceSettings settings;
@Scheduled(fixedDelay = 300000, initialDelay = 300000)
public void timedDeletion() {
var now = OffsetDateTime.now();
List<DossierEntity> dossiers = dossierService.getAllDossiers();
for (DossierEntity dossierEntity : dossiers) {
if (dossierEntity.getSoftDeletedTime() != null && dossierEntity.getHardDeletedTime() == null) {
if (dossierEntity.getSoftDeletedTime().isBefore(now.minusHours(settings.getSoftDeleteCleanupTime()))) {
dossierService.hardDeleteDossier(dossierEntity.getId());
log.info("Hard deleted dossier with dossier id {} ", dossierEntity.getId());
}
} else {
var fileEntities = fileStatusService.getDossierStatus(dossierEntity.getId());
for (FileEntity fileEntity : fileEntities) {
if (fileEntity.getHardDeletedTime() == null && fileEntity.getDeleted() != null && fileEntity.getDeleted()
.isBefore(now.minusHours(settings.getSoftDeleteCleanupTime()))) {
fileService.hardDeleteFile(dossierEntity.getId(), fileEntity.getId());
fileStatusService.setFileStatusHardDeleted(fileEntity.getId());
log.info("Hard deleted file with dossier id {} and file id {}", dossierEntity.getId(), fileEntity.getId());
}
}
}
}
}
}

1
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java
View File

@ -17,5 +17,6 @@ public class FileManagementServiceSettings {
private int downloadCleanupDownloadFilesHours = 8;
private int downloadCleanupNotDownloadFilesHours = 72;
private int softDeleteCleanupTime = 96;
}