DM-285: change fields of comments

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/CommentService.java

@@ -4,6 +4,7 @@ import java.time.OffsetDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -66,7 +67,13 @@ public class CommentService {
         return new Comments(commentPersistenceService.findCommentsByFileID(fileId, false)
                 .entrySet()
                 .stream()
-                .collect(Collectors.toMap(Map.Entry::getKey, entry -> MagicConverter.convert(entry.getValue(), Comment.class))));
+                .collect(Collectors.toMap(Map.Entry::getKey, entry -> MagicConverter.convert(entry.getValue(), Comment.class, getDeltaMapper()))));
+    }
+
+
+    private static BiConsumer<CommentEntity, Comment> getDeltaMapper() {
+
+        return (c1, c2) -> c2.setUserId(c1.getUser());
     }
 
 
@@ -96,6 +103,7 @@ public class CommentService {
         return createdComment;
     }
 
+
     private void checkComment(String text) {
 
         if (!StringUtils.isEmpty(text) && text.length() > COMMENT_MAX_LENGTH) {
@@ -103,6 +111,7 @@ public class CommentService {
         }
     }
 
+
     public Long addCommentAndGetId(String fileId, String annotationId, String comment, String user) {
 
         if (comment == null) {

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionProviderService.java

@@ -2,10 +2,8 @@ package com.iqser.red.service.persistence.management.v1.processor.service.manual
 
 import static com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter.convert;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -14,8 +12,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.CommentEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity;
+import com.iqser.red.service.persistence.management.v1.processor.service.CommentService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.AddRedactionPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.CommentPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ForceRedactionPersistenceService;
@@ -26,7 +24,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
 import com.iqser.red.service.persistence.management.v1.processor.utils.ManualImageRecategorizationMapper;
 import com.iqser.red.service.persistence.management.v1.processor.utils.ManualRedactionMapper;
 import com.iqser.red.service.persistence.management.v1.processor.utils.ManualResizeRedactionMapper;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Comment;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Comments;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
@@ -47,6 +45,7 @@ public class ManualRedactionProviderService {
     private final RemoveRedactionPersistenceService removeRedactionPersistenceService;
     private final ForceRedactionPersistenceService forceRedactionPersistenceService;
     private final CommentPersistenceService commentPersistenceService;
+    private final CommentService commentService;
     private final RecategorizationPersistenceService recategorizationPersistenceService;
     private final LegalBasisChangePersistenceService legalBasisChangePersistenceService;
     private final ResizeRedactionPersistenceService resizeRedactionPersistenceService;
@@ -93,12 +92,10 @@ public class ManualRedactionProviderService {
                     new ManualResizeRedactionMapper()));
         }
 
-        Map<String, List<CommentEntity>> commentEntities = commentPersistenceService.findCommentsByFileID(fileId, false);
+        // deprecated anyway, remove as soon as UI uses EntityLog
+        Comments comments = commentService.getComments(fileId);
 
-        Map<String, List<Comment>> comments = new HashMap<>();
+        return new ManualRedactions(removals, entriesToAdd, forceRedactions, recategorizations, legalBasisChanges, resizeRedactions, comments.getComments());
-        commentEntities.forEach((s, c) -> comments.put(s, convert(c, Comment.class)));
-
-        return new ManualRedactions(removals, entriesToAdd, forceRedactions, recategorizations, legalBasisChanges, resizeRedactions, comments);
     }
 
 

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/Comment.java

@@ -15,10 +15,9 @@ public class Comment {
 
     private long id;
     private String fileId;
-    private String annotationId;
     private OffsetDateTime date;
     private String text;
-    private String user;
+    private String userId;
     private OffsetDateTime softDeletedTime;
 
 }