Pull request #303: RED-3626 Extended NER and Image queue request models with targetFileExtension and responseFileExtension

Merge in RED/persistence-service from RED-3626 to master

* commit '20c0adbaa6e274fdf16b6fe7f6b2e72b19efb171':
  RED-3626 Extended NER and Image queue request models with targetFileExtension and responseFileExtension

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/NerServiceRequest.java

@@ -11,7 +11,12 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class NerServiceRequest {
 
+    public static final String TARGET_FILE_EXTENSION = "TEXT.json.gz";
+    public static final String RESPONSE_FILE_EXTENSION = "NER_ENTITIES.json.gz";
+
     private String dossierId;
     private String fileId;
+    private String targetFileExtension;
+    private String responseFileExtension;
 
 }

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/image/ImageServiceRequest.java

@@ -11,7 +11,12 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class ImageServiceRequest {
 
+    public static final String TARGET_FILE_EXTENSION = "ORIGIN.pdf.gz";
+    public static final String RESPONSE_FILE_EXTENSION = "IMAGE_INFO.json.gz";
+
     private String dossierId;
     private String fileId;
+    private String targetFileExtension;
+    private String responseFileExtension;
 
 }

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java

@@ -1,5 +1,19 @@
 package com.iqser.red.service.peristence.v1.server.service;
 
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
+
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
@@ -14,11 +28,16 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.InternalServerErrorException;
-import com.iqser.red.service.persistence.management.v1.processor.exception.UserNotFoundException;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileAttributeConfigPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.*;
+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;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ImageRecategorizationPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.LegalBasisChangePersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.RemoveRedactionPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ResizeRedactionPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
@@ -26,20 +45,9 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.do
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
 import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.MessageType;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @Slf4j
 @Service
@@ -389,7 +397,12 @@ public class FileStatusService {
 
         setStatusImageAnalyzing(fileId);
         try {
-            rabbitTemplate.convertAndSend(MessagingConfiguration.IMAGE_SERVICE_QUEUE, objectMapper.writeValueAsString(new ImageServiceRequest(dossierId, fileId)), message -> {
+            rabbitTemplate.convertAndSend(MessagingConfiguration.IMAGE_SERVICE_QUEUE, objectMapper.writeValueAsString(ImageServiceRequest.builder()
+                    .dossierId(dossierId)
+                    .fileId(fileId)
+                    .targetFileExtension(ImageServiceRequest.TARGET_FILE_EXTENSION)
+                    .responseFileExtension(ImageServiceRequest.RESPONSE_FILE_EXTENSION)
+                    .build()), message -> {
                 message.getMessageProperties().setPriority(1);
                 return message;
             });
@@ -523,7 +536,12 @@ public class FileStatusService {
 
         setStatusNerAnalyzing(fileId);
         try {
-            rabbitTemplate.convertAndSend(MessagingConfiguration.NER_SERVICE_QUEUE, objectMapper.writeValueAsString(new NerServiceRequest(dossierId, fileId)), message -> {
+            rabbitTemplate.convertAndSend(MessagingConfiguration.NER_SERVICE_QUEUE, objectMapper.writeValueAsString(NerServiceRequest.builder()
+                    .dossierId(dossierId)
+                    .fileId(fileId)
+                    .targetFileExtension(NerServiceRequest.TARGET_FILE_EXTENSION)
+                    .responseFileExtension(NerServiceRequest.RESPONSE_FILE_EXTENSION)
+                    .build()), message -> {
                 message.getMessageProperties().setPriority(1);
                 return message;
             });