From 24ef24c5c9989d9761d9d8c8d2406e6dce7e9e9e Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Tue, 19 Mar 2024 15:30:32 +0100 Subject: [PATCH] RED-8702: Explore document databases to store entityLog * refactoring --- .../processor/document/EntityLogDocument.java | 9 ++---- .../document/EntityLogEntryDocument.java | 30 ++++--------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogDocument.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogDocument.java index 2e3d06b46..48ebf6651 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogDocument.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogDocument.java @@ -9,6 +9,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogLegalBasis; +import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -50,19 +51,13 @@ public class EntityLogDocument { public EntityLogDocument(String dossierId, String fileId, EntityLog entityLog) { + MagicConverter.copyAllFields(entityLog, this); this.id = getDocumentId(dossierId, fileId); this.dossierId = dossierId; this.fileId = fileId; - this.analysisVersion = entityLog.getAnalysisVersion(); - this.analysisNumber = entityLog.getAnalysisNumber(); this.entityLogEntryDocument = new ArrayList<>(entityLog.getEntityLogEntry() .stream() .map(entityLogEntry -> new EntityLogEntryDocument(this.id, entityLogEntry)).toList()); - this.legalBasis = entityLog.getLegalBasis(); - this.dictionaryVersion = entityLog.getDictionaryVersion(); - this.dossierDictionaryVersion = entityLog.getDossierDictionaryVersion(); - this.rulesVersion = entityLog.getRulesVersion(); - this.legalBasisVersion = entityLog.getLegalBasisVersion(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogEntryDocument.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogEntryDocument.java index 87963463a..aa20ebd04 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogEntryDocument.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/document/EntityLogEntryDocument.java @@ -8,6 +8,7 @@ import java.util.Set; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; +import com.fasterxml.jackson.databind.ObjectMapper; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry; @@ -15,6 +16,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position; +import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter; import lombok.AccessLevel; import lombok.AllArgsConstructor; @@ -81,34 +83,12 @@ public class EntityLogEntryDocument { public EntityLogEntryDocument(String entityLogId, EntityLogEntry entityLogEntry) { + MagicConverter.copyAllFields(entityLogEntry, this); this.id = entityLogId + "/" + entityLogEntry.getId(); this.entryId = entityLogEntry.getId(); this.entityLogId = entityLogId; - this.type = entityLogEntry.getType(); - this.entryType = entityLogEntry.getEntryType(); - this.state = entityLogEntry.getState(); - this.value = entityLogEntry.getValue(); - this.reason = entityLogEntry.getReason(); - this.matchedRule = entityLogEntry.getMatchedRule(); - this.legalBasis = entityLogEntry.getLegalBasis(); - this.containingNodeId = new ArrayList<>(entityLogEntry.getContainingNodeId()); - this.closestHeadline = entityLogEntry.getClosestHeadline(); - this.section = entityLogEntry.getSection(); - this.positions = new ArrayList<>(entityLogEntry.getPositions()); - this.textBefore = entityLogEntry.getTextBefore(); - this.textAfter = entityLogEntry.getTextAfter(); - this.startOffset = entityLogEntry.getStartOffset(); - this.endOffset = entityLogEntry.getEndOffset(); - this.imageHasTransparency = entityLogEntry.isImageHasTransparency(); - this.dictionaryEntry = entityLogEntry.isDictionaryEntry(); - this.dossierDictionaryEntry = entityLogEntry.isDossierDictionaryEntry(); - this.excluded = entityLogEntry.isExcluded(); - this.changes = new ArrayList<>(entityLogEntry.getChanges()); - this.manualChanges = new ArrayList<>(entityLogEntry.getManualChanges()); - this.engines = new HashSet<>(entityLogEntry.getEngines()); - this.reference = new HashSet<>(entityLogEntry.getReference()); - this.importedRedactionIntersections = new HashSet<>(entityLogEntry.getImportedRedactionIntersections()); - this.numberOfComments = entityLogEntry.getNumberOfComments(); + + } }