From 3335c540005f0117a19afefe150cbff02b8d293a Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Fri, 22 Dec 2023 16:01:47 +0200 Subject: [PATCH 1/2] RED-8114 - Also copy new value for resize --- .../management/v1/processor/service/EntityLogMergeService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java index 2ea5f1aed..82086400e 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java @@ -206,6 +206,7 @@ public class EntityLogMergeService { entityLogEntry.setTextAfter(manualResizeRedaction.getTextAfter()); entityLogEntry.setTextBefore(manualResizeRedaction.getTextBefore()); entityLogEntry.setPositions(convertPositions(manualResizeRedaction.getPositions())); + entityLogEntry.setValue(manualResizeRedaction.getValue()); addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber, manualResizeRedaction.getRequestDate()); ManualChange.ManualChangeBuilder manualChange = ManualChange.builder() .manualRedactionType(ManualRedactionType.RESIZE) -- 2.47.2 From 1761528c233194059a3a0078232e55397f9b43b8 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Fri, 22 Dec 2023 16:02:43 +0200 Subject: [PATCH 2/2] RED-8114 - Add fetchtype --- .../v1/processor/entity/annotations/IdRemovalEntity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/IdRemovalEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/IdRemovalEntity.java index 2a6288ebd..d4fcc3d18 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/IdRemovalEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/IdRemovalEntity.java @@ -10,6 +10,7 @@ import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; @@ -55,7 +56,7 @@ public class IdRemovalEntity implements IBaseAnnotation { @ManyToOne private FileEntity fileStatus; - @ElementCollection + @ElementCollection(fetch = FetchType.EAGER) @Fetch(value = FetchMode.SUBSELECT) private Set typeIdsOfModifiedDictionaries = new HashSet<>(); -- 2.47.2