Pull request #147: fixed changelog storage

Merge in RED/redaction-service from improved-redaction-performance to master

* commit '44ff9cb7757034a3df9c017f58a3381b52d73133':
  fixed changelog storage
This commit is contained in:
Timo Bejan 2021-04-21 19:45:17 +02:00
commit 24f33fe6bf

View File

@ -1,6 +1,5 @@
package com.iqser.red.service.redaction.v1.server.redaction.service; package com.iqser.red.service.redaction.v1.server.redaction.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iqser.red.service.file.management.v1.api.model.ChangeType; import com.iqser.red.service.file.management.v1.api.model.ChangeType;
import com.iqser.red.service.file.management.v1.api.model.FileType; import com.iqser.red.service.file.management.v1.api.model.FileType;
import com.iqser.red.service.file.management.v1.api.model.RedactionChangeLog; import com.iqser.red.service.file.management.v1.api.model.RedactionChangeLog;
@ -21,15 +20,14 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor @RequiredArgsConstructor
public class RedactionChangeLogService { public class RedactionChangeLogService {
private final RedactionStorageService storageStorageService; private final RedactionStorageService redactionStorageService;
private final ObjectMapper objectMapper;
public RedactionChangeLog createAndStoreChangeLog(String projectId, String fileId, RedactionLog currentRedactionLog) { public RedactionChangeLog createAndStoreChangeLog(String projectId, String fileId, RedactionLog currentRedactionLog) {
try { try {
RedactionLog previousRedactionLog = storageStorageService.getRedactionLog(projectId, fileId); RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(projectId, fileId);
var changeLog = createChangeLog(currentRedactionLog, previousRedactionLog); var changeLog = createChangeLog(currentRedactionLog, previousRedactionLog);
storageStorageService.storeObject(projectId, fileId, FileType.REDACTION_CHANGELOG, objectMapper.writeValueAsBytes(changeLog)); redactionStorageService.storeObject(projectId, fileId, FileType.REDACTION_CHANGELOG, changeLog);
return changeLog; return changeLog;
} catch (Exception e) { } catch (Exception e) {
log.debug("Previous redaction log not available"); log.debug("Previous redaction log not available");